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

- Move AMQ command console to separate module (activemq-console) 

- Move Main.java to console module
- Move maven goal "run:broker" from core to console.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@375519 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-02-07 06:48:24 +00:00
parent f6735ea870
commit 7fa8660c7e
45 changed files with 610 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
activemq-console/maven.xml Normal file
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:license="license" xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:artifact="artifact">
<goal name="default" prereqs="jar:install"/>
<postGoal name="clean">
<delete dir="${basedir}/activemq-data" />
<delete dir="${basedir}/foo" />
</postGoal>
<!-- ================================================================ -->
<!-- GOALS for running benchmarks -->
<!-- ================================================================ -->
<goal name="run:broker" description="Runs the broker" prereqs="setclasspath">
<j:if test="${empty(uri)}">
<j:set var="uri" value="broker://(tcp://localhost:61616)?useJmx=true" />
</j:if>
<echo>Running the ActiveMQ broker for the URI ${uri}</echo>
<java classname="org.apache.activemq.console.Main" fork="true">
<classpath refid="test.classpath" />
<arg value="${uri}" />
<sysproperty key="com.sun.management.jmxremote.port" value="5001" />
<sysproperty key="com.sun.management.jmxremote.authenticate" value="false" />
<sysproperty key="com.sun.management.jmxremote.ssl" value="false" />
</java>
</goal>
<goal name="run:consumer" description="Runs the broker" prereqs="setclasspath">
<j:if test="${empty(uri)}">
<j:set var="uri" value="tcp://localhost:61616" />
</j:if>
<echo>Running the ActiveMQ consumer for the URI ${uri}</echo>
<java classname="org.apache.activemq.console.simple.Consumer" fork="false">
<classpath refid="test.classpath" />
<arg value="${uri}" />
</java>
</goal>
<goal name="setclasspath" prereqs="java:compile">
<path id="test.classpath">
<pathelement path="${maven.build.dest}" />
<pathelement path="target/classes" />
<pathelement path="target/test-classes" />
<path refid="maven.dependency.classpath" />
</path>
</goal>
<goal name="reports:site">
<attainGoal name="site" />
</goal>
<goal name="jar:deploy-javadoc"
description="Deploys javadoc binary" prereqs="javadoc:install">
<artifact:deploy
artifact="${basedir}/target/${pom.artifactId}-${pom.currentVersion}_javadoc.jar"
type="jar"
project="${pom}"
/>
</goal>
</project>

168
activemq-console/pom.xml Normal file
View File

