Author: chris.laprun(a)jboss.com Date: 2011-04-15 05:20:27 -0400 (Fri, 15 Apr 2011) New Revision: 6237 Modified: components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java components/wsrp/trunk/pom.xml Log: - Upgraded to chromattic 1.1.0-beta2 and made necessary changes to mapping classes. Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-04-15 08:11:35 UTC (rev 6236) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-04-15 09:20:27 UTC (rev 6237) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> @@ -54,8 +55,9 @@ <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.apt</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-04-15 08:11:35 UTC (rev 6236) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/EndpointInfoMapping.java 2011-04-15 09:20:27 UTC (rev 6237) @@ -23,6 +23,7 @@ package org.gatein.wsrp.consumer.registry.mapping; +import org.chromattic.api.annotations.DefaultValue; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.wsrp.consumer.EndpointConfigurationInfo; @@ -46,11 +47,12 @@ public abstract void setWSTimeoutMilliseconds(Integer expiration); - @Property(name = "enablewss", defaultValue = "false") + @Property(name = "enablewss") + @DefaultValue("false") public abstract boolean getWSSEnabled(); - + public abstract void setWSSEnabled(boolean enable); - + public void initFrom(EndpointConfigurationInfo info) { setWSDLURL(info.getWsdlDefinitionURL()); Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-04-15 08:11:35 UTC (rev 6236) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-04-15 09:20:27 UTC (rev 6237) @@ -23,6 +23,7 @@ package org.gatein.wsrp.consumer.registry.mapping; +import org.chromattic.api.annotations.DefaultValue; import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.MappedBy; import org.chromattic.api.annotations.OneToOne; @@ -63,7 +64,8 @@ public abstract void setExpirationCacheSeconds(Integer expiration); - @Property(name = "active", defaultValue = "false") + @Property(name = "active") + @DefaultValue("false") public abstract boolean getActive(); public abstract void setActive(boolean active); Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-04-15 08:11:35 UTC (rev 6236) +++ components/wsrp/trunk/pom.xml 2011-04-15 09:20:27 UTC (rev 6237) @@ -58,7 +58,7 @@ <version.javax.xml.ws>2.1</version.javax.xml.ws> <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj> <version.google-collections>1.0</version.google-collections> - <version.chromattic>1.0.8</version.chromattic> + <version.chromattic>1.1.0-beta2</version.chromattic> </properties> <dependencyManagement> @@ -174,6 +174,7 @@ <version>${version.google-collections}</version> </dependency> + <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.api</artifactId> @@ -184,6 +185,7 @@ <groupId>org.chromattic</groupId> <artifactId>chromattic.apt</artifactId> <version>${version.chromattic}</version> + <scope>compile</scope> </dependency> <!--