[gatein-commits] gatein SVN: r6487 - in components/wsrp/trunk: jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping and 1 other directory.
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/registration/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/registration/mapping/RegistrationPropertiesMapping.java
===================================================================
---
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationPropertiesMapping.java 2011-05-18
14:11:10 UTC (rev 6486)
+++
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/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="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
@@ -42,9 +40,6 @@
{
public static final String NODE_NAME = "wsrp:registrationproperties";
- /** Need to ignore JCR properties for now until scoping mechanism exists on
@Properties */
- private static final Set<String> propertiesBlackList =
Tools.toSet("jcr:uuid", "jcr:primaryType");
-
@Properties
public abstract Map<String, String> getProperties();
@@ -57,11 +52,7 @@
for (Map.Entry<String, String> entry : propMap.entrySet())
{
String key = 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
===================================================================
--- 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.version>
<org.mockito.version>1.8.5</org.mockito.version>
<com.google.guava.version>r09</com.google.guava.version>