@ -0,0 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<model>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-project</artifactId>
<version>4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>activemq-console</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ :: Console</name>
<description>ActiveMQ Management Console</description>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-management</artifactId>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-impl</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
<groupId>xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.1.2-SNAPSHOT</version>
<configuration>
<forkMode>pertest</forkMode>
<childDelegation>false</childDelegation>
<useFile>true</useFile>
<excludes>
</excludes>
<includes>
<include>**/*Test.*</include>
</includes>
</configuration>
</plugin>
<!-- generate the attached tests jar -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</model>

6
activemq-console/project.properties Normal file
View File

@ -0,0 +1,6 @@
# -------------------------------------------------------------------
# Build Properties
# -------------------------------------------------------------------
maven.multiproject.type=jar
maven.changelog.range=730

266
activemq-console/project.xml Normal file
View File

@ -0,0 +1,266 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<pomVersion>3</pomVersion>
<extend>${basedir}/../etc/project.xml</extend>
<name>ActiveMQ :: Console</name>
<artifactId>activemq-console</artifactId>
<description>ActiveMQ Console is an open source management console that is use to monitor a JMX enabled ActiveMQ broker.</description>
<shortDescription>ActiveMQ Management Console</shortDescription>
<package>org.apache.activemq.console</package>
<packageGroups>
<packageGroup>
<title>Console Commands</title>
<packages>org.apache.activemq.console.command</packages>
</packageGroup>
<packageGroup>
<title>Query Filters</title>
<packages>org.apache.activemq.console.filter</packages>
</packageGroup>
<packageGroup>
<title>Console Output Formatter</title>
<packages>org.apache.activemq.console.formatter</packages>
</packageGroup>
<packageGroup>
<title>Utilities</title>
<packages>org.apache.activemq.console.util</packages>
</packageGroup>
</packageGroups>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core-test</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
</dependency>
<!-- used to support optional transport configuration via URI query strings -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons_beanutils_version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons_collections_version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons_httpclient_version}</version>
</dependency>
<dependency>
<groupId>xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.gbean.org</url>
</dependency>
<dependency>
<id>springframework</id>
<artifactId>spring</artifactId>
<version>${spring_version}</version>
<url>http://www.springframework.org</url>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>${mx4j_remote_version}</version>
</dependency>
<!-- Derby DB used for testing JDBC message store -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derbynet_version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xercesImpl_version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>${xercesImpl_version}</version>
</dependency>
</dependencies>
<build>
<nagEmailAddress>dev@activemq.codehaus.org</nagEmailAddress>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<resources>
<resource>
<directory>src/test/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
</excludes>
</unitTest>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
<filtering>false</filtering>
</resource>
<resource>
<directory>target/generated</directory>
<includes>
<include>**/*</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</build>
<developers>
<developer>
<name>James Strachan</name>
<id>jstrachan</id>
<email>jstrachan@logicblaze.com</email>
</developer>
<developer>
<name>Hiram Chirino</name>
<id>chirino</id>
<email>hiram@logicblaze.com</email>
</developer>
<developer>
<name>Rob Davies</name>
<id>Rob</id>
<email>rajdavies@gmail.com</email>
</developer>
<developer>
<name>Jonas Lim</name>
<id>jlim</id>
<email>jlim@exist.com</email>
</developer>
<developer>
<name>Frederick Oconer</name>
<id>foconer</id>
<email>foconer@exist.com</email>
</developer>
<developer>
<name>Joseph Gapuz</name>
<id>jgapuz</id>
<email>jgapuz@exist.com</email>
</developer>
<developer>
<name>Patrick Villacorta</name>
<id>pvillacorta</id>
<email>pvillacorta@exist.com</email>
</developer>
<developer>
<name>Darwin Flores</name>
<id>dflores</id>
<email>dflores@exist.com</email>
</developer>
<developer>
<name>Merwin Yap</name>
<id>myap</id>
<email>myap@exist.com</email>
</developer>
<developer>
<name>Adrian Co</name>
<id>aco</id>
<email>aco@exist.com</email>
</developer>
<developer>
<name>Dennis Cook</name>
<id>dcook</id>
<email>dennis@bevocal.com</email>
</developer>
<developer>
<name>Dag Liodden</name>
<id>daggerrz</id>
<email>dag.liodden@giantleap.no</email>
</developer>
<developer>
<name>Peter Brooke</name>
<id>pbrooke</id>
</developer>
<developer>
<name>Ramzi Saba</name>
<id>rsaba</id>
<email>rsaba@optaros.com</email>
</developer>
<developer>
<name>Brian McCallister</name>
<id>brianm</id>
<email>brianm@apache.org</email>
</developer>
</developers>
<reports>
<report>maven-javadoc-plugin</report>
<report>maven-junit-report-plugin</report>
</reports>
<repository>
<connection>scm:svn:svn://svn.activemq.org/activemq/scm/branches/activemq-4-0/activemq</connection>
<developerConnection>scm:svn:svn://svn.activemq.org/activemq/branches/activemq-4-0/activemq</developerConnection>
<url>https://svn.activemq.org/activemq/branches/activemq-4-0/activemq/</url>
</repository>
</project>

