Author: chris.laprun(a)jboss.com Date: 2010-05-29 05:08:48 -0400 (Sat, 29 May 2010) New Revision: 3215 Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java portal/branches/wsrp2-integration/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/wsrp2-integration/pom.xml Log: - Modifications to run with WSRP 2 snapshot. Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-05-28 09:32:17 UTC (rev 3214) +++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-05-29 09:08:48 UTC (rev 3215) @@ -87,7 +87,7 @@ for (RegistrationProperty property : regInfo.getRegistrationProperties().values()) { // create new RegistrationPropertyMapping for this RegistrationInfoMapping - RegistrationPropertyMapping rpm = createRegistrationProperty(property.getName()); + RegistrationPropertyMapping rpm = createRegistrationProperty(property.getName().toString()); // add newly created RegistrationPropertyMapping to parent then initialize for JCR rpms.add(rpm); Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java =================================================================== --- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-05-28 09:32:17 UTC (rev 3214) +++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-05-29 09:08:48 UTC (rev 3215) @@ -65,7 +65,7 @@ public void initFrom(RegistrationProperty property) { // set properties - setName(property.getName()); + setName(property.getName().toString()); setStatus(property.getStatus()); setValue(property.getValue()); Modified: portal/branches/wsrp2-integration/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/wsrp2-integration/packaging/module/src/main/javascript/portal.packaging.module.js 2010-05-28 09:32:17 UTC (rev 3214) +++ portal/branches/wsrp2-integration/packaging/module/src/main/javascript/portal.packaging.module.js 2010-05-29 09:08:48 UTC (rev 3215) @@ -86,6 +86,7 @@ .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion)) .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion)) .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion)) + .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp2-ws", "jar", wsrpVersion)) .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion)) .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion)); Modified: portal/branches/wsrp2-integration/pom.xml =================================================================== --- portal/branches/wsrp2-integration/pom.xml 2010-05-28 09:32:17 UTC (rev 3214) +++ portal/branches/wsrp2-integration/pom.xml 2010-05-29 09:08:48 UTC (rev 3215) @@ -44,11 +44,11 @@ <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> - <org.gatein.common.version>2.0.2-GA</org.gatein.common.version> + <org.gatein.common.version>2.0.3-GA-SNAPSHOT</org.gatein.common.version> <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version> <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version> <org.picketlink.idm>1.1.5.CR01</org.picketlink.idm> - <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.0-Alpha-01-SNAPSHOT</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-CR01</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version>