portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r894295 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main: java/org/apache/jetspeed/om/page/psml/ java/org/apache/jetspeed/page/ resources/JETSPEED-INF/castor/
Date Tue, 29 Dec 2009 01:20:05 GMT
Author: rwatler
Date: Tue Dec 29 01:20:05 2009
New Revision: 894295

URL: http://svn.apache.org/viewvc?rev=894295&view=rev
Log:
additional XML/file PM implementation corrections related to state, mode, decorator, and skin
properties and Castor property variable access

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java?rev=894295&r1=894294&r2=894295&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
Tue Dec 29 01:20:05 2009
@@ -20,7 +20,6 @@
 import java.security.AccessController;
 import java.security.Permission;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.jetspeed.idgenerator.IdGenerator;
@@ -745,7 +744,87 @@
     public void setPropertyImpls(List propertiesImpls)
     {
         this.propertyImpls = propertyImpls;  
-    } 
+    }
+    
+    /**
+     * Castor raw property member access.
+     * 
+     * @return property value
+     */
+    public String getStatePropertyField()
+    {
+        return state;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @param state property value
+     */
+    public void setStatePropertyField(String state)
+    {
+        this.state = state;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @return property value
+     */
+    public String getModePropertyField()
+    {
+        return mode;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @param mode property value
+     */
+    public void setModePropertyField(String mode)
+    {
+        this.mode = mode;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @return property value
+     */
+    public String getDecoratorPropertyField()
+    {
+        return decorator;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @param decorator property value
+     */
+    public void setDecoratorPropertyField(String decorator)
+    {
+        this.decorator = decorator;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @return property value
+     */
+    public String getSkinPropertyField()
+    {
+        return skin;
+    }
+
+    /**
+     * Castor raw property member access.
+     * 
+     * @param decorator property value
+     */
+    public void setSkinPropertyField(String skin)
+    {
+        this.skin = skin;
+    }
     
     /**
      * unmarshalled - notification that this instance has been

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=894295&r1=894294&r2=894295&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
Tue Dec 29 01:20:05 2009
@@ -1286,7 +1286,8 @@
             copy.setSecurityConstraints(copiedSecurity);
         }
         
-        // copy properties
+        // copy properties, (only properties for global and
+        // current user/group/role specific values copied)
         Iterator props = source.getProperties().iterator();
         while (props.hasNext())
         {
@@ -1300,12 +1301,7 @@
             {
                 if (copy.getProperty(propName, propScope, propScopeValue) == null)
                 {
-                    FragmentProperty newProp = newFragmentProperty();
-                    newProp.setName(propName);
-                    newProp.setScope(propScope);
-                    newProp.setScopeValue(propScopeValue);
-                    newProp.setValue(prop.getValue());
-                    copy.getProperties().add(newProp);
+                    copy.setProperty(propName, propScope, propScopeValue, prop.getValue());
                 }
             }
         }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml?rev=894295&r1=894294&r2=894295&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/JETSPEED-INF/castor/page-mapping.xml
Tue Dec 29 01:20:05 2009
@@ -141,19 +141,19 @@
       <bind-xml name="id" node="attribute"/>
     </field>
 
-    <field name="skin" type="string">
+    <field name="skinPropertyField" type="string">
       <bind-xml name="skin" node="attribute"/>
     </field>
 
-    <field name="state" type="string">
+    <field name="statePropertyField" type="string">
       <bind-xml name="state" node="attribute"/>
     </field>
 
-    <field name="mode" type="string">
+    <field name="modePropertyField" type="string">
       <bind-xml name="mode" node="attribute"/>
     </field>
 
-    <field name="decorator" type="string">
+    <field name="decoratorPropertyField" type="string">
       <bind-xml name="decorator" node="attribute"/>
     </field>
 



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