4
activemq-core/src/main/java/org/apache/activemq/broker/Main.java → activemq-console/src/main/java/org/apache/activemq/console/Main.java Executable file → Normal file
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker;
package org.apache.activemq.console;
import java.io.File;
import java.io.InputStream;
@ -40,7 +40,7 @@ import java.util.List;
*/
public class Main {
public static final String TASK_DEFAULT_CLASS = "org.apache.activemq.broker.console.command.ShellCommand";
public static final String TASK_DEFAULT_CLASS = "org.apache.activemq.console.command.ShellCommand";
private File activeMQHome;
private ClassLoader classLoader;

4
activemq-core/src/main/java/org/apache/activemq/broker/console/command/AbstractAmqCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/AbstractAmqCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.formatter.GlobalWriter;
import javax.jms.ConnectionFactory;
import javax.jms.Connection;

4
activemq-core/src/main/java/org/apache/activemq/broker/console/command/AbstractCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.ActiveMQConnectionMetaData;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.formatter.GlobalWriter;
import java.util.List;

4
activemq-core/src/main/java/org/apache/activemq/broker/console/command/AbstractJmxCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
View File

@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.formatter.GlobalWriter;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnector;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/command/BrowseCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/BrowseCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.AmqMessagesUtil;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.util.AmqMessagesUtil;
import org.apache.activemq.console.formatter.GlobalWriter;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/command/Command.java → activemq-console/src/main/java/org/apache/activemq/console/command/Command.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import java.util.List;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/command/ListCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/ListCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.broker.console.JmxMBeansUtil;
import org.apache.activemq.console.formatter.GlobalWriter;
import org.apache.activemq.console.util.JmxMBeansUtil;
import java.util.List;
import java.util.Set;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/command/QueryCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.JmxMBeansUtil;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.util.JmxMBeansUtil;
import org.apache.activemq.console.formatter.GlobalWriter;
import java.util.List;
import java.util.Properties;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/command/ShellCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.broker.console.formatter.CommandShellOutputFormatter;
import org.apache.activemq.console.formatter.GlobalWriter;
import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
import java.util.List;
import java.util.Arrays;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/command/ShutdownCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.console.JmxMBeansUtil;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.util.JmxMBeansUtil;
import org.apache.activemq.console.formatter.GlobalWriter;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;

4
activemq-core/src/main/java/org/apache/activemq/broker/console/command/StartCommand.java → activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java
View File

@ -15,11 +15,11 @@
* limitations under the License.
*/
package org.apache.activemq.broker.console.command;
package org.apache.activemq.console.command;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.console.formatter.GlobalWriter;
import java.util.List;
import java.util.ArrayList;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/AbstractQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/AbstractQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.List;
import java.util.StringTokenizer;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/GroupPropertiesViewFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/GroupPropertiesViewFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.Set;
import java.util.Map;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/MBeansAttributeQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansAttributeQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnectorFactory;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/MBeansObjectNameQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansObjectNameQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.JMXConnector;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/MBeansRegExQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansRegExQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import javax.management.ObjectInstance;
import javax.management.ObjectName;

6
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/MapTransformFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/MapTransformFilter.java
View File

@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import org.apache.activemq.broker.console.formatter.GlobalWriter;
import org.apache.activemq.broker.console.AmqMessagesUtil;
import org.apache.activemq.console.formatter.GlobalWriter;
import org.apache.activemq.console.util.AmqMessagesUtil;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQObjectMessage;
import org.apache.activemq.command.ActiveMQBytesMessage;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/MessagesQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/MessagesQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.ActiveMQQueue;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/PropertiesViewFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/PropertiesViewFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.Set;
import java.util.Iterator;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/QueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/QueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.List;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/RegExQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/RegExQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.regex.Pattern;
import java.util.List;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/ResultTransformFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/ResultTransformFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.ArrayList;
import java.util.Iterator;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/StubQueryFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/StubQueryFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.List;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/WildcardToMsgSelectorTransformFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilter{
/**

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/WildcardToRegExTransformFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
public class WildcardToRegExTransformFilter extends WildcardTransformFilter {
/**

2
activemq-core/src/main/java/org/apache/activemq/broker/console/filter/WildcardTransformFilter.java → activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardTransformFilter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.filter;
package org.apache.activemq.console.filter;
import java.util.Iterator;
import java.util.ArrayList;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/formatter/CommandShellOutputFormatter.java → activemq-console/src/main/java/org/apache/activemq/console/formatter/CommandShellOutputFormatter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.formatter;
package org.apache.activemq.console.formatter;
import javax.management.ObjectInstance;
import javax.management.ObjectName;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/formatter/GlobalWriter.java → activemq-console/src/main/java/org/apache/activemq/console/formatter/GlobalWriter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.formatter;
package org.apache.activemq.console.formatter;
import javax.management.ObjectInstance;
import javax.management.ObjectName;

2
activemq-core/src/main/java/org/apache/activemq/broker/console/formatter/OutputFormatter.java → activemq-console/src/main/java/org/apache/activemq/console/formatter/OutputFormatter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console.formatter;
package org.apache.activemq.console.formatter;
import javax.management.ObjectInstance;
import javax.management.ObjectName;

16
activemq-core/src/main/java/org/apache/activemq/broker/console/AmqMessagesUtil.java → activemq-console/src/main/java/org/apache/activemq/console/util/AmqMessagesUtil.java
View File

@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console;
package org.apache.activemq.console.util;
import org.apache.activemq.broker.console.filter.QueryFilter;
import org.apache.activemq.broker.console.filter.WildcardToMsgSelectorTransformFilter;
import org.apache.activemq.broker.console.filter.MessagesQueryFilter;
import org.apache.activemq.broker.console.filter.PropertiesViewFilter;
import org.apache.activemq.broker.console.filter.StubQueryFilter;
import org.apache.activemq.broker.console.filter.MapTransformFilter;
import org.apache.activemq.broker.console.filter.GroupPropertiesViewFilter;
import org.apache.activemq.console.filter.QueryFilter;
import org.apache.activemq.console.filter.WildcardToMsgSelectorTransformFilter;
import org.apache.activemq.console.filter.MessagesQueryFilter;
import org.apache.activemq.console.filter.PropertiesViewFilter;
import org.apache.activemq.console.filter.StubQueryFilter;
import org.apache.activemq.console.filter.MapTransformFilter;
import org.apache.activemq.console.filter.GroupPropertiesViewFilter;
import javax.jms.Destination;
import java.net.URI;

18
activemq-core/src/main/java/org/apache/activemq/broker/console/JmxMBeansUtil.java → activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
View File

@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.console;
package org.apache.activemq.console.util;
import org.apache.activemq.broker.console.filter.QueryFilter;
import org.apache.activemq.broker.console.filter.MBeansObjectNameQueryFilter;
import org.apache.activemq.broker.console.filter.WildcardToRegExTransformFilter;
import org.apache.activemq.broker.console.filter.MBeansRegExQueryFilter;
import org.apache.activemq.broker.console.filter.MBeansAttributeQueryFilter;
import org.apache.activemq.broker.console.filter.PropertiesViewFilter;
import org.apache.activemq.broker.console.filter.StubQueryFilter;
import org.apache.activemq.broker.console.filter.MapTransformFilter;
import org.apache.activemq.console.filter.QueryFilter;
import org.apache.activemq.console.filter.MBeansObjectNameQueryFilter;
import org.apache.activemq.console.filter.WildcardToRegExTransformFilter;
import org.apache.activemq.console.filter.MBeansRegExQueryFilter;
import org.apache.activemq.console.filter.MBeansAttributeQueryFilter;
import org.apache.activemq.console.filter.PropertiesViewFilter;
import org.apache.activemq.console.filter.StubQueryFilter;
import org.apache.activemq.console.filter.MapTransformFilter;
import javax.management.remote.JMXServiceURL;
import java.util.Set;

0
activemq-core/src/test/java/org/apache/activemq/simple/Consumer.java → activemq-console/src/test/java/org/apache/activemq/console/simple/Consumer.java Executable file → Normal file
View File

0
activemq-core/src/test/java/org/apache/activemq/simple/Producer.java → activemq-console/src/test/java/org/apache/activemq/console/simple/Producer.java Executable file → Normal file
View File

44
activemq-core/maven.xml
View File

@ -149,50 +149,6 @@
<path refid="maven.dependency.classpath" />
</path>
</goal>
<!-- ================================================================ -->
<!-- GOALS for running benchmarks -->
<!-- ================================================================ -->
<goal name="run:broker" description="Runs the broker" prereqs="setclasspath">
<j:if test="${empty(uri)}">
<j:set var="uri" value="broker://(tcp://localhost:61616)?useJmx=true" />
</j:if>
<echo>Running the ActiveMQ broker for the URI ${uri}</echo>
<java classname="org.apache.activemq.broker.Main" fork="true">
<classpath refid="test.classpath" />
<arg value="${uri}" />
<sysproperty key="com.sun.management.jmxremote.port" value="5001" />
<sysproperty key="com.sun.management.jmxremote.authenticate" value="false" />
<sysproperty key="com.sun.management.jmxremote.ssl" value="false" />
</java>
</goal>
<goal name="run:consumer" description="Runs the broker" prereqs="setclasspath">
<j:if test="${empty(uri)}">
<j:set var="uri" value="tcp://localhost:61616" />
</j:if>
<echo>Running the ActiveMQ consumer for the URI ${uri}</echo>
<java classname="org.apache.activemq.simple.Consumer" fork="false">
<classpath refid="test.classpath" />
<arg value="${uri}" />
</java>
</goal>
<goal name="setclasspath" prereqs="java:compile, test:compile">
<path id="test.classpath">
<pathelement path="${maven.build.dest}" />
<pathelement path="target/classes" />
<pathelement path="target/test-classes" />
<path refid="maven.dependency.classpath" />
</path>
</goal>
<goal name="reports:site">
<attainGoal name="site" />
</goal>
<!-- ================================================================== -->
<!-- GOALs for deploying resources -->

12
assembly/maven.xml
View File

@ -107,9 +107,9 @@
</ant:chmod>
<ant:jar destfile="${maven.dist.bin.assembly.dir}/bin/run.jar" basedir="${maven.build.dir}/classes">
<ant:include name="org/apache/activemq/broker/Main*.class"/>
<ant:include name="org/apache/activemq/console/Main*.class"/>
<ant:manifest>
<ant:attribute name="Main-Class" value="org.apache.activemq.broker.Main"/>
<ant:attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
</ant:manifest>
</ant:jar>
<ant:copy todir="${maven.dist.bin.assembly.dir/conf}">
@ -254,7 +254,7 @@
</j:if>
<echo>Running an ActiveMQ server with $$config = ${config}</echo>
<java classname="org.apache.activemq.broker.Main" fork="yes" maxmemory="512M">
<java classname="org.apache.activemq.console.Main" fork="yes" maxmemory="512M">
<classpath refid="test.classpath"/>
<arg value="${config}"/>
<j:if test="${!empty(debug)}">
@ -274,7 +274,7 @@
<!-- run simple server using just a URL -->
<echo>Running an ActiveMQ server at $$url = ${url}</echo>
<java classname="org.apache.activemq.broker.Main" fork="yes" maxmemory="512M">
<java classname="org.apache.activemq.console.Main" fork="yes" maxmemory="512M">
<classpath refid="test.classpath"/>
<arg value="${url}"/>
@ -319,7 +319,7 @@
<jvmarg value="-Xbootclasspath/a:${OPTIT_HOME}/lib/oibcp.jar"/>
<jvmarg value="-Xnoclassgc"/>
<arg value="-pause"/>
<arg value="org.apache.activemq.spring.Main"/>
<arg value="org.apache.activemq.console.Main"/>
<arg value="${config}"/>
</java>
</j:when>
@ -336,7 +336,7 @@
<jvmarg value="-Xbootclasspath/a:${OPTIT_HOME}/lib/oibcp.jar"/>
<jvmarg value="-Xnoclassgc"/>
<arg value="-pause"/>
<arg value="org.apache.activemq.broker.Main"/>
<arg value="org.apache.activemq.console.Main"/>
<arg value="${url}"/>
<sysproperty key="derby.system.home" value="target/derby"/>
<sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>

5
assembly/pom.xml
View File

@ -42,6 +42,11 @@
<version>${version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>

2
assembly/project.properties
View File

@ -18,6 +18,6 @@ http://dist.codehaus.org,\
http://cvs.apache.org/repository,\
http://www.openejb.org/maven
maven.jar.mainclass = org.apache.activemq.broker.Main
maven.jar.mainclass = org.apache.activemq.console.Main
maven.eclipse.classpath.include=src/test/resources

10
assembly/project.xml
View File

@ -66,6 +66,16 @@
<artifactId>activemq-core-test</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-console</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<activemq.module>true</activemq.module>
<lib>true</lib>
</properties>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>

2
etc/project.properties
View File

@ -24,7 +24,7 @@ maven.junit.fork = true
maven.junit.jvmargs=-Xmx256m
activemq.store.dir = target/MessageStore
activemq.persistenceAdapterFactory = org.activemq.broker.impl.DefaultPersistenceAdapterFactory
activemq.persistenceAdapterFactory = org.apache.activemq.store.DefaultPersistenceAdapterFactory
derby.system.home = target/derby
derby.storage.fileSyncTransactionLog=true
java.security.auth.login.config=src/test/resources/login.config

1
pom.xml
View File

@ -102,6 +102,7 @@
<modules>
<module>activemq-core</module>
<module>activemq-console</module>
<module>activemq-ra</module>
<module>activemq-jaas</module>
<module>activemq-optional</module>

3
project.properties
View File

@ -12,6 +12,7 @@ activemq-core/project.xml,\
activemq-jaas/project.xml,\
activemq-ra/project.xml,\
activemq-web/project.xml,\
activemq-console/project.xml,\
assembly/project.xml
#activeio/project.xml,\
#activemq-systest/project.xml,\
@ -19,7 +20,7 @@ assembly/project.xml
maven.multiproject.excludes=\
etc/project.xml
maven.jar.mainclass=org.activemq.broker.impl.Main
maven.jar.mainclass=org.apache.activemq.console.Main
# -------------------------------------------------------------------
# ChangeLog Properties (Reports)