Author: thomas.heute(a)jboss.com Date: 2010-12-10 18:42:32 -0500 (Fri, 10 Dec 2010) New Revision: 5565 Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java epp/portal/branches/EPP_5_1_Branch/pom.xml epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml Log: JBEPP-696: Upgrade to WSRP 2.0 GA Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-12-10 17:40:33 UTC (rev 5564) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-12-10 23:42:32 UTC (rev 5565) @@ -65,7 +65,7 @@ public abstract void setRegistrationHandle(String handle); - @Property(name="portletHandles") + @Property(name="portlethandles") public abstract List<String> getPortletHandles(); public abstract void setPortletHandles(List<String> portletHandles); Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-12-10 17:40:33 UTC (rev 5564) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-12-10 23:42:32 UTC (rev 5565) @@ -48,7 +48,7 @@ <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> <org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version> <org.picketlink.idm>1.1.7.GA</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.0-CR03</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.0-epp51-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-12-10 17:40:33 UTC (rev 5564) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-12-10 23:42:32 UTC (rev 5565) @@ -111,7 +111,7 @@ onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> - <propertyDefinition name="portletHandles" requiredType="String" autoCreated="false" mandatory="false" + <propertyDefinition name="portlethandles" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> </propertyDefinition> </propertyDefinitions> Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-12-10 17:40:33 UTC (rev 5564) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-12-10 23:42:32 UTC (rev 5565) @@ -47,34 +47,34 @@ <external-component-plugins> <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> <component-plugin> - <!-- The name of the plugin --> - <name>new.portal.config.user.listener</name> - <!-- The name of the method to call on the UserPortalConfigService in order to register the NewPortalConfigs --> - <set-method>initListener</set-method> - <!-- The full qualified name of the NewPortalConfigListener --> - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>platform/administrators</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>group</string> - </field> - <field name="templateLocation"> - <string>war:/conf/wsrp/portal</string> - </field> - </object> - </object-param> - </init-params> + <!-- The name of the plugin --> + <name>new.portal.config.user.listener</name> + <!-- The name of the method to call on the UserPortalConfigService in order to register the NewPortalConfigs --> + <set-method>initListener</set-method> + <!-- The full qualified name of the NewPortalConfigListener --> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>war:/conf/wsrp/portal</string> + </field> + </object> + </object-param> + </init-params> </component-plugin> </external-component-plugins>