Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor org.activemq -> org.apache.activemq 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359567 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2005-12-28 17:24:02 +00:00
parent f76604393c
commit d29ca2a71b
771 changed files with 3470 additions and 3250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-core/maven.xml
View File

@ -61,8 +61,8 @@
</postGoal> </postGoal>
<goal name="selector:generate" description="Generates the ActiveMQ selector parser."> <goal name="selector:generate" description="Generates the ActiveMQ selector parser.">
<mkdir dir="${pom.build.sourceDirectory}/org/activemq/selector" /> <mkdir dir="${pom.build.sourceDirectory}/org/apache/activemq/selector" />
<javacc target="${basedir}/src/main/grammar/SelectorParser.jj" javacchome="${maven.repo.local}/javacc/jars" outputdirectory="${pom.build.sourceDirectory}/org/activemq/selector" /> <javacc target="${basedir}/src/main/grammar/SelectorParser.jj" javacchome="${maven.repo.local}/javacc/jars" outputdirectory="${pom.build.sourceDirectory}/org/apache/activemq/selector" />
</goal> </goal>
<goal name="openwire:generate-control-data" description="Generates the openwire control data." prereqs="test:compile"> <goal name="openwire:generate-control-data" description="Generates the openwire control data." prereqs="test:compile">
@ -74,7 +74,7 @@
<path refid="maven.dependency.classpath" /> <path refid="maven.dependency.classpath" />
</path> </path>
<java classname="org.activemq.openwire.DataFileGenerator" fork="true"> <java classname="org.apache.activemq.openwire.DataFileGenerator" fork="true">
<classpath refid="test.classpath" /> <classpath refid="test.classpath" />
</java> </java>
@ -111,7 +111,7 @@
<java classname="org.codehaus.gram.Gram" fork="true"> <java classname="org.codehaus.gram.Gram" fork="true">
<classpath refid="openwire.classpath" /> <classpath refid="openwire.classpath" />
<sysproperty key="openwire.version" value="${openwire.version}" /> <sysproperty key="openwire.version" value="${openwire.version}" />
<arg value="src/main/java/org/activemq/command" /> <arg value="src/main/java/org/apache/activemq/command" />
<arg value="src/gram/script/GenerateJavaMarshalling.groovy" /> <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
<arg value="src/gram/script/GenerateCMarshalling.groovy" /> <arg value="src/gram/script/GenerateCMarshalling.groovy" />
<!-- <!--
@ -164,7 +164,7 @@
</j:if> </j:if>
<echo>Running the ActiveMQ broker for the URI ${uri}</echo> <echo>Running the ActiveMQ broker for the URI ${uri}</echo>
<java classname="org.activemq.broker.Main" fork="true"> <java classname="org.apache.activemq.broker.Main" fork="true">
<classpath refid="test.classpath" /> <classpath refid="test.classpath" />
<arg value="${uri}" /> <arg value="${uri}" />
<sysproperty key="com.sun.management.jmxremote.port" value="5001" /> <sysproperty key="com.sun.management.jmxremote.port" value="5001" />
@ -179,7 +179,7 @@
</j:if> </j:if>
<echo>Running the ActiveMQ consumer for the URI ${uri}</echo> <echo>Running the ActiveMQ consumer for the URI ${uri}</echo>
<java classname="org.activemq.simple.Consumer" fork="false"> <java classname="org.apache.activemq.simple.Consumer" fork="false">
<classpath refid="test.classpath" /> <classpath refid="test.classpath" />
<arg value="${uri}" /> <arg value="${uri}" />
</java> </java>

2
activemq-core/pom.xml
View File

@ -250,7 +250,7 @@
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<sourceDirectory>${basedir}/src/main/grammar</sourceDirectory> <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
<outputDirectory>${basedir}/src/main/java/org/activemq/selector</outputDirectory> <outputDirectory>${basedir}/src/main/java/org/apache/activemq/selector</outputDirectory>
</configuration> </configuration>
<goals> <goals>
<goal>javacc</goal> <goal>javacc</goal>

26
activemq-core/project.xml
View File

@ -28,55 +28,55 @@
<description>ActiveMQ is an open source message broker and JMS 1.1 provider</description> <description>ActiveMQ is an open source message broker and JMS 1.1 provider</description>
<shortDescription>ActiveMQ JMS Message Broker</shortDescription> <shortDescription>ActiveMQ JMS Message Broker</shortDescription>
<package>org.activemq</package> <package>org.apache.activemq</package>
<packageGroups> <packageGroups>
<packageGroup> <packageGroup>
<title>Core JMS Client API</title> <title>Core JMS Client API</title>
<packages>org.activemq:org.activemq.message</packages> <packages>org.apache.activemq:org.apache.activemq.message</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>JMS Broker and Region implementations</title> <title>JMS Broker and Region implementations</title>
<packages>org.activemq.broker:org.activemq.broker.*</packages> <packages>org.apache.activemq.broker:org.apache.activemq.broker.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Management Statistics</title> <title>Management Statistics</title>
<packages>org.activemq.management</packages> <packages>org.apache.activemq.management</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>JNDI support</title> <title>JNDI support</title>
<packages>org.activemq.jndi</packages> <packages>org.apache.activemq.jndi</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Message filter and router</title> <title>Message filter and router</title>
<packages>org.activemq.filter:org.activemq.filter.*:org.activemq.selector</packages> <packages>org.apache.activemq.filter:org.apache.activemq.filter.*:org.apache.activemq.selector</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Security strategies and implementations</title> <title>Security strategies and implementations</title>
<packages>org.activemq.security</packages> <packages>org.apache.activemq.security</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Transport, Discovery and WireFormat strategies and implementations</title> <title>Transport, Discovery and WireFormat strategies and implementations</title>
<packages>org.activemq.transport:org.activemq.transport.*</packages> <packages>org.apache.activemq.transport:org.apache.activemq.transport.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>OpenWire support</title> <title>OpenWire support</title>
<packages>org.activemq.command:org.activemq.openwire:org.activemq.openwire.*</packages> <packages>org.apache.activemq.command:org.apache.activemq.openwire:org.apache.activemq.openwire.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Support for Networks</title> <title>Support for Networks</title>
<packages>org.activemq.network:org.activemq.network.*</packages> <packages>org.apache.activemq.network:org.apache.activemq.network.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Message persistence strategies and implementations</title> <title>Message persistence strategies and implementations</title>
<packages>org.activemq.store:org.activemq.store.*</packages> <packages>org.apache.activemq.store:org.apache.activemq.store.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Core router services</title> <title>Core router services</title>
<packages>org.activemq.service:org.activemq.service.*</packages> <packages>org.apache.activemq.service:org.apache.activemq.service.*</packages>
</packageGroup> </packageGroup>
<packageGroup> <packageGroup>
<title>Utilities</title> <title>Utilities</title>
<packages>org.activemq.capacity:org.activemq.io.util:org.activemq.util</packages> <packages>org.apache.activemq.capacity:org.apache.activemq.io.util:org.apache.activemq.util</packages>
</packageGroup> </packageGroup>
</packageGroups> </packageGroups>
<!-- ============ --> <!-- ============ -->

