mirror of https://github.com/apache/activemq.git
doing package refactor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359581 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c1f5c77e62
commit
8abcfd13fc
|
@ -9,15 +9,15 @@
|
|||
<shortDescription>ActiveMQ Optional Tools</shortDescription>
|
||||
<description>ActiveMQ Optional Tools</description>
|
||||
|
||||
<package>org.activemq</package>
|
||||
<package>org.apache.activemq</package>
|
||||
<packageGroups>
|
||||
<packageGroup>
|
||||
<title>HTTP Message Transport</title>
|
||||
<packages>org.activemq.transport.http</packages>
|
||||
<packages>org.apache.activemq.transport.http</packages>
|
||||
</packageGroup>
|
||||
<packageGroup>
|
||||
<title>Web Service and Apache Axis support</title>
|
||||
<packages>org.activemq.axis</packages>
|
||||
<packages>org.apache.activemq.axis</packages>
|
||||
</packageGroup>
|
||||
|
||||
</packageGroups>
|
||||
|
|
|
@ -1 +1 @@
|
|||
org.activemq.axis.ActiveMQVendorAdapter
|
||||
org.apache.activemq.axis.ActiveMQVendorAdapter
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
class=org.activemq.transport.http.HttpTransportFactory
|
|
@ -1 +0,0 @@
|
|||
class=org.activemq.transport.jrms.JRMSTransportChannelFactory
|
|
@ -1 +0,0 @@
|
|||
class=org.activemq.transport.ssl.SslTransportChannelFactory
|
|
@ -1 +0,0 @@
|
|||
class=org.activemq.transport.xstream.XStreamWireFormatFactory
|
|
@ -0,0 +1 @@
|
|||
class=org.apache.activemq.transport.http.HttpTransportFactory
|
|
@ -0,0 +1 @@
|
|||
class=org.apache.activemq.transport.jrms.JRMSTransportChannelFactory
|
|
@ -0,0 +1 @@
|
|||
class=org.apache.activemq.transport.ssl.SslTransportChannelFactory
|
|
@ -0,0 +1 @@
|
|||
class=org.apache.activemq.transport.xstream.XStreamWireFormatFactory
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.axis;
|
||||
package org.apache.activemq.axis;
|
||||
|
||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||
import org.apache.axis.components.jms.BeanVendorAdapter;
|
||||
import org.apache.axis.transport.jms.JMSURLHelper;
|
||||
import org.activemq.ActiveMQConnectionFactory;
|
||||
|
||||
import javax.jms.ConnectionFactory;
|
||||
import javax.jms.QueueConnectionFactory;
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.benchmark;
|
||||
package org.apache.activemq.benchmark;
|
||||
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.activemq.ActiveMQConnectionFactory;
|
||||
import org.activemq.util.IdGenerator;
|
||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||
import org.apache.activemq.util.IdGenerator;
|
||||
|
||||
import javax.jms.Connection;
|
||||
import javax.jms.Destination;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.benchmark;
|
||||
package org.apache.activemq.benchmark;
|
||||
|
||||
import javax.jms.Destination;
|
||||
import javax.jms.JMSException;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.benchmark;
|
||||
package org.apache.activemq.benchmark;
|
||||
|
||||
import javax.jms.DeliveryMode;
|
||||
import javax.jms.Destination;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.benchmark;
|
||||
package org.apache.activemq.benchmark;
|
||||
|
||||
|
||||
/**
|
|
@ -16,15 +16,15 @@
|
|||
*
|
||||
**/
|
||||
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.activemq.ActiveMQConnectionFactory;
|
||||
import org.activemq.command.ActiveMQQueue;
|
||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||
import org.apache.activemq.command.ActiveMQQueue;
|
||||
|
||||
import javax.jms.BytesMessage;
|
||||
import javax.jms.Connection;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
|
||||
import javax.jms.Connection;
|
||||
import javax.jms.JMSException;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
|
||||
import javax.jms.Connection;
|
||||
import javax.jms.ConnectionFactory;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
|
||||
import java.util.Date;
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
|
||||
import org.activemq.ActiveMQConnection;
|
||||
import org.activemq.ActiveMQConnectionFactory;
|
||||
import org.activemq.util.IndentPrinter;
|
||||
import org.apache.activemq.ActiveMQConnection;
|
||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||
import org.apache.activemq.util.IndentPrinter;
|
||||
|
||||
import javax.jms.Connection;
|
||||
import javax.jms.Destination;
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.tool;
|
||||
package org.apache.activemq.tool;
|
||||
import org.mortbay.jetty.Connector;
|
||||
import org.mortbay.jetty.Server;
|
||||
import org.mortbay.jetty.bio.SocketConnector;
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import edu.emory.mathcs.backport.java.util.Queue;
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
|
||||
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.transport.TransportSupport;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.transport.TransportSupport;
|
||||
|
||||
import javax.jms.JMSException;
|
||||
|
|
@ -15,15 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.command.ConnectionInfo;
|
||||
import org.activemq.command.Response;
|
||||
import org.activemq.transport.FutureResponse;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.activemq.util.IOExceptionSupport;
|
||||
import org.activemq.util.ServiceStopper;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.command.ConnectionInfo;
|
||||
import org.apache.activemq.command.Response;
|
||||
import org.apache.activemq.transport.FutureResponse;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.util.IOExceptionSupport;
|
||||
import org.apache.activemq.util.ServiceStopper;
|
||||
import org.apache.commons.httpclient.Header;
|
||||
import org.apache.commons.httpclient.HttpClient;
|
||||
import org.apache.commons.httpclient.HttpMethod;
|
||||
|
@ -39,7 +39,7 @@ import java.net.HttpURLConnection;
|
|||
import java.net.URI;
|
||||
|
||||
/**
|
||||
* A HTTP {@link org.activemq.transport.TransportChannel} which uses the <a
|
||||
* A HTTP {@link org.apache.activemq.transport.TransportChannel} which uses the <a
|
||||
* href="http://jakarta.apache.org/commons/httpclient/">commons-httpclient</a>
|
||||
* library
|
||||
*
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.broker.BrokerService;
|
||||
import org.activemq.transport.TransportAcceptListener;
|
||||
import org.apache.activemq.broker.BrokerService;
|
||||
import org.apache.activemq.transport.TransportAcceptListener;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
|
||||
|
@ -64,7 +64,7 @@ public class HttpEmbeddedTunnelServlet extends HttpTunnelServlet {
|
|||
transportConnector = new HttpTransportServer(new URI(url));
|
||||
answer.addConnector(transportConnector);
|
||||
|
||||
String brokerURL = getServletContext().getInitParameter("org.activemq.brokerURL");
|
||||
String brokerURL = getServletContext().getInitParameter("org.apache.activemq.brokerURL");
|
||||
if (brokerURL != null) {
|
||||
log("Listening for internal communication on: " + brokerURL);
|
||||
}
|
|
@ -15,14 +15,14 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.command.ConnectionInfo;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.activemq.util.Callback;
|
||||
import org.activemq.util.IOExceptionSupport;
|
||||
import org.activemq.util.ServiceStopper;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.command.ConnectionInfo;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.util.Callback;
|
||||
import org.apache.activemq.util.IOExceptionSupport;
|
||||
import org.apache.activemq.util.ServiceStopper;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
@ -15,16 +15,16 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activemq.transport.MutexTransport;
|
||||
import org.activemq.transport.ResponseCorrelator;
|
||||
import org.activemq.transport.Transport;
|
||||
import org.activemq.transport.TransportFactory;
|
||||
import org.activemq.transport.TransportServer;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.apache.activemq.transport.MutexTransport;
|
||||
import org.apache.activemq.transport.ResponseCorrelator;
|
||||
import org.apache.activemq.transport.Transport;
|
||||
import org.apache.activemq.transport.TransportFactory;
|
||||
import org.apache.activemq.transport.TransportServer;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.command.BrokerInfo;
|
||||
import org.activemq.transport.TransportServerSupport;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.apache.activemq.command.BrokerInfo;
|
||||
import org.apache.activemq.transport.TransportServerSupport;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.mortbay.jetty.Connector;
|
||||
import org.mortbay.jetty.Server;
|
||||
import org.mortbay.jetty.bio.SocketConnector;
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.transport.TransportThreadSupport;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.transport.TransportThreadSupport;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
|
||||
import java.net.URI;
|
||||
|
|
@ -15,19 +15,19 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.ArrayBlockingQueue;
|
||||
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.command.CommandTypes;
|
||||
import org.activemq.command.ConnectionInfo;
|
||||
import org.activemq.command.KeepAliveInfo;
|
||||
import org.activemq.command.WireFormatInfo;
|
||||
import org.activemq.transport.TransportAcceptListener;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.command.CommandTypes;
|
||||
import org.apache.activemq.command.ConnectionInfo;
|
||||
import org.apache.activemq.command.KeepAliveInfo;
|
||||
import org.apache.activemq.command.WireFormatInfo;
|
||||
import org.apache.activemq.transport.TransportAcceptListener;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.transport.xstream.XStreamWireFormat;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.https;
|
||||
package org.apache.activemq.transport.https;
|
||||
|
||||
import org.activemq.transport.http.HttpTransport;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.transport.http.HttpTransport;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.https;
|
||||
package org.apache.activemq.transport.https;
|
||||
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activemq.transport.Transport;
|
||||
import org.activemq.transport.TransportServer;
|
||||
import org.activemq.transport.http.HttpTransportFactory;
|
||||
import org.apache.activemq.transport.Transport;
|
||||
import org.apache.activemq.transport.TransportServer;
|
||||
import org.apache.activemq.transport.http.HttpTransportFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.https;
|
||||
package org.apache.activemq.transport.https;
|
||||
|
||||
import org.activemq.transport.http.HttpTransportServer;
|
||||
import org.apache.activemq.transport.http.HttpTransportServer;
|
||||
import org.mortbay.jetty.security.SslSocketConnector;
|
||||
|
||||
import java.net.URI;
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.ssl;
|
||||
package org.apache.activemq.transport.ssl;
|
||||
|
||||
import org.activemq.transport.tcp.TcpTransportFactory;
|
||||
import org.apache.activemq.transport.tcp.TcpTransportFactory;
|
||||
|
||||
import javax.net.ServerSocketFactory;
|
||||
import javax.net.SocketFactory;
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.util;
|
||||
package org.apache.activemq.transport.util;
|
||||
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activemq.command.Command;
|
||||
import org.apache.activemq.command.Command;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
|
@ -15,14 +15,14 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.xstream;
|
||||
package org.apache.activemq.transport.xstream;
|
||||
|
||||
import com.thoughtworks.xstream.XStream;
|
||||
|
||||
import org.activeio.Packet;
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.transport.util.TextWireFormat;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.transport.util.TextWireFormat;
|
||||
|
||||
import javax.jms.JMSException;
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.xstream;
|
||||
package org.apache.activemq.transport.xstream;
|
||||
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activeio.command.WireFormatFactory;
|
|
@ -1 +1 @@
|
|||
class=org.activemq.transport.http.HttpTransportFactory
|
||||
class=org.apache.activemq.transport.http.HttpTransportFactory
|
||||
|
|
|
@ -1 +1 @@
|
|||
class=org.activemq.transport.https.HttpsTransportFactory
|
||||
class=org.apache.activemq.transport.https.HttpsTransportFactory
|
||||
|
|
|
@ -1 +1 @@
|
|||
class=org.activemq.transport.xstream.XStreamWireFormatFactory
|
||||
class=org.apache.activemq.transport.xstream.XStreamWireFormatFactory
|
|
@ -16,11 +16,11 @@
|
|||
*
|
||||
**/
|
||||
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.ActiveMQConnectionFactory;
|
||||
import org.activemq.broker.BrokerService;
|
||||
import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
|
||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||
import org.apache.activemq.broker.BrokerService;
|
||||
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
|
||||
|
||||
/**
|
||||
* @version $Revision$
|
|
@ -16,9 +16,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.http;
|
||||
package org.apache.activemq.transport.http;
|
||||
|
||||
import org.activemq.transport.TransportBrokerTestSupport;
|
||||
import org.apache.activemq.transport.TransportBrokerTestSupport;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.textui.TestRunner;
|
|
@ -16,9 +16,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.ssl;
|
||||
package org.apache.activemq.transport.ssl;
|
||||
|
||||
import org.activemq.transport.TransportBrokerTestSupport;
|
||||
import org.apache.activemq.transport.TransportBrokerTestSupport;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.textui.TestRunner;
|
|
@ -15,11 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
**/
|
||||
package org.activemq.transport.xstream;
|
||||
package org.apache.activemq.transport.xstream;
|
||||
|
||||
import org.activeio.command.WireFormat;
|
||||
import org.activemq.command.Command;
|
||||
import org.activemq.command.MessageTest;
|
||||
import org.apache.activemq.command.Command;
|
||||
import org.apache.activemq.command.MessageTest;
|
||||
import org.apache.activemq.transport.xstream.XStreamWireFormat;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<!-- context config -->
|
||||
<context-param>
|
||||
<param-name>org.activemq.brokerURL</param-name>
|
||||
<param-name>org.apache.activemq.brokerURL</param-name>
|
||||
<param-value>tcp://localhost:61616</param-value>
|
||||
<description>The URL that the embedded broker should listen on in addition to HTTP</description>
|
||||
</context-param>
|
||||
|
@ -25,7 +25,7 @@
|
|||
<!-- the main REST servlet -->
|
||||
<servlet>
|
||||
<servlet-name>TunnelServlet</servlet-name>
|
||||
<servlet-class>org.activemq.transport.http.HttpEmbeddedTunnelServlet</servlet-class>
|
||||
<servlet-class>org.apache.activemq.transport.http.HttpEmbeddedTunnelServlet</servlet-class>
|
||||
<load-on-startup>1</load-on-startup>
|
||||
</servlet>
|
||||
|
||||
|
|
Loading…
Reference in New Issue