Author: julien_viet Date: 2010-02-08 18:30:06 -0500 (Mon, 08 Feb 2010) New Revision: 1567 Modified: portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java Log: use mop prefix for mop state name and properties Modified: portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml =================================================================== --- portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 22:58:06 UTC (rev 1566) +++ portal/trunk/component/portal/src/main/java/conf/content-nodetypes.xml 2010-02-08 23:30:06 UTC (rev 1567) @@ -40,10 +40,10 @@ <supertype>mix:referenceable</supertype> </supertypes> <propertyDefinitions> - <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> + <propertyDefinition name="mop:value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> <valueConstraints/> </propertyDefinition> - <propertyDefinition name="readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <propertyDefinition name="mop:readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> </propertyDefinitions> @@ -54,7 +54,7 @@ <supertype>mop:customizationstate</supertype> </supertypes> <propertyDefinitions> - <propertyDefinition name="prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <propertyDefinition name="mop:prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> </propertyDefinitions> @@ -65,13 +65,13 @@ <supertype>mop:customizationstate</supertype> </supertypes> <propertyDefinitions> - <propertyDefinition name="portletid" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <propertyDefinition name="mop:portletid" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> - <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <propertyDefinition name="mop:state" requiredType="Binary" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> - <propertyDefinition name="cloned" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> + <propertyDefinition name="mop:cloned" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> </propertyDefinitions> Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-08 22:58:06 UTC (rev 1566) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/gadget/GadgetState.java 2010-02-08 23:30:06 UTC (rev 1567) @@ -31,7 +31,7 @@ { static final String MOP_NODE_NAME = "mop:gadget"; - @Property(name = "prefs") + @Property(name = "mop:prefs") public abstract String getUserPrefs(); public abstract void setUserPrefs(String userPrefs); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-08 22:58:06 UTC (rev 1566) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2010-02-08 23:30:06 UTC (rev 1567) @@ -19,11 +19,8 @@ package org.exoplatform.portal.pom.spi.portlet; -import org.chromattic.api.annotations.Create; -import org.chromattic.api.annotations.PrimaryType; -import org.chromattic.api.annotations.OneToMany; -import org.chromattic.api.annotations.OneToOne; -import org.chromattic.api.annotations.RelatedMappedBy; +import org.chromattic.api.annotations.*; +import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.workspace.content.AbstractCustomization; import java.util.Map; @@ -33,6 +30,7 @@ * @version $Revision$ */ @PrimaryType(name = PortletState.MOP_NODE_NAME) +(a)FormattedBy(MOPFormatter.class) public abstract class PortletState { @@ -47,7 +45,7 @@ public abstract PreferenceState create(); @OneToOne - @RelatedMappedBy("state") + @RelatedMappedBy("mop:state") public abstract AbstractCustomization getCustomization(); private void setPayload(Portlet payload) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-02-08 22:58:06 UTC (rev 1566) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PreferenceState.java 2010-02-08 23:30:06 UTC (rev 1567) @@ -40,17 +40,17 @@ @Name public abstract String getName(); - @Property(name = "value") + @Property(name = "mop:value") public abstract List<String> getValue(); public abstract void setValue(List<String> value); - @Property(name = "value") + @Property(name = "mop:value") public abstract List<String> getValues(); public abstract void setValues(List<String> value); - @Property(name = "readonly") + @Property(name = "mop:readonly") public abstract boolean getReadOnly(); public abstract void setReadOnly(boolean readOnly); Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-08 22:58:06 UTC (rev 1566) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/spi/wsrp/WSRPState.java 2010-02-08 23:30:06 UTC (rev 1567) @@ -36,17 +36,17 @@ { static final String MOP_NODE_NAME = "mop:wsrpstate"; - @Property(name = "portletid") + @Property(name = "mop:portletid") public abstract String getPortletId(); public abstract void setPortletId(String portletHandle); - @Property(name = "state") + @Property(name = "mop:state") public abstract InputStream getState(); public abstract void setState(InputStream state); - @Property(name = "cloned") + @Property(name = "mop:cloned") public abstract boolean getCloned(); public abstract void setCloned(boolean cloned);