4
activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
**/ **/
package org.activemq.openwire.tool; package org.apache.activemq.openwire.tool;
import org.codehaus.gram.GramSupport; import org.codehaus.gram.GramSupport;
import org.codehaus.jam.JAnnotationValue; import org.codehaus.jam.JAnnotationValue;
@ -66,7 +66,7 @@ public abstract class OpenWireScript extends GramSupport {
public boolean isMarshallAware(JClass j) { public boolean isMarshallAware(JClass j) {
JClass[] interfaces = j.getInterfaces(); JClass[] interfaces = j.getInterfaces();
for (int i = 0; i < interfaces.length; i++) { for (int i = 0; i < interfaces.length; i++) {
if( interfaces[i].getQualifiedName().equals("org.activemq.command.MarshallAware") ) { if( interfaces[i].getQualifiedName().equals("org.apache.activemq.command.MarshallAware") ) {
return true; return true;
} }
} }

2
activemq-core/src/gram/script/GenerateCMarshalling.groovy
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
**/ **/
import org.activemq.openwire.tool.OpenWireScript import org.apache.activemq.openwire.tool.OpenWireScript
/** /**
* Generates the Java marshalling code for the Open Wire Format * Generates the Java marshalling code for the Open Wire Format

8
activemq-core/src/gram/script/GenerateCSharpClasses.groovy
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
**/ **/
import org.activemq.openwire.tool.OpenWireScript import org.apache.activemq.openwire.tool.OpenWireScript
/** /**
* Generates the C# marshalling code for the Open Wire Format * Generates the C# marshalling code for the Open Wire Format
@ -26,7 +26,7 @@ import org.activemq.openwire.tool.OpenWireScript
class GenerateCSharpClasses extends OpenWireScript { class GenerateCSharpClasses extends OpenWireScript {
Object run() { Object run() {
def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire") def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire")
destDir.mkdirs() destDir.mkdirs()
def messageClasses = classes.findAll { isMessageType(it) } def messageClasses = classes.findAll { isMessageType(it) }
@ -130,9 +130,9 @@ namespace ActiveMQ
switch (type) { switch (type) {
case "java.lang.String": case "java.lang.String":
return "string" return "string"
case "org.activemq.message.ActiveMQDestination": case "org.apache.activemq.message.ActiveMQDestination":
return "ActiveMQDestination" return "ActiveMQDestination"
case "org.activemq.message.ActiveMQXid": case "org.apache.activemq.message.ActiveMQXid":
return "ActiveMQXid" return "ActiveMQXid"
default: default:
return name return name

8
activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
**/ **/
import org.activemq.openwire.tool.OpenWireScript import org.apache.activemq.openwire.tool.OpenWireScript
/** /**
* Generates the Java marshalling code for the Open Wire Format * Generates the Java marshalling code for the Open Wire Format
@ -26,7 +26,7 @@ import org.activemq.openwire.tool.OpenWireScript
class GenerateCSharpMarshalling extends OpenWireScript { class GenerateCSharpMarshalling extends OpenWireScript {
Object run() { Object run() {
def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire/io") def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire/io")
destDir.mkdirs() destDir.mkdirs()
def messageClasses = classes.findAll { isMessageType(it) } def messageClasses = classes.findAll { isMessageType(it) }
@ -93,7 +93,7 @@ namespace ActiveMQ
out << "dataIn.readUTF()" out << "dataIn.readUTF()"
break; break;
case "org.activemq.message.ActiveMQDestination": case "org.apache.activemq.message.ActiveMQDestination":
out << "readDestination(dataIn)" out << "readDestination(dataIn)"
break; break;
@ -153,7 +153,7 @@ namespace ActiveMQ
out << "writeUTF($getter, dataOut);" out << "writeUTF($getter, dataOut);"
break; break;
case "org.activemq.message.ActiveMQDestination": case "org.apache.activemq.message.ActiveMQDestination":
out << "writeDestination($getter, dataOut);" out << "writeDestination($getter, dataOut);"
break; break;

18
activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
**/ **/
import org.activemq.openwire.tool.OpenWireScript import org.apache.activemq.openwire.tool.OpenWireScript
/** /**
* Generates the Java marshalling code for the Open Wire Format * Generates the Java marshalling code for the Open Wire Format
@ -29,7 +29,7 @@ class GenerateJavaMarshalling extends OpenWireScript {
def openwireVersion = System.getProperty("openwire.version"); def openwireVersion = System.getProperty("openwire.version");
def destDir = new File("src/main/java/org/activemq/openwire/v${openwireVersion}") def destDir = new File("src/main/java/org/apache/activemq/openwire/v${openwireVersion}")
println "Generating Java marshalling code to directory ${destDir}" println "Generating Java marshalling code to directory ${destDir}"
def openwireClasses = classes.findAll { def openwireClasses = classes.findAll {
@ -78,14 +78,14 @@ out << """/**
* limitations under the License. * limitations under the License.
* *
**/ **/
package org.activemq.openwire.v${openwireVersion}; package org.apache.activemq.openwire.v${openwireVersion};
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import org.activemq.openwire.*; import org.apache.activemq.openwire.*;
import org.activemq.command.*; import org.apache.activemq.command.*;
""" """
for (pkg in jclass.importedPackages) { for (pkg in jclass.importedPackages) {
for (clazz in pkg.classes) { for (clazz in pkg.classes) {
@ -93,7 +93,7 @@ for (pkg in jclass.importedPackages) {
} }
} }
def baseClass = "org.activemq.openwire.DataStreamMarshaller" def baseClass = "org.apache.activemq.openwire.DataStreamMarshaller"
if( !jclass.superclass.simpleName.equals("Object") ) { if( !jclass.superclass.simpleName.equals("Object") ) {
baseClass = jclass.superclass.simpleName + "Marshaller"; baseClass = jclass.superclass.simpleName + "Marshaller";
} }
@ -450,10 +450,10 @@ out << """/**
* limitations under the License. * limitations under the License.
* *
**/ **/
package org.activemq.openwire.v${openwireVersion}; package org.apache.activemq.openwire.v${openwireVersion};
import org.activemq.openwire.DataStreamMarshaller; import org.apache.activemq.openwire.DataStreamMarshaller;
import org.activemq.openwire.OpenWireFormat; import org.apache.activemq.openwire.OpenWireFormat;
/** /**
* MarshallerFactory for Open Wire Format. * MarshallerFactory for Open Wire Format.

4
activemq-core/src/main/grammar/SelectorParser.jj
View File

@ -35,14 +35,14 @@ options {
PARSER_BEGIN(SelectorParser) PARSER_BEGIN(SelectorParser)
package org.activemq.selector; package org.apache.activemq.selector;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import javax.jms.InvalidSelectorException; import javax.jms.InvalidSelectorException;
import org.activemq.filter.*; import org.apache.activemq.filter.*;
/** /**
* JMS Selector Parser generated by JavaCC * JMS Selector Parser generated by JavaCC

74
activemq-core/src/main/java/org/activemq/ActiveMQConnection.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -43,41 +43,41 @@ import javax.jms.TopicConnection;
import javax.jms.TopicSession; import javax.jms.TopicSession;
import javax.jms.XAConnection; import javax.jms.XAConnection;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ActiveMQTempDestination; import org.apache.activemq.command.ActiveMQTempDestination;
import org.activemq.command.ActiveMQTempQueue; import org.apache.activemq.command.ActiveMQTempQueue;
import org.activemq.command.ActiveMQTempTopic; import org.apache.activemq.command.ActiveMQTempTopic;
import org.activemq.command.BrokerInfo; import org.apache.activemq.command.BrokerInfo;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.ConnectionId; import org.apache.activemq.command.ConnectionId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.ControlCommand; import org.apache.activemq.command.ControlCommand;
import org.activemq.command.DestinationInfo; import org.apache.activemq.command.DestinationInfo;
import org.activemq.command.ExceptionResponse; import org.apache.activemq.command.ExceptionResponse;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.command.MessageId; import org.apache.activemq.command.MessageId;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.RedeliveryPolicy; import org.apache.activemq.command.RedeliveryPolicy;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
import org.activemq.command.SessionId; import org.apache.activemq.command.SessionId;
import org.activemq.command.ShutdownInfo; import org.apache.activemq.command.ShutdownInfo;
import org.activemq.management.JMSConnectionStatsImpl; import org.apache.activemq.management.JMSConnectionStatsImpl;
import org.activemq.management.JMSStatsImpl; import org.apache.activemq.management.JMSStatsImpl;
import org.activemq.management.StatsCapable; import org.apache.activemq.management.StatsCapable;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.transport.TransportListener; import org.apache.activemq.transport.TransportListener;
import org.activemq.util.IdGenerator; import org.apache.activemq.util.IdGenerator;
import org.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
import org.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.LongSequenceGenerator;
import org.activemq.util.ServiceSupport; import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -559,7 +559,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
* terminate a broker running in a standalone java process. Server must have * terminate a broker running in a standalone java process. Server must have
* property enable.vm.shutdown=true defined to allow this to work. * property enable.vm.shutdown=true defined to allow this to work.
*/ */
// TODO : org.activemq.message.BrokerAdminCommand not yet implemented. // TODO : org.apache.activemq.message.BrokerAdminCommand not yet implemented.
/* /*
* public void terminateBrokerVM() throws JMSException { BrokerAdminCommand * public void terminateBrokerVM() throws JMSException { BrokerAdminCommand
* command = new BrokerAdminCommand(); * command = new BrokerAdminCommand();

6
activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
@ -28,8 +28,8 @@ import javax.jms.ServerSession;
import javax.jms.ServerSessionPool; import javax.jms.ServerSessionPool;
import javax.jms.Session; import javax.jms.Session;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
/** /**
* For application servers, <CODE>Connection</CODE> objects provide a special * For application servers, <CODE>Connection</CODE> objects provide a special

20
activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -30,15 +30,15 @@ import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory; import javax.jms.TopicConnectionFactory;
import javax.naming.Context; import javax.naming.Context;
import org.activemq.management.JMSStatsImpl; import org.apache.activemq.management.JMSStatsImpl;
import org.activemq.management.StatsCapable; import org.apache.activemq.management.StatsCapable;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.transport.TransportFactory; import org.apache.activemq.transport.TransportFactory;
import org.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
import org.activemq.util.URISupport; import org.apache.activemq.util.URISupport;
import org.activemq.util.URISupport.CompositeData; import org.apache.activemq.util.URISupport.CompositeData;
import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;

4
activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Hashtable; import java.util.Hashtable;
@ -41,7 +41,7 @@ public class ActiveMQConnectionMetaData implements ConnectionMetaData {
int major=0; int major=0;
int minor=0; int minor=0;
try { try {
Package p = Package.getPackage("org.activemq"); Package p = Package.getPackage("org.apache.activemq");
if (p != null) { if (p != null) {
version = p.getImplementationVersion(); version = p.getImplementationVersion();
Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+).*"); Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+).*");

4
activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
public interface ActiveMQDispatcher { public interface ActiveMQDispatcher {
void dispatch(MessageDispatch messageDispatch); void dispatch(MessageDispatch messageDispatch);

30
activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -23,18 +23,18 @@ import javax.jms.IllegalStateException;
import javax.jms.InvalidDestinationException; import javax.jms.InvalidDestinationException;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQBytesMessage;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.CommandTypes; import org.apache.activemq.command.CommandTypes;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.selector.SelectorParser; import org.apache.activemq.selector.SelectorParser;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
/** /**
* *
@ -85,9 +85,9 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch
this.info.setSubcriptionName(name); this.info.setSubcriptionName(name);
if (selector != null && selector.trim().length() != 0) { if (selector != null && selector.trim().length() != 0) {
selector = "JMSType='org.activemq.Stream' AND ( "+selector+" ) "; selector = "JMSType='org.apache.activemq.Stream' AND ( "+selector+" ) ";
} else { } else {
selector = "JMSType='org.activemq.Stream'"; selector = "JMSType='org.apache.activemq.Stream'";
} }
new SelectorParser().parse(selector); new SelectorParser().parse(selector);

34
activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -27,22 +27,22 @@ import javax.jms.Message;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;
import javax.jms.MessageListener; import javax.jms.MessageListener;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.command.RedeliveryPolicy; import org.apache.activemq.command.RedeliveryPolicy;
import org.activemq.management.JMSConsumerStatsImpl; import org.apache.activemq.management.JMSConsumerStatsImpl;
import org.activemq.management.StatsCapable; import org.apache.activemq.management.StatsCapable;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
import org.activemq.selector.SelectorParser; import org.apache.activemq.selector.SelectorParser;
import org.activemq.thread.Scheduler; import org.apache.activemq.thread.Scheduler;
import org.activemq.transaction.Synchronization; import org.apache.activemq.transaction.Synchronization;
import org.activemq.util.Callback; import org.apache.activemq.util.Callback;
import org.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

14
activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.DeliveryMode; import javax.jms.DeliveryMode;
import javax.jms.Destination; import javax.jms.Destination;
@ -26,12 +26,12 @@ import javax.jms.MessageFormatException;
import javax.jms.MessageProducer; import javax.jms.MessageProducer;
import org.activeio.Disposable; import org.activeio.Disposable;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.management.JMSProducerStatsImpl; import org.apache.activemq.management.JMSProducerStatsImpl;
import org.activemq.management.StatsCapable; import org.apache.activemq.management.StatsCapable;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;

24
activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.Enumeration; import java.util.Enumeration;
@ -32,18 +32,18 @@ import javax.jms.TemporaryTopic;
import javax.jms.TextMessage; import javax.jms.TextMessage;
import javax.jms.Topic; import javax.jms.Topic;
import org.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQBytesMessage;
import org.activemq.command.ActiveMQMapMessage; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMapMessage;
import org.activemq.command.ActiveMQObjectMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQObjectMessage;
import org.activemq.command.ActiveMQStreamMessage; import org.apache.activemq.command.ActiveMQQueue;
import org.activemq.command.ActiveMQTempQueue; import org.apache.activemq.command.ActiveMQStreamMessage;
import org.activemq.command.ActiveMQTempTopic; import org.apache.activemq.command.ActiveMQTempQueue;
import org.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.ActiveMQTempTopic;
import org.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.ActiveMQTopic;
/** /**
* A helper class for converting normal JMS interfaces into ActiveMQ specific ones. * A helper class for converting normal JMS interfaces into ActiveMQ specific ones.

18
activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -26,13 +26,13 @@ import javax.jms.InvalidDestinationException;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activeio.Disposable; import org.activeio.Disposable;
import org.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQBytesMessage;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.MessageId; import org.apache.activemq.command.MessageId;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
/** /**
* @version $Revision$ * @version $Revision$
@ -142,7 +142,7 @@ public class ActiveMQOutputStream extends OutputStream implements Disposable {
msg.setObjectProperty(key, value); msg.setObjectProperty(key, value);
} }
} }
msg.setType("org.activemq.Stream"); msg.setType("org.apache.activemq.Stream");
msg.setGroupID(info.getProducerId().toString()); msg.setGroupID(info.getProducerId().toString());
if( eosMessage ) { if( eosMessage ) {
msg.setGroupSequence(-1); msg.setGroupSequence(-1);

2
activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;

8
activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.Enumeration; import java.util.Enumeration;
@ -24,9 +24,9 @@ import javax.jms.Message;
import javax.jms.Queue; import javax.jms.Queue;
import javax.jms.QueueBrowser; import javax.jms.QueueBrowser;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;

6
activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.Queue; import javax.jms.Queue;

4
activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java
View File

@ -15,14 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.Message; import javax.jms.Message;
import javax.jms.Queue; import javax.jms.Queue;
import javax.jms.QueueSender; import javax.jms.QueueSender;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
/** /**
* A client uses a <CODE>QueueSender</CODE> object to send messages to a * A client uses a <CODE>QueueSender</CODE> object to send messages to a

2
activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.Serializable; import java.io.Serializable;

58
activemq-core/src/main/java/org/activemq/ActiveMQSession.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collections; import java.util.Collections;
@ -49,33 +49,33 @@ import javax.jms.TopicSession;
import javax.jms.TopicSubscriber; import javax.jms.TopicSubscriber;
import javax.jms.TransactionRolledBackException; import javax.jms.TransactionRolledBackException;
import org.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQBytesMessage;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMapMessage; import org.apache.activemq.command.ActiveMQMapMessage;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ActiveMQObjectMessage; import org.apache.activemq.command.ActiveMQObjectMessage;
import org.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQQueue;
import org.activemq.command.ActiveMQStreamMessage; import org.apache.activemq.command.ActiveMQStreamMessage;
import org.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.ActiveMQTextMessage;
import org.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.command.MessageId; import org.apache.activemq.command.MessageId;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.RedeliveryPolicy; import org.apache.activemq.command.RedeliveryPolicy;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
import org.activemq.command.SessionId; import org.apache.activemq.command.SessionId;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
import org.activemq.management.JMSSessionStatsImpl; import org.apache.activemq.management.JMSSessionStatsImpl;
import org.activemq.management.StatsCapable; import org.apache.activemq.management.StatsCapable;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
import org.activemq.thread.Scheduler; import org.apache.activemq.thread.Scheduler;
import org.activemq.transaction.Synchronization; import org.apache.activemq.transaction.Synchronization;
import org.activemq.util.Callback; import org.apache.activemq.util.Callback;
import org.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -248,7 +248,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.activemq.management.StatsCapable#getStats() * @see org.apache.activemq.management.StatsCapable#getStats()
*/ */
public StatsImpl getStats() { public StatsImpl getStats() {
return stats; return stats;

12
activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
View File

@ -15,18 +15,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.thread.Task; import org.apache.activemq.thread.Task;
import org.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunner;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
/** /**
* A utility class used by the Session for dispatching messages asynchronously to consumers * A utility class used by the Session for dispatching messages asynchronously to consumers

4
activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java
View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import javax.jms.Destination; import javax.jms.Destination;
import javax.jms.InvalidDestinationException; import javax.jms.InvalidDestinationException;

2
activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.Serializable; import java.io.Serializable;

6
activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java
View File

@ -15,10 +15,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.Topic; import javax.jms.Topic;

6
activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.Session; import javax.jms.Session;
@ -25,8 +25,8 @@ import javax.jms.XASession;
import javax.jms.XATopicConnection; import javax.jms.XATopicConnection;
import javax.jms.XATopicSession; import javax.jms.XATopicSession;
import org.activemq.management.JMSStatsImpl; import org.apache.activemq.management.JMSStatsImpl;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
/** /**
* The XAConnection interface extends the capability of Connection by providing * The XAConnection interface extends the capability of Connection by providing

4
activemq-core/src/main/java/org/activemq/ActiveMQXASession.java → activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.QueueSession; import javax.jms.QueueSession;
@ -26,7 +26,7 @@ import javax.jms.XAQueueSession;
import javax.jms.XATopicSession; import javax.jms.XATopicSession;
import javax.transaction.xa.XAResource; import javax.transaction.xa.XAResource;
import org.activemq.command.SessionId; import org.apache.activemq.command.SessionId;
/** /**
* The XASession interface extends the capability of Session by adding access * The XASession interface extends the capability of Session by adding access

18
activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java → activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
View File

@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.advisory.AdvisorySupport; import org.apache.activemq.advisory.AdvisorySupport;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.DataStructure; import org.apache.activemq.command.DataStructure;
import org.activemq.command.DestinationInfo; import org.apache.activemq.command.DestinationInfo;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
public class AdvisoryConsumer implements ActiveMQDispatcher { public class AdvisoryConsumer implements ActiveMQDispatcher {

2
activemq-core/src/main/java/org/activemq/AlreadyClosedException.java → activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;

2
activemq-core/src/main/java/org/activemq/Closeable.java → activemq-core/src/main/java/org/apache/activemq/Closeable.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;

2
activemq-core/src/main/java/org/activemq/ConfigurationException.java → activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.JMSException; import javax.jms.JMSException;

2
activemq-core/src/main/java/org/activemq/ConnectionClosedException.java → activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.IllegalStateException; import javax.jms.IllegalStateException;

2
activemq-core/src/main/java/org/activemq/ConnectionFailedException.java → activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.IOException; import java.io.IOException;

2
activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java → activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
/** /**

2
activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java → activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;

2
activemq-core/src/main/java/org/activemq/MessageAvailableListener.java → activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.MessageConsumer; import javax.jms.MessageConsumer;

4
activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java → activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
@ -22,7 +22,7 @@ import java.util.List;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
public class MessageDispatchChannel { public class MessageDispatchChannel {

2
activemq-core/src/main/java/org/activemq/NotStartedException.java → activemq-core/src/main/java/org/apache/activemq/NotStartedException.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import javax.jms.IllegalStateException; import javax.jms.IllegalStateException;

2
activemq-core/src/main/java/org/activemq/Service.java → activemq-core/src/main/java/org/apache/activemq/Service.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
/** /**

2
activemq-core/src/main/java/org/activemq/StreamConnection.java → activemq-core/src/main/java/org/apache/activemq/StreamConnection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;

2
activemq-core/src/main/java/org/activemq/ThreadPriorities.java → activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
/** /**

22
activemq-core/src/main/java/org/activemq/TransactionContext.java → activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq; package org.apache.activemq;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -27,16 +27,16 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource; import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid; import javax.transaction.xa.Xid;
import org.activemq.command.ConnectionId; import org.apache.activemq.command.ConnectionId;
import org.activemq.command.DataArrayResponse; import org.apache.activemq.command.DataArrayResponse;
import org.activemq.command.IntegerResponse; import org.apache.activemq.command.IntegerResponse;
import org.activemq.command.LocalTransactionId; import org.apache.activemq.command.LocalTransactionId;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
import org.activemq.command.TransactionInfo; import org.apache.activemq.command.TransactionInfo;
import org.activemq.command.XATransactionId; import org.apache.activemq.command.XATransactionId;
import org.activemq.transaction.Synchronization; import org.apache.activemq.transaction.Synchronization;
import org.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
import org.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

36
activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java → activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
View File

@ -14,27 +14,27 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import java.util.Iterator; import java.util.Iterator;
import org.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.activemq.broker.BrokerFilter; import org.apache.activemq.broker.BrokerFilter;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.DestinationInfo; import org.apache.activemq.command.DestinationInfo;
import org.activemq.command.MessageId; import org.apache.activemq.command.MessageId;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.util.IdGenerator; import org.apache.activemq.util.IdGenerator;
import org.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.LongSequenceGenerator;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;

6
activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java → activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
public class AdvisorySupport { public class AdvisorySupport {

4
activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java → activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import javax.jms.Destination; import javax.jms.Destination;

16
activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java → activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
View File

@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.RemoveInfo; import org.apache.activemq.command.RemoveInfo;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

2
activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java → activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
/** /**
* Listen to the changes in the number of active consumers available for a given destination. * Listen to the changes in the number of active consumers available for a given destination.

6
activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java → activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
/** /**
* An event when a new consumer has started. * An event when a new consumer has started.

6
activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java → activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.advisory; package org.apache.activemq.advisory;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
/** /**
* An event generated when a consumer stops. * An event generated when a consumer stops.

0
activemq-core/src/main/java/org/activemq/advisory/package.html → activemq-core/src/main/java/org/apache/activemq/advisory/package.html
View File

74
activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java → activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -23,41 +23,41 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.broker.region.ConnectionStatistics; import org.apache.activemq.broker.region.ConnectionStatistics;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerInfo; import org.apache.activemq.command.BrokerInfo;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.ConnectionId; import org.apache.activemq.command.ConnectionId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.DataArrayResponse; import org.apache.activemq.command.DataArrayResponse;
import org.activemq.command.DestinationInfo; import org.apache.activemq.command.DestinationInfo;
import org.activemq.command.ExceptionResponse; import org.apache.activemq.command.ExceptionResponse;
import org.activemq.command.FlushCommand; import org.apache.activemq.command.FlushCommand;
import org.activemq.command.KeepAliveInfo; import org.apache.activemq.command.KeepAliveInfo;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageDispatch;
import org.activemq.command.ProducerId; import org.apache.activemq.command.ProducerId;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
import org.activemq.command.SessionId; import org.apache.activemq.command.SessionId;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.ShutdownInfo; import org.apache.activemq.command.ShutdownInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
import org.activemq.command.TransactionInfo; import org.apache.activemq.command.TransactionInfo;
import org.activemq.command.WireFormatInfo; import org.apache.activemq.command.WireFormatInfo;
import org.activemq.state.CommandVisitor; import org.apache.activemq.state.CommandVisitor;
import org.activemq.state.ConsumerState; import org.apache.activemq.state.ConsumerState;
import org.activemq.state.ProducerState; import org.apache.activemq.state.ProducerState;
import org.activemq.state.SessionState; import org.apache.activemq.state.SessionState;
import org.activemq.thread.Task; import org.apache.activemq.thread.Task;
import org.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunner;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.util.ServiceSupport; import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -84,7 +84,7 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
protected boolean disposed=false; protected boolean disposed=false;
static class ConnectionState extends org.activemq.state.ConnectionState { static class ConnectionState extends org.apache.activemq.state.ConnectionState {
private final ConnectionContext context; private final ConnectionContext context;
public ConnectionState(ConnectionInfo info, ConnectionContext context) { public ConnectionState(ConnectionInfo info, ConnectionContext context) {

18
activemq-core/src/main/java/org/activemq/broker/Broker.java → activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
View File

@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.broker.region.Region; import org.apache.activemq.broker.region.Region;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerId; import org.apache.activemq.command.BrokerId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
/** /**
* The Message Broker which routes messages, * The Message Broker which routes messages,

6
activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java → activemq-core/src/main/java/org/apache/activemq/broker/BrokerFactory.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activeio.FactoryFinder; import org.activeio.FactoryFinder;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
@ -29,7 +29,7 @@ import java.net.URI;
*/ */
public class BrokerFactory { public class BrokerFactory {
static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/activemq/broker/"); static final private FactoryFinder brokerFactoryHandlerFinder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");
public interface BrokerFactoryHandler { public interface BrokerFactoryHandler {
public BrokerService createBroker(URI brokerURI) throws Exception; public BrokerService createBroker(URI brokerURI) throws Exception;

24
activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java → activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerId; import org.apache.activemq.command.BrokerId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
/** /**
* Allows you to intercept broker operation so that features such as security can be * Allows you to intercept broker operation so that features such as security can be

2
activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java → activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;

68
activemq-core/src/main/java/org/activemq/broker/BrokerService.java → activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -30,35 +30,35 @@ import java.util.Map;
import javax.management.MBeanServer; import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.ObjectName;
import org.activemq.ActiveMQConnectionMetaData; import org.apache.activemq.ActiveMQConnectionMetaData;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.advisory.AdvisoryBroker; import org.apache.activemq.advisory.AdvisoryBroker;
import org.activemq.broker.jmx.BrokerView; import org.apache.activemq.broker.jmx.BrokerView;
import org.activemq.broker.jmx.BrokerViewMBean; import org.apache.activemq.broker.jmx.BrokerViewMBean;
import org.activemq.broker.jmx.ConnectorView; import org.apache.activemq.broker.jmx.ConnectorView;
import org.activemq.broker.jmx.ConnectorViewMBean; import org.apache.activemq.broker.jmx.ConnectorViewMBean;
import org.activemq.broker.jmx.ManagedRegionBroker; import org.apache.activemq.broker.jmx.ManagedRegionBroker;
import org.activemq.broker.jmx.ManagedTransportConnector; import org.apache.activemq.broker.jmx.ManagedTransportConnector;
import org.activemq.broker.jmx.ManagementContext; import org.apache.activemq.broker.jmx.ManagementContext;
import org.activemq.broker.jmx.NetworkConnectorView; import org.apache.activemq.broker.jmx.NetworkConnectorView;
import org.activemq.broker.jmx.NetworkConnectorViewMBean; import org.apache.activemq.broker.jmx.NetworkConnectorViewMBean;
import org.activemq.broker.jmx.ProxyConnectorView; import org.apache.activemq.broker.jmx.ProxyConnectorView;
import org.activemq.broker.region.RegionBroker; import org.apache.activemq.broker.region.RegionBroker;
import org.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.PolicyMap;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.network.NetworkConnector; import org.apache.activemq.network.NetworkConnector;
import org.activemq.network.jms.JmsConnector; import org.apache.activemq.network.jms.JmsConnector;
import org.activemq.proxy.ProxyConnector; import org.apache.activemq.proxy.ProxyConnector;
import org.activemq.store.DefaultPersistenceAdapterFactory; import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
import org.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.transport.TransportFactory; import org.apache.activemq.transport.TransportFactory;
import org.activemq.transport.TransportServer; import org.apache.activemq.transport.TransportServer;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import org.activemq.util.JMXSupport; import org.apache.activemq.util.JMXSupport;
import org.activemq.util.ServiceStopper; import org.apache.activemq.util.ServiceStopper;
import org.activemq.util.URISupport; import org.apache.activemq.util.URISupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -654,7 +654,7 @@ public class BrokerService implements Service {
map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName())); map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName()));
map.put("ConnectorName", JMXSupport.encodeObjectNamePart(connector.getName())); map.put("ConnectorName", JMXSupport.encodeObjectNamePart(connector.getName()));
try { try {
ObjectName objectName = new ObjectName("org.activemq", map); ObjectName objectName = new ObjectName("org.apache.activemq", map);
mbeanServer.registerMBean(view, objectName); mbeanServer.registerMBean(view, objectName);
registeredMBeanNames.add(objectName); registeredMBeanNames.add(objectName);
} }
@ -672,7 +672,7 @@ public class BrokerService implements Service {
// map.put("ConnectorName", // map.put("ConnectorName",
// JMXSupport.encodeObjectNamePart(connector.())); // JMXSupport.encodeObjectNamePart(connector.()));
try { try {
ObjectName objectName = new ObjectName("org.activemq", map); ObjectName objectName = new ObjectName("org.apache.activemq", map);
mbeanServer.registerMBean(view, objectName); mbeanServer.registerMBean(view, objectName);
registeredMBeanNames.add(objectName); registeredMBeanNames.add(objectName);
} }
@ -690,7 +690,7 @@ public class BrokerService implements Service {
// map.put("ConnectorName", // map.put("ConnectorName",
// JMXSupport.encodeObjectNamePart(connector.())); // JMXSupport.encodeObjectNamePart(connector.()));
try { try {
ObjectName objectName = new ObjectName("org.activemq", map); ObjectName objectName = new ObjectName("org.apache.activemq", map);
mbeanServer.registerMBean(view, objectName); mbeanServer.registerMBean(view, objectName);
registeredMBeanNames.add(objectName); registeredMBeanNames.add(objectName);
} }
@ -797,7 +797,7 @@ public class BrokerService implements Service {
Hashtable map = new Hashtable(); Hashtable map = new Hashtable();
map.put("Type", "Broker"); map.put("Type", "Broker");
map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName())); map.put("BrokerName", JMXSupport.encodeObjectNamePart(getBrokerName()));
return new ObjectName("org.activemq", map); return new ObjectName("org.apache.activemq", map);
} }
catch (Throwable e) { catch (Throwable e) {
throw IOExceptionSupport.create("Invalid JMX broker name: " + brokerName, e); throw IOExceptionSupport.create("Invalid JMX broker name: " + brokerName, e);

8
activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java → activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
/** /**
* This broker filter handles composite destinations. * This broker filter handles composite destinations.

10
activemq-core/src/main/java/org/activemq/broker/Connection.java → activemq-core/src/main/java/org/apache/activemq/broker/Connection.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.broker.region.ConnectionStatistics; import org.apache.activemq.broker.region.ConnectionStatistics;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
/** /**
* *

12
activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java → activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java
View File

@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.activemq.command.ConnectionId; import org.apache.activemq.command.ConnectionId;
import org.activemq.command.WireFormatInfo; import org.apache.activemq.command.WireFormatInfo;
import org.activemq.filter.MessageEvaluationContext; import org.apache.activemq.filter.MessageEvaluationContext;
import org.activemq.security.SecurityContext; import org.apache.activemq.security.SecurityContext;
import org.activemq.transaction.Transaction; import org.apache.activemq.transaction.Transaction;
/** /**
* Used to hold context information needed to process requests sent to a broker. * Used to hold context information needed to process requests sent to a broker.

8
activemq-core/src/main/java/org/activemq/broker/Connector.java → activemq-core/src/main/java/org/apache/activemq/broker/Connector.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.broker.region.ConnectorStatistics; import org.apache.activemq.broker.region.ConnectorStatistics;
import org.activemq.command.BrokerInfo; import org.apache.activemq.command.BrokerInfo;
/** /**
* A connector creates and manages client connections that talk to the Broker. * A connector creates and manages client connections that talk to the Broker.

10
activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java → activemq-core/src/main/java/org/apache/activemq/broker/DefaultBrokerFactory.java
View File

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.broker.BrokerFactory.BrokerFactoryHandler; import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler;
import org.activemq.util.IntrospectionSupport; import org.apache.activemq.util.IntrospectionSupport;
import org.activemq.util.URISupport; import org.apache.activemq.util.URISupport;
import org.activemq.util.URISupport.CompositeData; import org.apache.activemq.util.URISupport.CompositeData;
import java.net.URI; import java.net.URI;
import java.util.HashMap; import java.util.HashMap;

24
activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java → activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerId; import org.apache.activemq.command.BrokerId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
/** /**
* Implementation of the broker where all it's methods throw an IllegalStateException. * Implementation of the broker where all it's methods throw an IllegalStateException.

10
activemq-core/src/main/java/org/activemq/broker/Main.java → activemq-core/src/main/java/org/apache/activemq/broker/Main.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -75,10 +75,10 @@ public class Main {
public static final int TASK_PRINT_ALL_HELP = 12; public static final int TASK_PRINT_ALL_HELP = 12;
public static final int TASK_PRINT_VER = 13; public static final int TASK_PRINT_VER = 13;
public static final String BROKER_FACTORY_CLASS = "org.activemq.broker.BrokerFactory"; public static final String BROKER_FACTORY_CLASS = "org.apache.activemq.broker.BrokerFactory";
public static final String DEFAULT_CONFIG_URI = "xbean:activemq.xml"; public static final String DEFAULT_CONFIG_URI = "xbean:activemq.xml";
public static final String DEFAULT_JMX_URL = "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxconnector"; public static final String DEFAULT_JMX_URL = "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxconnector";
public static final String DEFAULT_JMX_DOMAIN = "org.activemq"; public static final String DEFAULT_JMX_DOMAIN = "org.apache.activemq";
private static final String DEFAULT_KEY_BROKER_NAME = "BrokerName"; private static final String DEFAULT_KEY_BROKER_NAME = "BrokerName";
private static final String DEFAULT_METHOD_BROKER_STOP = "terminateJVM"; private static final String DEFAULT_METHOD_BROKER_STOP = "terminateJVM";
@ -821,7 +821,7 @@ public class Main {
ClassLoader cl = getClassLoader(); ClassLoader cl = getClassLoader();
// Use reflection to get the version // Use reflection to get the version
try { try {
Class activeMQConnectionMetaData = cl.loadClass("org.activemq.ActiveMQConnectionMetaData"); Class activeMQConnectionMetaData = cl.loadClass("org.apache.activemq.ActiveMQConnectionMetaData");
Field field = activeMQConnectionMetaData.getField("PROVIDER_VERSION"); Field field = activeMQConnectionMetaData.getField("PROVIDER_VERSION");
return (String)field.get(null); return (String)field.get(null);
} catch (Throwable e) { } catch (Throwable e) {
@ -901,7 +901,7 @@ public class Main {
if(activeMQHome==null){ if(activeMQHome==null){
// guess from the location of the jar // guess from the location of the jar
URL url = Main.class.getClassLoader().getResource("org/activemq/broker/Main.class"); URL url = Main.class.getClassLoader().getResource("org/apache/activemq/broker/Main.class");
if (url != null) { if (url != null) {
try { try {
JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); JarURLConnection jarConnection = (JarURLConnection) url.openConnection();

24
activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java → activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
View File

@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerId; import org.apache.activemq.command.BrokerId;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.ProducerInfo; import org.apache.activemq.command.ProducerInfo;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.command.SessionInfo; import org.apache.activemq.command.SessionInfo;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
/** /**
* Like a BrokerFilter but it allows you to switch the getNext().broker. This has more * Like a BrokerFilter but it allows you to switch the getNext().broker. This has more

28
activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java → activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
View File

@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.LocalTransactionId; import org.apache.activemq.command.LocalTransactionId;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.TransactionId; import org.apache.activemq.command.TransactionId;
import org.activemq.command.XATransactionId; import org.apache.activemq.command.XATransactionId;
import org.activemq.store.TransactionRecoveryListener; import org.apache.activemq.store.TransactionRecoveryListener;
import org.activemq.store.TransactionStore; import org.apache.activemq.store.TransactionStore;
import org.activemq.transaction.LocalTransaction; import org.apache.activemq.transaction.LocalTransaction;
import org.activemq.transaction.Transaction; import org.apache.activemq.transaction.Transaction;
import org.activemq.transaction.XATransaction; import org.apache.activemq.transaction.XATransaction;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import org.activemq.util.WrappedException; import org.apache.activemq.util.WrappedException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

12
activemq-core/src/main/java/org/activemq/broker/TransportConnection.java → activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import java.io.IOException; import java.io.IOException;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.transport.TransportListener; import org.apache.activemq.transport.TransportListener;
/** /**
* *

26
activemq-core/src/main/java/org/activemq/broker/TransportConnector.java → activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
@ -24,18 +24,18 @@ import java.util.Iterator;
import javax.management.MBeanServer; import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.ObjectName;
import org.activemq.broker.jmx.ManagedTransportConnector; import org.apache.activemq.broker.jmx.ManagedTransportConnector;
import org.activemq.broker.region.ConnectorStatistics; import org.apache.activemq.broker.region.ConnectorStatistics;
import org.activemq.command.BrokerInfo; import org.apache.activemq.command.BrokerInfo;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.transport.TransportAcceptListener; import org.apache.activemq.transport.TransportAcceptListener;
import org.activemq.transport.TransportFactory; import org.apache.activemq.transport.TransportFactory;
import org.activemq.transport.TransportServer; import org.apache.activemq.transport.TransportServer;
import org.activemq.transport.discovery.DiscoveryAgent; import org.apache.activemq.transport.discovery.DiscoveryAgent;
import org.activemq.transport.discovery.DiscoveryAgentFactory; import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
import org.activemq.util.ServiceStopper; import org.apache.activemq.util.ServiceStopper;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

6
activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java → activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.ThreadPriorities; import org.apache.activemq.ThreadPriorities;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

4
activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java → activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker; package org.apache.activemq.broker;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
/** /**
* This broker filter will append the producer's user ID into the JMSXUserID header * This broker filter will append the producer's user ID into the JMSXUserID header

8
activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.DestinationStatistics;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
public class BrokerView implements BrokerViewMBean { public class BrokerView implements BrokerViewMBean {

4
activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.Service; import org.apache.activemq.Service;
public interface BrokerViewMBean extends Service { public interface BrokerViewMBean extends Service {

4
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.Connection; import org.apache.activemq.broker.Connection;
public class ConnectionView implements ConnectionViewMBean { public class ConnectionView implements ConnectionViewMBean {

4
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.Service; import org.apache.activemq.Service;
public interface ConnectionViewMBean extends Service { public interface ConnectionViewMBean extends Service {
/** /**

8
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.Connector; import org.apache.activemq.broker.Connector;
import org.activemq.command.BrokerInfo; import org.apache.activemq.command.BrokerInfo;
import org.activemq.command.RedeliveryPolicy; import org.apache.activemq.command.RedeliveryPolicy;
public class ConnectorView implements ConnectorViewMBean { public class ConnectorView implements ConnectorViewMBean {

4
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.Service; import org.apache.activemq.Service;
public interface ConnectorViewMBean extends Service { public interface ConnectorViewMBean extends Service {

4
activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
public class DestinationView implements DestinationViewMBean { public class DestinationView implements DestinationViewMBean {

2
activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
public interface DestinationViewMBean { public interface DestinationViewMBean {

20
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.DestinationStatistics;
import org.activemq.broker.region.QueueRegion; import org.apache.activemq.broker.region.QueueRegion;
import org.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.PolicyMap;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
public class ManagedQueueRegion extends QueueRegion { public class ManagedQueueRegion extends QueueRegion {

20
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.broker.region.Region; import org.apache.activemq.broker.region.Region;
import org.activemq.broker.region.RegionBroker; import org.apache.activemq.broker.region.RegionBroker;
import org.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.PolicyMap;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.util.JMXSupport; import org.apache.activemq.util.JMXSupport;
import javax.management.MBeanServer; import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.ObjectName;

16
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
View File

@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.DestinationStatistics;
import org.activemq.broker.region.TempQueueRegion; import org.apache.activemq.broker.region.TempQueueRegion;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
public class ManagedTempQueueRegion extends TempQueueRegion { public class ManagedTempQueueRegion extends TempQueueRegion {

16
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
View File

@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.DestinationStatistics;
import org.activemq.broker.region.TempTopicRegion; import org.apache.activemq.broker.region.TempTopicRegion;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
public class ManagedTempTopicRegion extends TempTopicRegion { public class ManagedTempTopicRegion extends TempTopicRegion {

20
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.broker.region.Destination; import org.apache.activemq.broker.region.Destination;
import org.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.DestinationStatistics;
import org.activemq.broker.region.TopicRegion; import org.apache.activemq.broker.region.TopicRegion;
import org.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.PolicyMap;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
public class ManagedTopicRegion extends TopicRegion { public class ManagedTopicRegion extends TopicRegion {

20
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
View File

@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.activemq.broker.TransportConnection; import org.apache.activemq.broker.TransportConnection;
import org.activemq.broker.TransportConnector; import org.apache.activemq.broker.TransportConnector;
import org.activemq.command.ConnectionInfo; import org.apache.activemq.command.ConnectionInfo;
import org.activemq.command.Response; import org.apache.activemq.command.Response;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.util.IOExceptionSupport; import org.apache.activemq.util.IOExceptionSupport;
import org.activemq.util.JMXSupport; import org.apache.activemq.util.JMXSupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

12
activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
View File

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.activemq.broker.Connection; import org.apache.activemq.broker.Connection;
import org.activemq.broker.TransportConnector; import org.apache.activemq.broker.TransportConnector;
import org.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.activemq.transport.TransportServer; import org.apache.activemq.transport.TransportServer;
import javax.management.MBeanServer; import javax.management.MBeanServer;
import javax.management.ObjectName; import javax.management.ObjectName;

6
activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
@ -31,7 +31,7 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory; import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL; import javax.management.remote.JMXServiceURL;
import org.activemq.Service; import org.apache.activemq.Service;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -46,7 +46,7 @@ public class ManagementContext implements Service {
/** /**
* Default activemq domain * Default activemq domain
*/ */
public static final String DEFAULT_DOMAIN = "org.activemq"; public static final String DEFAULT_DOMAIN = "org.apache.activemq";
private final static Log log = LogFactory.getLog(ManagementContext.class); private final static Log log = LogFactory.getLog(ManagementContext.class);

4
activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorView.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.network.NetworkConnector; import org.apache.activemq.network.NetworkConnector;
public class NetworkConnectorView implements NetworkConnectorViewMBean { public class NetworkConnectorView implements NetworkConnectorViewMBean {

4
activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.Service; import org.apache.activemq.Service;
public interface NetworkConnectorViewMBean extends Service { public interface NetworkConnectorViewMBean extends Service {

4
activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorView.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.proxy.ProxyConnector; import org.apache.activemq.proxy.ProxyConnector;
public class ProxyConnectorView implements ProxyConnectorViewMBean { public class ProxyConnectorView implements ProxyConnectorViewMBean {

4
activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java → activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.jmx; package org.apache.activemq.broker.jmx;
import org.activemq.Service; import org.apache.activemq.Service;
public interface ProxyConnectorViewMBean extends Service { public interface ProxyConnectorViewMBean extends Service {

0
activemq-core/src/main/java/org/activemq/broker/jmx/package.html → activemq-core/src/main/java/org/apache/activemq/broker/jmx/package.html
View File

0
activemq-core/src/main/java/org/activemq/broker/package.html → activemq-core/src/main/java/org/apache/activemq/broker/package.html
View File

22
activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java → activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
View File

@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.region; package org.apache.activemq.broker.region;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.RemoveSubscriptionInfo; import org.apache.activemq.command.RemoveSubscriptionInfo;
import org.activemq.filter.DestinationMap; import org.apache.activemq.filter.DestinationMap;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapter;
import org.activemq.thread.TaskRunnerFactory; import org.apache.activemq.thread.TaskRunnerFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;

22
activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java → activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
View File

@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.region; package org.apache.activemq.broker.region;
import javax.jms.InvalidSelectorException; import javax.jms.InvalidSelectorException;
import javax.jms.JMSException; import javax.jms.JMSException;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerId;
import org.activemq.command.ConsumerInfo; import org.apache.activemq.command.ConsumerInfo;
import org.activemq.filter.BooleanExpression; import org.apache.activemq.filter.BooleanExpression;
import org.activemq.filter.DestinationFilter; import org.apache.activemq.filter.DestinationFilter;
import org.activemq.filter.LogicExpression; import org.apache.activemq.filter.LogicExpression;
import org.activemq.filter.MessageEvaluationContext; import org.apache.activemq.filter.MessageEvaluationContext;
import org.activemq.filter.NoLocalExpression; import org.apache.activemq.filter.NoLocalExpression;
import org.activemq.selector.SelectorParser; import org.apache.activemq.selector.SelectorParser;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

10
activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java → activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java
View File

@ -15,12 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.region; package org.apache.activemq.broker.region;
import org.activemq.command.Command; import org.apache.activemq.command.Command;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.management.CountStatisticImpl; import org.apache.activemq.management.CountStatisticImpl;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
/** /**
* The J2EE Statistics for the Connection. * The J2EE Statistics for the Connection.

8
activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java → activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java
View File

@ -15,10 +15,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.region; package org.apache.activemq.broker.region;
import org.activemq.management.CountStatisticImpl; import org.apache.activemq.management.CountStatisticImpl;
import org.activemq.management.PollCountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl;
import org.activemq.management.StatsImpl; import org.apache.activemq.management.StatsImpl;
/** /**
* The J2EE Statistics for the a Destination. * The J2EE Statistics for the a Destination.

18
activemq-core/src/main/java/org/activemq/broker/region/Destination.java → activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
View File

@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.activemq.broker.region; package org.apache.activemq.broker.region;
import java.io.IOException; import java.io.IOException;
import org.activemq.Service; import org.apache.activemq.Service;
import org.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
import org.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.activemq.command.Message; import org.apache.activemq.command.Message;
import org.activemq.command.MessageAck; import org.apache.activemq.command.MessageAck;
import org.activemq.command.MessageId; import org.apache.activemq.command.MessageId;
import org.activemq.memory.UsageManager; import org.apache.activemq.memory.UsageManager;
import org.activemq.store.MessageStore; import org.apache.activemq.store.MessageStore;
/** /**
* *

Some files were not shown because too many files have changed in this diff Show More