From do-not-reply at jboss.org Wed May 18 10:14:46 2011
Content-Type: multipart/mixed; boundary="===============7365380420869955678=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r6487 - in components/wsrp/trunk:
 jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping and 1 other
 directory.
Date: Wed, 18 May 2011 10:14:45 -0400
Message-ID: <201105181414.p4IEEjo1014192@svn01.web.mwc.hst.phx2.redhat.com>

--===============7365380420869955678==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2011-05-18 10:14:45 -0400 (Wed, 18 May 2011)
New Revision: 6487

Modified:
   components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registratio=
n/mapping/RegistrationPropertiesMapping.java
   components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-228: Upgraded to Chromattic 1.1.0-beta5.

Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/regi=
stration/mapping/RegistrationPropertiesMapping.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registrati=
on/mapping/RegistrationPropertiesMapping.java	2011-05-18 14:11:10 UTC (rev =
6486)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registrati=
on/mapping/RegistrationPropertiesMapping.java	2011-05-18 14:14:45 UTC (rev =
6487)
@@ -25,13 +25,11 @@
 =

 import org.chromattic.api.annotations.PrimaryType;
 import org.chromattic.api.annotations.Properties;
-import org.gatein.common.util.Tools;
 =

 import javax.xml.namespace.QName;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 =

 /**
  * @author <a href=3D"mailto:chris.laprun(a)jboss.com">Chris Laprun</a>
@@ -42,9 +40,6 @@
 {
    public static final String NODE_NAME =3D "wsrp:registrationproperties";
 =

-   /** Need to ignore JCR properties for now until scoping mechanism exist=
s on @Properties */
-   private static final Set<String> propertiesBlackList =3D Tools.toSet("j=
cr:uuid", "jcr:primaryType");
-
    @Properties
    public abstract Map<String, String> getProperties();
 =

@@ -57,11 +52,7 @@
          for (Map.Entry<String, String> entry : propMap.entrySet())
          {
             String key =3D entry.getKey();
-            // ignore JCR-specific properties
-            if (!propertiesBlackList.contains(key))
-            {
-               properties.put(QName.valueOf(key), entry.getValue());
-            }
+            properties.put(QName.valueOf(key), entry.getValue());
          }
 =

          return properties;

Modified: components/wsrp/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wsrp/trunk/pom.xml	2011-05-18 14:11:10 UTC (rev 6486)
+++ components/wsrp/trunk/pom.xml	2011-05-18 14:14:45 UTC (rev 6487)
@@ -57,7 +57,7 @@
       <javax.mail.version>1.4.1</javax.mail.version>
       <javax.xml.ws.version>2.1</javax.xml.ws.version>
       <javax.xml.soap.saaj.version>1.3</javax.xml.soap.saaj.version>
-      <org.chromattic.version>1.1.0-beta2</org.chromattic.version>
+      <org.chromattic.version>1.1.0-beta5</org.chromattic.version>
       <org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.ver=
sion>
       <org.mockito.version>1.8.5</org.mockito.version>
       <com.google.guava.version>r09</com.google.guava.version>


--===============7365380420869955678==--