[gatein-commits] gatein SVN: r3879 - in portal/trunk: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2010-08-20 08:45:16 -0400 (Fri, 20 Aug 2010)
New Revision: 3879
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
portal/trunk/pom.xml
Log:
- Use WSRP 2.0.0-Alpha01 and common 2.0.3-GA.
- Adapated JCR mapping to changes in WSRP. Shouldn't change anything
persistence-wise.
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
===================================================================
---
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-08-20
12:16:49 UTC (rev 3878)
+++
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2010-08-20
12:45:16 UTC (rev 3879)
@@ -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/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
===================================================================
---
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-08-20
12:16:49 UTC (rev 3878)
+++
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-08-20
12:45:16 UTC (rev 3879)
@@ -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/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-08-20 12:16:49 UTC (rev 3878)
+++ portal/trunk/pom.xml 2010-08-20 12:45:16 UTC (rev 3879)
@@ -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</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-Alpha01</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>