Author: chris.laprun(a)jboss.com Date: 2007-12-03 16:36:09 -0500 (Mon, 03 Dec 2007) New Revision: 9254 Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml Log: - Overwrite WSRP page definition as window and portlet instance names have changed since 2.6.2. - Revert to use registration by default as in 2.6.2. Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml 2007-12-03 21:26:41 UTC (rev 9253) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/wsrp-object.xml 2007-12-03 21:36:09 UTC (rev 9254) @@ -28,7 +28,7 @@ <deployments> <deployment> <parent-ref>admin</parent-ref> - <if-exists>keep</if-exists> + <if-exists>overwrite</if-exists> <page> <page-name>WSRP</page-name> <properties> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-12-03 21:26:41 UTC (rev 9253) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-12-03 21:36:09 UTC (rev 9254) @@ -25,11 +25,12 @@ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> <!-- Configuration using registration with default registration property validator. --> -<!--<producer-configuration> +<producer-configuration> <registration-configuration fullServiceDescriptionRequiresRegistration="true"> - <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator> + <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator + </registration-property-validator> </registration-configuration> -</producer-configuration>--> +</producer-configuration> -<!-- Configuration without registration --> - <producer-configuration/> \ No newline at end of file + <!-- Configuration without registration --> + <!--<producer-configuration/>--> \ No newline at end of file