activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1160923 - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java activemq-core/src/main/java/org/apache/activemq/util/JettisonMappedXmlDriver.java pom.xml
Date Tue, 23 Aug 2011 23:10:41 GMT
Author: tabish
Date: Tue Aug 23 23:10:41 2011
New Revision: 1160923

URL: http://svn.apache.org/viewvc?rev=1160923&view=rev
Log:
Fix for AMQ-3468.  Updated to XStream v1.4.1

Removed:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/JettisonMappedXmlDriver.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java?rev=1160923&r1=1160922&r2=1160923&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/JmsFrameTranslator.java
Tue Aug 23 23:10:41 2011
@@ -32,12 +32,12 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQObjectMessage;
 import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.util.JettisonMappedXmlDriver;
 import org.codehaus.jettison.mapped.Configuration;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppReader;
 

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1160923&r1=1160922&r2=1160923&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Aug 23 23:10:41 2011
@@ -81,7 +81,7 @@
     <xalan-version>2.6.0</xalan-version>
     <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
     <xpp3-version>1.1.4c</xpp3-version>
-    <xstream-version>1.3.1</xstream-version>
+    <xstream-version>1.4.1</xstream-version>
     <xbean-version>3.7</xbean-version>
     <velocity-version>1.6.2</velocity-version>
     <maven-bundle-plugin-version>2.1.0</maven-bundle-plugin-version>



Mime
View raw message