[gatein-commits] gatein SVN: r6104 - in epp/portal/branches/EPP_5_1_Branch: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2011-03-18 12:49:53 -0400 (Fri, 18 Mar 2011)
New Revision: 6104
Modified:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
- JBEPP-788, GTNWSRP-198: JCR persistence changes.
- Upgraded to WSRP 2.0.1-Beta01.
Modified:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2011-03-18
16:35:40 UTC (rev 6103)
+++
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2011-03-18
16:49:53 UTC (rev 6104)
@@ -30,6 +30,7 @@
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
import org.gatein.registration.RegistrationPolicy;
import org.gatein.registration.policies.DefaultRegistrationPolicy;
+import org.gatein.registration.policies.RegistrationPolicyWrapper;
import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements;
import org.gatein.wsrp.producer.config.impl.ProducerRegistrationRequirementsImpl;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
@@ -79,10 +80,12 @@
setRegistrationRequired(registrationRequirements.isRegistrationRequired());
setRegistrationRequiredForFullDescription(registrationRequirements.isRegistrationRequiredForFullDescription());
RegistrationPolicy policy = registrationRequirements.getPolicy();
- setPolicyClassName(policy.getClass().getName());
- if (policy instanceof DefaultRegistrationPolicy)
+ setPolicyClassName(policy.getClassName());
+
+ RegistrationPolicy unwrap = RegistrationPolicyWrapper.unwrap(policy);
+ if (unwrap instanceof DefaultRegistrationPolicy)
{
- DefaultRegistrationPolicy drp = (DefaultRegistrationPolicy)policy;
+ DefaultRegistrationPolicy drp = (DefaultRegistrationPolicy)unwrap;
setValidatorClassName(drp.getValidator().getClass().getName());
}
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-03-18 16:35:40 UTC (rev 6103)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-03-18 16:49:53 UTC (rev 6104)
@@ -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-epp51-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.1-Beta01</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>