svn commit: r1386592 - in /activemq/trunk/activemq-optional: pom.xml src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java

[da...@apache.org]

Author: davsclaus
Date: Mon Sep 17 12:59:56 2012
New Revision: 1386592

URL: http://svn.apache.org/viewvc?rev=1386592&view=rev
Log:
Fixed code to not use @deprecated methods from 3rd party JARs

Modified:
    activemq/trunk/activemq-optional/pom.xml
    activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
    activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1386592&r1=1386591&r2=1386592&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Mon Sep 17 12:59:56 2012
@@ -234,9 +234,9 @@
                 </Export-Package>
                 <Import-Package>
                     org.eclipse.jetty*;version="[7.5,8.0)";resolution:=optional,
-                    !org.apache.activemq.transport.ws*;version=${project.version};,
-                    !org.apache.activemq.transport.xstream;version=${project.version};,
-                    !org.apache.activemq.transport.util;version=${project.version};,
+                    !org.apache.activemq.transport.ws*;version=${project.version},
+                    !org.apache.activemq.transport.xstream;version=${project.version},
+                    !org.apache.activemq.transport.util;version=${project.version},
                     org.apache.activemq*;version=${project.version};resolution:=optional
                 </Import-Package>
             </instructions>

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=1386592&r1=1386591&r2=1386592&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java Mon Sep 17 12:59:56 2012
@@ -49,7 +49,7 @@ import org.apache.http.conn.params.ConnR
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
 import org.apache.http.message.AbstractHttpMessage;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
@@ -59,8 +59,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A HTTP {@link org.apache.activemq.transport.TransportChannel} which uses the
- * <a href="http://jakarta.apache.org/commons/httpclient/">commons-httpclient</a>
+ * A HTTP {@link org.apache.activemq.transport.Transport} which uses the
+ * <a href="http://hc.apache.org/index.html">Apache HTTP Client</a>
  * library
  */
 public class HttpClientTransport extends HttpTransportSupport {
@@ -285,7 +285,7 @@ public class HttpClientTransport extends
     }
 
     protected HttpClient createHttpClient() {
-        DefaultHttpClient client = new DefaultHttpClient(new ThreadSafeClientConnManager());
+        DefaultHttpClient client = new DefaultHttpClient(new PoolingClientConnectionManager());
         if (useCompression) {
             client.addRequestInterceptor( new HttpRequestInterceptor() {
                 @Override

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java?rev=1386592&r1=1386591&r2=1386592&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java Mon Sep 17 12:59:56 2012
@@ -32,6 +32,8 @@ import com.thoughtworks.xstream.io.Hiera
 import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppReader;
 
+import org.xmlpull.mxp1.MXParser;
+
 /**
  * Transforms object messages to text messages and vice versa using
  * {@link XStream}
@@ -99,7 +101,7 @@ public class XStreamMessageTransformer e
         if (streamDriver != null) {
         	in = streamDriver.createReader(new StringReader(textMessage.getText()));
         } else {
-        	in = new XppReader(new StringReader(textMessage.getText()));
+        	in = new XppReader(new StringReader(textMessage.getText()), new MXParser());
         }
         return getXStream().unmarshal(in);
     }