portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r314971 - in /portals/jetspeed-2/trunk/components/page-manager/src/java: JETSPEED-INF/ojb/ org/apache/jetspeed/om/page/impl/
Date Wed, 12 Oct 2005 17:09:00 GMT
Author: rwatler
Date: Wed Oct 12 10:08:57 2005
New Revision: 314971

URL: http://svn.apache.org/viewcvs?rev=314971&view=rev
Log:
add fragment properties; decrement page decorators

Added:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
  (with props)
Removed:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.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/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=314971&r1=314970&r2=314971&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
Wed Oct 12 10:08:57 2005
@@ -121,16 +121,6 @@
          <inverse-foreignkey field-ref="pageId"/>
       </collection-descriptor>
 
-      <collection-descriptor
-          name="decorators"
-          element-class-ref="org.apache.jetspeed.om.page.impl.PageDecorator"
-          auto-delete="true"
-          auto-update="false"
-          auto-retrieve="false"
-      >
-         <inverse-foreignkey field-ref="pageId"/>
-      </collection-descriptor>
-
       <field-descriptor
          name="name"
          column="NAME"
@@ -148,36 +138,16 @@
          column="SKIN"
          jdbc-type="VARCHAR"
       />
-   </class-descriptor>
-
-   <class-descriptor
-      class="org.apache.jetspeed.om.page.impl.PageDecorator"
-      table="PAGE_DECORATOR"
-   >
-      <field-descriptor
-         name="id"
-         column="DECORATOR_ID"
-         jdbc-type="INTEGER"
-         primarykey="true"
-         autoincrement="true"
-      />
 
       <field-descriptor
-        name="pageId"
-        column="PAGE_ID"
-        jdbc-type="VARCHAR"
-        access="anonymous"
-      />
-
-      <field-descriptor
-         name="name"
-         column="NAME"
+         name="decorator"
+         column="DECORATOR"
          jdbc-type="VARCHAR"
       />
 
       <field-descriptor
-         name="decorator"
-         column="DECORATOR"
+         name="defaultFragmentDecorator"
+         column="DEFAULT_FRAGMENT_DECORATOR"
          jdbc-type="VARCHAR"
       />
    </class-descriptor>
@@ -223,6 +193,16 @@
          <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"
@@ -263,6 +243,44 @@
       <field-descriptor
          name="state"
          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"
+         jdbc-type="INTEGER"
+         primarykey="true"
+         autoincrement="true"
+      />
+
+      <field-descriptor
+        name="fragmentId"
+        column="FRAGMENT_ID"
+        jdbc-type="INTEGER"
+        access="anonymous"
+      />
+
+      <field-descriptor
+         name="layout"
+         column="LAYOUT"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="name"
+         column="NAME"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="value"
+         column="VALUE"
          jdbc-type="VARCHAR"
       />
    </class-descriptor>

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=314971&r1=314970&r2=314971&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
Wed Oct 12 10:08:57 2005
@@ -31,6 +31,8 @@
 public class PageImpl extends NodeImpl implements Page
 {
     private String skin;
+    private String decorator;
+    private String defaultFragmentDecorator;
 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Page#getDefaultSkin()

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java?rev=314971&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
(added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
Wed Oct 12 10:08:57 2005
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.page.impl;
+
+import org.apache.jetspeed.om.page.Property;
+
+/**
+ * PropertyImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class PropertyImpl implements Property
+{
+    private String layout;
+    private String name;
+    private String value;
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#getLayout()
+     */
+    public String getLayout()
+    {
+        return layout;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#setLayout(java.lang.String)
+     */
+    public void setLayout(String layoutName)
+    {
+        this.layout = layout;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#getName()
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#setName(java.lang.String)
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#getValue()
+     */
+    public String getValue()
+    {
+        return value;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#getIntValue()
+     */
+    public int getIntValue()
+    {
+        return -1; // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#setValue(java.lang.String)
+     */
+    public void setValue(String value)
+    {
+        this.value = value;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Property#clone()
+     */
+    public Object clone() throws CloneNotSupportedException
+    {
+        return null; // NYI
+    }
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PropertyImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
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