Modified: activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/LoadStatusDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/LoadStatusDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/LoadStatusDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/LoadStatusDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.broker.network.dto; import org.apache.activemq.apollo.broker.network.dto.DestinationLoadDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.*; import java.util.ArrayList;
Modified: activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/MembershipMonitorDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/MembershipMonitorDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/MembershipMonitorDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/MembershipMonitorDTO.java Thu Nov 15 23:10:16 2012 @@ -18,9 +18,9 @@ package org.apache.activemq.apollo.broker.network.dto; import org.apache.activemq.apollo.dto.ApolloTypeIdResolver; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.map.annotate.JsonTypeIdResolver; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; import javax.xml.bind.annotation.XmlType; Modified: activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/NetworkManagerDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/NetworkManagerDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/NetworkManagerDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/NetworkManagerDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.broker.network.dto; import org.apache.activemq.apollo.dto.CustomServiceDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.*; import java.util.ArrayList; Modified: activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/RuleDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/RuleDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/RuleDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/RuleDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.broker.network.dto; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.*; Modified: activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/ZeroconfMembershipMonitorDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/ZeroconfMembershipMonitorDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/ZeroconfMembershipMonitorDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-network/src/main/scala/org/apache/activemq/apollo/broker/network/dto/ZeroconfMembershipMonitorDTO.java Thu Nov 15 23:10:16 2012 @@ -16,7 +16,7 @@ */ package org.apache.activemq.apollo.broker.network.dto; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireConnectionStatusDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.openwire.dto; import org.apache.activemq.apollo.dto.ConnectionStatusDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/dto/OpenwireDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.openwire.dto; import org.apache.activemq.apollo.dto.ProtocolDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.*; Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompConnectionStatusDTO.java Thu Nov 15 23:10:16 2012 @@ -17,7 +17,7 @@ package org.apache.activemq.apollo.stomp.dto; import org.apache.activemq.apollo.dto.ConnectionStatusDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompDTO.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompDTO.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/dto/StompDTO.java Thu Nov 15 23:10:16 2012 @@ -19,7 +19,7 @@ package org.apache.activemq.apollo.stomp import org.apache.activemq.apollo.dto.AddUserHeaderDTO; import org.apache.activemq.apollo.dto.ProtocolDTO; import org.apache.activemq.apollo.dto.ProtocolFilterDTO; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.xml.bind.annotation.*; import java.util.ArrayList; Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original) +++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Thu Nov 15 23:10:16 2012 @@ -59,15 +59,15 @@ <version>${jersey-version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> <version>${jackson-version}</version> </dependency> - <dependency> + <!-- <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> <version>${jackson-version}</version> - </dependency> + </dependency> --> <dependency> <groupId>com.wordnik</groupId> Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/JacksonJsonProvider.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/JacksonJsonProvider.java?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/JacksonJsonProvider.java (original) +++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/JacksonJsonProvider.java Thu Nov 15 23:10:16 2012 @@ -27,7 +27,7 @@ import org.apache.activemq.apollo.dto.Js @javax.ws.rs.ext.Provider @javax.ws.rs.Consumes({"application/json", "text/json"}) @javax.ws.rs.Produces({"application/json", "text/json"}) -public class JacksonJsonProvider extends org.codehaus.jackson.jaxrs.JacksonJsonProvider { +public class JacksonJsonProvider extends com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider { public JacksonJsonProvider() { super(JsonCodec.mapper); } Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original) +++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Thu Nov 15 23:10:16 2012 @@ -59,17 +59,6 @@ <version>${slf4j-version}</version> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson-version}</version> - </dependency> - <!-- testing --> <dependency> <groupId>org.fusesource.scalate</groupId> @@ -192,26 +181,8 @@ <phase>process-sources</phase> <configuration> <tasks> - <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask"> - <classpath refid="maven.compile.classpath" /> - </taskdef> - <mkdir dir="${basedir}/target/sitegen/documentation/schema" /> - <schemagen srcdir="${basedir}/.." destdir="${basedir}/target/sitegen/documentation/schema" includeantruntime="false"> - <schema namespace="http://activemq.apache.org/schema/activemq/apollo"; file="apollo.xsd" /> - <classpath refid="maven.compile.classpath" /> - <include name="**/package-info.java" /> - <include name="**/*DTO.java" /> - <exclude name="**/.git/**" /> - <exclude name="**/.svn/**" /> - </schemagen> - - <replace token="<xs:sequence>" value="<xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>" dir="${basedir}/target/sitegen/documentation/schema"> - <include name="**/*.xsd" /> - </replace> - <replace token="</xs:sequence>" value="</xs:choice></xs:choice>" dir="${basedir}/target/sitegen/documentation/schema"> - <include name="**/*.xsd" /> - </replace> + <copy file="${basedir}/../apollo-dto/target/schema/org/apache/activemq/apollo/dto/apollo.xsd" tofile="${basedir}/target/sitegen/documentation/schema/apollo.xsd"/> </tasks> </configuration> <goals> @@ -219,25 +190,7 @@ </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb-api-version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb-version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>${jaxb-version}</version> - </dependency> - </dependencies> </plugin> - </plugins> </build> Modified: activemq/activemq-apollo/trunk/pom.xml URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1410101&r1=1410100&r2=1410101&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/pom.xml (original) +++ activemq/activemq-apollo/trunk/pom.xml Thu Nov 15 23:10:16 2012 @@ -113,7 +113,7 @@ <scalamd-version>1.5</scalamd-version> <servlet-api-version>2.5</servlet-api-version> - <jackson-version>1.9.2</jackson-version> + <jackson-version>2.1.0</jackson-version> <logback-version>0.9.24</logback-version> <jersey-version>1.7</jersey-version> <snakeyaml-version>1.7</snakeyaml-version>
