portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r320773 - in /portals/jetspeed-2/trunk/components/page-manager/src/java: JETSPEED-INF/ojb/ org/apache/jetspeed/om/folder/impl/ org/apache/jetspeed/om/page/impl/
Date Thu, 13 Oct 2005 14:07:22 GMT
Author: rwatler
Date: Thu Oct 13 07:07:17 2005
New Revision: 320773

URL: http://svn.apache.org/viewcvs?rev=320773&view=rev
Log:
integrate Fragment properties into Fragment table

Removed:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
Modified:
    portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml?rev=320773&r1=320772&r2=320773&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
Thu Oct 13 07:07:17 2005
@@ -193,16 +193,6 @@
          <inverse-foreignkey field-ref="parentId"/>
       </collection-descriptor>
 
-      <collection-descriptor
-          name="properties"
-          element-class-ref="org.apache.jetspeed.om.page.impl.PropertyImpl"
-          auto-delete="true"
-          auto-update="false"
-          auto-retrieve="false"
-      >
-         <inverse-foreignkey field-ref="fragmentId"/>
-      </collection-descriptor>
-
       <field-descriptor
         name="pageId"
         column="PAGE_ID"
@@ -245,42 +235,46 @@
          column="STATE"
          jdbc-type="VARCHAR"
       />
-   </class-descriptor>
 
-   <class-descriptor
-      class="org.apache.jetspeed.om.page.impl.PropertyImpl"
-      table="FRAGMENT_PROPERTY"
-   >
       <field-descriptor
-         name="id"
-         column="PROPERTY_ID"
+         name="layoutRowProperty"
+         column="LAYOUT_ROW"
          jdbc-type="INTEGER"
-         primarykey="true"
-         autoincrement="true"
       />
 
       <field-descriptor
-        name="fragmentId"
-        column="FRAGMENT_ID"
-        jdbc-type="INTEGER"
-        access="anonymous"
+         name="layoutColumnProperty"
+         column="LAYOUT_COLUMN"
+         jdbc-type="INTEGER"
+      />
+
+      <field-descriptor
+         name="layoutWidthProperty"
+         column="LAYOUT_WIDTH"
+         jdbc-type="INTEGER"
       />
 
       <field-descriptor
-         name="layout"
-         column="LAYOUT"
+         name="extendedPropertyName1"
+         column="EXT_PROPERTY_NAME_1"
          jdbc-type="VARCHAR"
       />
 
       <field-descriptor
-         name="name"
-         column="NAME"
+         name="extendedPropertyValue1"
+         column="EXT_PROPERTY_VALUE_1"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="extendedPropertyName2"
+         column="EXT_PROPERTY_NAME_2"
          jdbc-type="VARCHAR"
       />
 
       <field-descriptor
-         name="value"
-         column="VALUE"
+         name="extendedPropertyValue2"
+         column="EXT_PROPERTY_VALUE_2"
          jdbc-type="VARCHAR"
       />
    </class-descriptor>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=320773&r1=320772&r2=320773&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Thu Oct 13 07:07:17 2005
@@ -39,6 +39,9 @@
  */
 public class FolderImpl extends NodeImpl implements Folder
 {
+    private List folders;
+    private List pages;
+
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#getDefaultPage(boolean)
      */

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=320773&r1=320772&r2=320773&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
Thu Oct 13 07:07:17 2005
@@ -28,10 +28,18 @@
  */
 public class FragmentImpl extends BaseElementImpl implements Fragment
 {
+    private List fragments;
     private String type;
     private String skin;
     private String decorator;
     private String state;
+    private int layoutRowProperty;
+    private int layoutColumnProperty;
+    private int layoutWidthProperty;
+    private String extendedPropertyName1;
+    private String extendedPropertyValue1;
+    private String extendedPropertyName2;
+    private String extendedPropertyValue2;
 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getType()

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java?rev=320773&r1=320772&r2=320773&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
Thu Oct 13 07:07:17 2005
@@ -30,6 +30,7 @@
  */
 public class PageImpl extends NodeImpl implements Page
 {
+    private List fragments;
     private String skin;
     private String decorator;
     private String defaultFragmentDecorator;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message