Author: davsclaus
Date: Mon Sep 17 11:24:32 2012
New Revision: 1386558
URL: http://svn.apache.org/viewvc?rev=1386558&view=rev
Log:
Optimized java package imports
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/XStreamMessageTransformer.java
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.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/oxm/XStreamMessageTransformTest.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.axis;
import java.util.HashMap;
-
import javax.jms.ConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
Mon Sep 17 11:24:32 2012
@@ -20,7 +20,6 @@ import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
Mon Sep 17 11:24:32 2012
@@ -20,7 +20,6 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.filter;
import java.io.StringReader;
-
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.TextMessage;
@@ -26,10 +25,9 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.xml.sax.InputSource;
-
import org.apache.activemq.command.Message;
import org.apache.activemq.util.ByteArrayInputStream;
+import org.xml.sax.InputSource;
public class JAXPXPathEvaluator implements XPathExpression.XPathEvaluator {
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
Mon Sep 17 11:24:32 2012
@@ -17,8 +17,8 @@
package org.apache.activemq.store.amq.reader;
import java.util.Iterator;
-
import javax.jms.Message;
+
import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.MessageEvaluationContext;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
Mon Sep 17 11:24:32 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-
import javax.jms.InvalidSelectorException;
import javax.jms.Message;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
Mon Sep 17 11:24:32 2012
@@ -26,7 +26,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.tool;
import java.io.IOException;
-
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.tool;
import java.util.Date;
-
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
Mon Sep 17 11:24:32 2012
@@ -16,7 +16,9 @@
*/
package org.apache.activemq.transport;
-import org.apache.activemq.spring.SpringSslContext;
+import javax.net.ssl.SSLContext;
+
+import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.https.Krb5AndCertsSslSocketConnector;
import org.apache.activemq.util.IntrospectionSupport;
import org.eclipse.jetty.server.Connector;
@@ -24,11 +26,6 @@ import org.eclipse.jetty.server.ssl.SslC
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.apache.activemq.broker.SslContext;
-
-import javax.net.ssl.SSLContext;
-import java.util.Map;
-
public class SecureSocketConnectorFactory extends SocketConnectorFactory {
private String keyPassword =
System.getProperty("javax.net.ssl.keyPassword");
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
Mon Sep 17 11:24:32 2012
@@ -16,13 +16,12 @@
*/
package org.apache.activemq.transport;
+import java.util.Map;
+
import org.apache.activemq.util.IntrospectionSupport;
import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import java.util.Map;
-
public class SocketConnectorFactory {
private Map<String, Object> transportOptions;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
Mon Sep 17 11:24:32 2012
@@ -16,13 +16,13 @@
*/
package org.apache.activemq.transport;
+import java.net.InetAddress;
+import java.net.URI;
+
import org.apache.activemq.util.InetAddressUtil;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import java.net.InetAddress;
-import java.net.URI;
-
abstract public class WebTransportServerSupport extends TransportServerSupport
{
protected URI bindAddress;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
Mon Sep 17 11:24:32 2012
@@ -21,7 +21,6 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java
Mon Sep 17 11:24:32 2012
@@ -20,8 +20,8 @@ import java.net.URI;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
public class EmbeddedJettyServer implements org.apache.activemq.Service {
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.transport.http;
import java.net.URI;
-
import javax.servlet.ServletException;
import org.apache.activemq.broker.BrokerService;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
Mon Sep 17 11:24:32 2012
@@ -16,9 +16,12 @@
*/
package org.apache.activemq.transport.http;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.Map;
+
import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.transport.SocketConnectorFactory;
-import org.apache.activemq.transport.TransportServerSupport;
import org.apache.activemq.transport.WebTransportServerSupport;
import org.apache.activemq.transport.util.TextWireFormat;
import org.apache.activemq.transport.xstream.XStreamWireFormat;
@@ -29,11 +32,6 @@ import org.eclipse.jetty.server.handler.
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.util.Map;
-
public class HttpTransportServer extends WebTransportServerSupport {
private TextWireFormat wireFormat;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
Mon Sep 17 11:24:32 2012
@@ -22,16 +22,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
-import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPInputStream;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.activemq.Service;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.WireFormatInfo;
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=1386558&r1=1386557&r2=1386558&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
Mon Sep 17 11:24:32 2012
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URI;
-
import javax.net.ssl.HttpsURLConnection;
import org.apache.activemq.transport.http.HttpTransport;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java
Mon Sep 17 11:24:32 2012
@@ -16,13 +16,13 @@
*/
package org.apache.activemq.transport.https;
+import java.net.URI;
+
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.SecureSocketConnectorFactory;
import org.apache.activemq.transport.http.HttpTransportServer;
import org.eclipse.jetty.server.Connector;
-import java.net.URI;
-
public class HttpsTransportServer extends HttpTransportServer {
private SslContext context;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
Mon Sep 17 11:24:32 2012
@@ -25,7 +25,6 @@ import java.security.Principal;
import java.util.Collections;
import java.util.List;
import java.util.Random;
-
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSocket;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java
Mon Sep 17 11:24:32 2012
@@ -18,7 +18,6 @@
package org.apache.activemq.transport.ws;
import java.io.IOException;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
Mon Sep 17 11:24:32 2012
@@ -17,24 +17,20 @@
package org.apache.activemq.transport.ws;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.Map;
+
import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.transport.SocketConnectorFactory;
-import org.apache.activemq.transport.TransportServerSupport;
import org.apache.activemq.transport.WebTransportServerSupport;
-import org.apache.activemq.util.InetAddressUtil;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.ServiceStopper;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.util.Map;
-
/**
* Creates a web server and registers web socket server
*
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java
Mon Sep 17 11:24:32 2012
@@ -16,20 +16,19 @@
*/
package org.apache.activemq.transport.wss;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.ws.WSTransportServer;
import org.apache.activemq.util.IOExceptionSupport;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
/**
*
* Factory for Secure WebSocket (wss) transport
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java
Mon Sep 17 11:24:32 2012
@@ -16,15 +16,12 @@
*/
package org.apache.activemq.transport.wss;
+import java.net.URI;
+
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.transport.SecureSocketConnectorFactory;
-import org.apache.activemq.transport.https.Krb5AndCertsSslSocketConnector;
import org.apache.activemq.transport.ws.WSTransportServer;
import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-import javax.net.ssl.SSLContext;
-import java.net.URI;
public class WSSTransportServer extends WSTransportServer {
private SslContext context;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
Mon Sep 17 11:24:32 2012
@@ -16,6 +16,9 @@
*/
package org.apache.activemq.transport.xstream;
+import java.io.IOException;
+import java.io.Reader;
+
import com.thoughtworks.xstream.XStream;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.MarshallAware;
@@ -23,9 +26,6 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.transport.util.TextWireFormat;
import org.apache.activemq.wireformat.WireFormat;
-import java.io.IOException;
-import java.io.Reader;
-
/**
* A {@link WireFormat} implementation which uses the <a
* href="http://xstream.codehaus.org/>XStream</a> library to marshall commands
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.util;
import java.net.URISyntaxException;
-
import javax.jms.Connection;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java
Mon Sep 17 11:24:32 2012
@@ -20,7 +20,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java
Mon Sep 17 11:24:32 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.util;
import java.util.Hashtable;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/AbstractXMLMessageTransformer.java
Mon Sep 17 11:24:32 2012
@@ -18,7 +18,6 @@
package org.apache.activemq.util.oxm;
import java.io.Serializable;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -29,9 +28,6 @@ import javax.jms.TextMessage;
import org.apache.activemq.MessageTransformerSupport;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
-
/**
* Abstract class used as a base for implementing transformers from object to
text messages (in XML/JSON format)
* and vice versa using.
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/oxm/OXMMessageTransformer.java
Mon Sep 17 11:24:32 2012
@@ -23,8 +23,6 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import org.springframework.oxm.AbstractMarshaller;
-import org.springframework.oxm.Marshaller;
-import org.springframework.oxm.Unmarshaller;
import org.springframework.xml.transform.StringResult;
import org.springframework.xml.transform.StringSource;
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=1386558&r1=1386557&r2=1386558&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 11:24:32 2012
@@ -20,7 +20,6 @@ package org.apache.activemq.util.oxm;
import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
-
import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.jms.Session;
Modified:
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java
(original)
+++
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java
Mon Sep 17 11:24:32 2012
@@ -19,7 +19,6 @@ package org.apache.activemq.util.xstream
import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -28,14 +27,13 @@ import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.activemq.MessageTransformerSupport;
-
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XppReader;
+import org.apache.activemq.MessageTransformerSupport;
/**
* Transforms object messages to text messages and vice versa using
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
Mon Sep 17 11:24:32 2012
@@ -21,8 +21,14 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
Mon Sep 17 11:24:32 2012
@@ -18,8 +18,8 @@ package org.apache.activemq.store.amq.re
import java.io.File;
import java.util.Set;
-
import javax.jms.Message;
+
import junit.framework.TestCase;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
Mon Sep 17 11:24:32 2012
@@ -24,7 +24,6 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java
Mon Sep 17 11:24:32 2012
@@ -18,7 +18,6 @@
package org.apache.activemq.transport.http;
import java.net.URISyntaxException;
-
import javax.jms.ConnectionFactory;
import javax.jms.MapMessage;
import javax.jms.MessageConsumer;
@@ -26,7 +25,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import junit.framework.Test;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.JMSMessageTest;
import org.apache.activemq.broker.BrokerService;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java
Mon Sep 17 11:24:32 2012
@@ -19,7 +19,6 @@ package org.apache.activemq.transport.ht
import java.net.URISyntaxException;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java
Mon Sep 17 11:24:32 2012
@@ -16,11 +16,8 @@
*/
package org.apache.activemq.transport.http;
-import static org.junit.Assert.*;
-
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-
import javax.jms.BytesMessage;
import javax.jms.MapMessage;
import javax.jms.MessageConsumer;
@@ -44,6 +41,10 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* This test covers the Message Compression feature of the
ActiveMQConnectionFactory.setUseCompression
* and has no relation to Http transport level compression. The Messages are
compressed using the
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
Mon Sep 17 11:24:32 2012
@@ -20,7 +20,6 @@ import java.net.URI;
import junit.framework.Test;
import junit.textui.TestRunner;
-
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.transport.TransportBrokerTestSupport;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java
Mon Sep 17 11:24:32 2012
@@ -18,7 +18,6 @@ package org.apache.activemq.transport.ht
import java.net.Socket;
import java.net.URL;
-
import javax.net.SocketFactory;
import org.apache.activemq.util.Wait;
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
Mon Sep 17 11:24:32 2012
@@ -17,27 +17,21 @@
package org.apache.activemq.transport.ws;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.net.UnknownHostException;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.SslContext;
import org.apache.activemq.spring.SpringSslContext;
import org.apache.activemq.transport.stomp.StompConnection;
import org.apache.activemq.util.Wait;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.After;
import org.junit.Before;
@@ -53,6 +47,8 @@ import org.openqa.selenium.firefox.Firef
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertTrue;
+
public class WSTransportTest {
private static final Logger LOG =
LoggerFactory.getLogger(WSTransportTest.class);
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
Mon Sep 17 11:24:32 2012
@@ -18,7 +18,6 @@ package org.apache.activemq.util;
import java.io.IOException;
import java.util.Properties;
-
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
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=1386558&r1=1386557&r2=1386558&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
Mon Sep 17 11:24:32 2012
@@ -17,15 +17,24 @@
package org.apache.activemq.util.oxm;
+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 javax.jms.*;
-
-import static
org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.*;
+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;
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/oxm/XStreamMessageTransformTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/XStreamMessageTransformTest.java?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/XStreamMessageTransformTest.java
(original)
+++
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/util/oxm/XStreamMessageTransformTest.java
Mon Sep 17 11:24:32 2012
@@ -17,8 +17,6 @@
package org.apache.activemq.util.oxm;
-import static
org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.ADAPTIVE;
-
import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -27,10 +25,11 @@ import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
+import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.util.xstream.SamplePojo;
-import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
+import static
org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.ADAPTIVE;
public class XStreamMessageTransformTest extends
AbstractXMLMessageTransformerTest {
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=1386558&r1=1386557&r2=1386558&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
Mon Sep 17 11:24:32 2012
@@ -25,14 +25,14 @@ import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
+import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQMessageConsumer;
-import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
-
-import static
org.apache.activemq.util.oxm.AbstractXMLMessageTransformer.MessageTransform.*;
+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;
/**
*
Modified:
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
(original)
+++
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
Mon Sep 17 11:24:32 2012
@@ -16,11 +16,10 @@
limitations under the License.
-->
<beans
- xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
+ xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="broker1" brokerId="broker1" persistent="false"
useShutdownHook="false" useJmx="false"
xmlns="http://activemq.apache.org/schema/core";>
Modified:
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml?rev=1386558&r1=1386557&r2=1386558&view=diff
==============================================================================
---
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
(original)
+++
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
Mon Sep 17 11:24:32 2012
@@ -16,11 +16,10 @@
limitations under the License.
-->
<beans
- xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
+ xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="broker2" brokerId="broker2" persistent="false"
useShutdownHook="false" useJmx="false"
xmlns="http://activemq.apache.org/schema/core";>
