[gatein-commits] gatein SVN: r5913 - 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.

[do-not-reply at jboss.org]

Author: thomas.heute at jboss.com
Date: 2011-02-18 06:13:52 -0500 (Fri, 18 Feb 2011)
New Revision: 5913

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: JCR persistence changes\nReverting dependency on SNAPSHOT

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-02-18 10:59:44 UTC (rev 5912)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java	2011-02-18 11:13:52 UTC (rev 5913)
@@ -30,7 +30,6 @@
 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;
@@ -80,12 +79,10 @@
       setRegistrationRequired(registrationRequirements.isRegistrationRequired());
       setRegistrationRequiredForFullDescription(registrationRequirements.isRegistrationRequiredForFullDescription());
       RegistrationPolicy policy = registrationRequirements.getPolicy();
-      setPolicyClassName(policy.getClassName());
-
-      RegistrationPolicy unwrap = RegistrationPolicyWrapper.unwrap(policy);
-      if (unwrap instanceof DefaultRegistrationPolicy)
+      setPolicyClassName(policy.getClass().getName());
+      if (policy instanceof DefaultRegistrationPolicy)
       {
-         DefaultRegistrationPolicy drp = (DefaultRegistrationPolicy)unwrap;
+         DefaultRegistrationPolicy drp = (DefaultRegistrationPolicy)policy;
          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-02-18 10:59:44 UTC (rev 5912)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml	2011-02-18 11:13:52 UTC (rev 5913)
@@ -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.1-GA-SNAPSHOT</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>