You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/10/23 16:23:36 UTC
svn commit: r829075 - in /activemq/branches/activemq-5.3: activemq-console/
activemq-console/src/main/java/org/apache/activemq/console/command/
activemq-console/src/main/java/org/apache/activemq/console/command/store/
activemq-console/src/main/java/org...
Author: dejanb
Date: Fri Oct 23 14:23:30 2009
New Revision: 829075
URL: http://svn.apache.org/viewvc?rev=829075&view=rev
Log:
merging 829066 and 829073 for https://issues.apache.org/activemq/browse/AMQ-2462 - activemq-admin commands
Added:
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/CreateCommand.java
- copied unchanged from r829073, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/CreateCommand.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/
- copied from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/
- copied from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalTool.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalTool.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalToolCommand.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalToolCommand.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/CommandLineSupport.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/CommandLineSupport.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/CustomResourceLoader.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/CustomResourceLoader.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/Entry.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/Entry.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/MessageBodyFormatter.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/MessageBodyFormatter.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/
- copied from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQReader.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQReader.java
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/MessageLocation.java
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/MessageLocation.java
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/console/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/console/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/console/command/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/console/command/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/console/command/store/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/console/command/store/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/console/command/store/amq/
- copied from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/console/command/store/amq/
activemq/branches/activemq-5.3/activemq-console/src/main/resources/org/apache/activemq/console/command/store/amq/help.txt
- copied unchanged from r829066, activemq/trunk/activemq-console/src/main/resources/org/apache/activemq/console/command/store/amq/help.txt
Modified:
activemq/branches/activemq-5.3/activemq-console/pom.xml
activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
Modified: activemq/branches/activemq-5.3/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-console/pom.xml?rev=829075&r1=829074&r2=829075&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-console/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-console/pom.xml Fri Oct 23 14:23:30 2009
@@ -80,6 +80,22 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.josql</groupId>
+ <artifactId>josql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.josql</groupId>
+ <artifactId>gentlyweb-utils</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java?rev=829075&r1=829074&r2=829075&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java (original)
+++ activemq/branches/activemq-5.3/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java Fri Oct 23 14:23:30 2009
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.activemq.console.CommandContext;
+import org.apache.activemq.console.command.store.amq.AMQJournalToolCommand;
import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
public class ShellCommand extends AbstractCommand {
@@ -41,10 +42,12 @@
"",
"Tasks (default task is start):",
" start - Creates and starts a broker using a configuration file, or a broker URI.",
+ " create - Creates a runnable broker instance in the specified path",
" stop - Stops a running broker specified by the broker name.",
" list - Lists all available brokers in the specified JMX context.",
" query - Display selected broker component's attributes and statistics.",
" browse - Display selected messages in a specified destination.",
+ " journal-audit - Allows you to view records stored in the persistent journal.",
"",
"Task Options (Options specific to each task):",
" --extdir <dir> - Add the jar files in the directory to the classpath.",
@@ -106,6 +109,8 @@
String taskToken = (String)tokens.remove(0);
if (taskToken.equals("start")) {
command = new StartCommand();
+ } else if (taskToken.equals("create")) {
+ command = new CreateCommand();
} else if (taskToken.equals("stop")) {
command = new ShutdownCommand();
} else if (taskToken.equals("list")) {
@@ -118,6 +123,8 @@
command = new AmqBrowseCommand();
} else if (taskToken.equals("purge")) {
command = new PurgeCommand();
+ } else if (taskToken.equals("journal-audit")) {
+ command = new AMQJournalToolCommand();
} else if (taskToken.equals("help")) {
printHelp();
} else {
@@ -134,7 +141,7 @@
}
- /**
+ /**
* Print the help messages for the browse command
*/
protected void printHelp() {
Modified: activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml?rev=829075&r1=829074&r2=829075&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml Fri Oct 23 14:23:30 2009
@@ -221,6 +221,8 @@
<include>org.codehaus.woodstox:wstx-asl</include>
<include>org.springframework.ws:spring-oxm-tiger</include>
<include>org.codehaus.jettison:jettison</include>
+ <include>velocity:velocity</include>
+ <include>net.sf.josql:josql</include>
</includes>
</dependencySet>
<dependencySet>