activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1024559 - in /activemq/trunk/activemq-optional/src: main/java/org/apache/activemq/transport/http/ main/java/org/apache/activemq/transport/https/ test/java/org/apache/activemq/util/oxm/ test/java/org/apache/activemq/util/xstream/
Date Wed, 20 Oct 2010 09:19:42 GMT
Author: dejanb
Date: Wed Oct 20 09:19:42 2010
New Revision: 1024559

URL: http://svn.apache.org/viewvc?rev=1024559&view=rev
Log:
cleaning up activemq-optional - depricated classes

Modified:
    activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
    activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java
    activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformerTest.java
    activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java?rev=1024559&r1=1024558&r2=1024559&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
(original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
Wed Oct 20 09:19:42 2010
@@ -38,7 +38,10 @@ import org.apache.commons.logging.LogFac
 
 /**
  * @version $Revision$
+ * @deprecated
+ * @see HttpClientTransport
  */
+@Deprecated
 public class HttpTransport extends HttpTransportSupport {
     
     private static final Log LOG = LogFactory.getLog(HttpTransport.class);

Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java?rev=1024559&r1=1024558&r2=1024559&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java
(original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java
Wed Oct 20 09:19:42 2010
@@ -26,6 +26,11 @@ import javax.net.ssl.HttpsURLConnection;
 import org.apache.activemq.transport.http.HttpTransport;
 import org.apache.activemq.transport.util.TextWireFormat;
 
+/**
+ * @deprecated
+ * @see HttpsClientTransport
+ */
+@Deprecated
 public class HttpsTransport extends HttpTransport {
 
     public HttpsTransport(TextWireFormat wireFormat, URI remoteUrl) throws MalformedURLException
{

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformerTest.java?rev=1024559&r1=1024558&r2=1024559&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformerTest.java
(original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformerTest.java
Wed Oct 20 09:19:42 2010
@@ -17,28 +17,15 @@
 
 package org.apache.activemq.util.oxm;
 
-import static org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.ADAPTIVE;
-import static org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.OBJECT;
-import static org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.XML;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
 import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.MessageTransformer;
 import org.apache.activemq.util.xstream.SamplePojo;
-import org.apache.activemq.util.xstream.XStreamMessageTransformer;
 
-import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
+import javax.jms.*;
+
+import static org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.*;
 
 public abstract class AbstractXMLMessageTransformerTest extends TestCase {
     protected ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");

Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java?rev=1024559&r1=1024558&r2=1024559&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
(original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
Wed Oct 20 09:19:42 2010
@@ -32,7 +32,7 @@ import org.apache.activemq.ActiveMQMessa
 
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 
-import static org.apache.activemq.util.xstream.XStreamMessageTransformer.MessageTransform.*;
+import static org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.*;
 
 /**
  * @version $Revision$
@@ -43,7 +43,9 @@ public class XStreamTransformTest extend
     protected long timeout = 5000;
 
     public void testSendObjectMessageReceiveAsTextMessageAndObjectMessage() throws Exception
{
-        connectionFactory.setTransformer(new XStreamMessageTransformer(XML));
+        org.apache.activemq.util.oxm.XStreamMessageTransformer transformer = new org.apache.activemq.util.oxm.XStreamMessageTransformer();
+        transformer.setTransformType(XML);
+        connectionFactory.setTransformer(transformer);
         connection = connectionFactory.createConnection();
         connection.start();
 
@@ -88,7 +90,9 @@ public class XStreamTransformTest extend
     }
 
     public void testSendTextMessageReceiveAsObjectMessageAndTextMessage() throws Exception
{
-        connectionFactory.setTransformer(new XStreamMessageTransformer(OBJECT));
+        org.apache.activemq.util.oxm.XStreamMessageTransformer transformer = new org.apache.activemq.util.oxm.XStreamMessageTransformer();
+        transformer.setTransformType(OBJECT);
+        connectionFactory.setTransformer(transformer);
         connection = connectionFactory.createConnection();
         connection.start();
 
@@ -138,7 +142,9 @@ public class XStreamTransformTest extend
     }
 
     public void testAdaptiveTransform() throws Exception {
-        connectionFactory.setTransformer(new XStreamMessageTransformer(ADAPTIVE));
+        org.apache.activemq.util.oxm.XStreamMessageTransformer transformer = new org.apache.activemq.util.oxm.XStreamMessageTransformer();
+        transformer.setTransformType(ADAPTIVE);
+        connectionFactory.setTransformer(transformer);
         connection = connectionFactory.createConnection();
         connection.start();
 
@@ -220,7 +226,8 @@ public class XStreamTransformTest extend
     }
     
     public void testStreamDriverTransform() throws Exception {
-    	XStreamMessageTransformer transformer = new XStreamMessageTransformer(ADAPTIVE);
+    	org.apache.activemq.util.oxm.XStreamMessageTransformer transformer = new org.apache.activemq.util.oxm.XStreamMessageTransformer();
+        transformer.setTransformType(ADAPTIVE);
     	transformer.setStreamDriver(new JettisonMappedXmlDriver());
         connectionFactory.setTransformer(transformer);
         connection = connectionFactory.createConnection();



Mime
View raw message