You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2012/12/05 22:36:14 UTC
svn commit: r1417658 - in /activemq/trunk:
activemq-console/src/main/java/org/apache/activemq/console/command/
activemq-run/ assembly/src/main/descriptors/ assembly/src/release/bin/
assembly/src/release/bin/linux-x86-32/ assembly/src/release/bin/linux-...
Author: tabish
Date: Wed Dec 5 21:36:11 2012
New Revision: 1417658
URL: http://svn.apache.org/viewvc?rev=1417658&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-1469
renames run.jar to activemq.jar and updates all the scripts and wrapper.conf files to reflect that
Modified:
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
activemq/trunk/activemq-run/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/assembly/src/release/bin/activemq
activemq/trunk/assembly/src/release/bin/activemq-admin
activemq/trunk/assembly/src/release/bin/activemq-admin.bat
activemq/trunk/assembly/src/release/bin/activemq.bat
activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
activemq/trunk/assembly/src/release/bin/win64/wrapper.conf
Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java Wed Dec 5 21:36:11 2012
@@ -161,7 +161,7 @@ public abstract class AbstractJmxCommand
for(Object vmInstance : allVMs) {
String displayName = (String)getVMDescriptor.invoke(vmInstance, (Object[])null);
- if (displayName.contains("run.jar start")) {
+ if (displayName.contains("activemq.jar start")) {
String id = (String)getVMId.invoke(vmInstance, (Object[])null);
Object vm = attachToVM.invoke(null, id);
@@ -311,11 +311,12 @@ public abstract class AbstractJmxCommand
* @param tokens - succeeding command arguments
* @throws Exception
*/
+ @Override
protected void handleOption(String token, List<String> tokens) throws Exception {
// Try to handle the options first
if (token.equals("--jmxurl")) {
// If no jmx url specified, or next token is a new option
- if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) {
+ if (tokens.isEmpty() || tokens.get(0).startsWith("-")) {
context.printException(new IllegalArgumentException("JMX URL not specified."));
}
@@ -325,7 +326,7 @@ public abstract class AbstractJmxCommand
tokens.clear();
}
- String strJmxUrl = (String)tokens.remove(0);
+ String strJmxUrl = tokens.remove(0);
try {
this.setJmxServiceUrl(new JMXServiceURL(strJmxUrl));
} catch (MalformedURLException e) {
@@ -334,7 +335,7 @@ public abstract class AbstractJmxCommand
}
} else if(token.equals("--pid")) {
if (isSunJVM()) {
- if (tokens.isEmpty() || ((String) tokens.get(0)).startsWith("-")) {
+ if (tokens.isEmpty() || tokens.get(0).startsWith("-")) {
context.printException(new IllegalArgumentException("pid not specified"));
return;
}
@@ -362,16 +363,16 @@ public abstract class AbstractJmxCommand
}
} else if (token.equals("--jmxuser")) {
// If no jmx user specified, or next token is a new option
- if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) {
+ if (tokens.isEmpty() || tokens.get(0).startsWith("-")) {
context.printException(new IllegalArgumentException("JMX user not specified."));
}
- this.setJmxUser((String) tokens.remove(0));
+ this.setJmxUser(tokens.remove(0));
} else if (token.equals("--jmxpassword")) {
// If no jmx password specified, or next token is a new option
- if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) {
+ if (tokens.isEmpty() || tokens.get(0).startsWith("-")) {
context.printException(new IllegalArgumentException("JMX password not specified."));
}
- this.setJmxPassword((String) tokens.remove(0));
+ this.setJmxPassword(tokens.remove(0));
} else if (token.equals("--jmxlocal")) {
this.setJmxUseLocal(true);
} else {
@@ -380,6 +381,7 @@ public abstract class AbstractJmxCommand
}
}
+ @Override
public void execute(List<String> tokens) throws Exception {
try {
super.execute(tokens);
Modified: activemq/trunk/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-run/pom.xml?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/activemq-run/pom.xml (original)
+++ activemq/trunk/activemq-run/pom.xml Wed Dec 5 21:36:11 2012
@@ -27,10 +27,9 @@
<artifactId>activemq-run</artifactId>
<name>ActiveMQ :: Run Jar</name>
- <description>run.jar for starting a standalone ActiveMQ broker</description>
+ <description>activemq.jar for starting a standalone ActiveMQ broker</description>
<dependencies>
-
<!-- activemq -->
<dependency>
<groupId>${project.groupId}</groupId>
@@ -39,9 +38,7 @@
</dependencies>
<build>
-
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -84,7 +81,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -92,35 +88,34 @@
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
- <profiles>
- <profile>
- <id>deploy</id>
- <build>
- <defaultGoal>deploy</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <configuration>
- <attach>false</attach>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <build>
+ <defaultGoal>deploy</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Wed Dec 5 21:36:11 2012
@@ -88,7 +88,7 @@
<dependencySet>
<outputDirectory>/bin</outputDirectory>
<unpack>false</unpack>
- <outputFileNameMapping>run.jar</outputFileNameMapping>
+ <outputFileNameMapping>activemq.jar</outputFileNameMapping>
<includes>
<include>${pom.groupId}:activemq-run</include>
</includes>
Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Wed Dec 5 21:36:11 2012
@@ -376,8 +376,8 @@ invokeJar(){
PIDFILE="$1"
RET="1"
- if [ ! -f "${ACTIVEMQ_HOME}/bin/run.jar" ];then
- echo "ERROR: '${ACTIVEMQ_HOME}/bin/run.jar' does not exist"
+ if [ ! -f "${ACTIVEMQ_HOME}/bin/activemq.jar" ];then
+ echo "ERROR: '${ACTIVEMQ_HOME}/bin/activemq.jar' does not exist"
exit 1
fi
@@ -400,7 +400,7 @@ invokeJar(){
-Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/run.jar\" $COMMANDLINE_ARGS >/dev/null 2>&1 &
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >/dev/null 2>&1 &
RET=\"\$?\"; APID=\"\$!\";
echo \$APID > $PIDFILE;
echo \"INFO: pidfile created : '$PIDFILE' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
@@ -414,7 +414,7 @@ invokeJar(){
-Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/run.jar\" $COMMANDLINE_ARGS --pid $PID &
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $PID &
RET=\"\$?\"; APID=\"\$!\";
echo \$APID > $ACTIVEMQ_DATA/stop.pid; exit \$RET" $DOIT_POSTFIX
RET="$?"
@@ -426,7 +426,7 @@ invokeJar(){
-Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/run.jar\" $COMMANDLINE_ARGS" $DOIT_POSTFIX
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS" $DOIT_POSTFIX
RET="$?"
fi
return $RET
Modified: activemq/trunk/assembly/src/release/bin/activemq-admin
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin Wed Dec 5 21:36:11 2012
@@ -166,7 +166,7 @@ fi
#ACTIVEMQ_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
if [ -n "$CYGHOME" ]; then
- exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dactivemq.conf="${ACTIVEMQ_CONF}" -Dactivemq.data="${ACTIVEMQ_DATA}" -Djava.io.tmpdir="${ACTIVEMQ_TMP}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $@
+ exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dactivemq.conf="${ACTIVEMQ_CONF}" -Dactivemq.data="${ACTIVEMQ_DATA}" -Djava.io.tmpdir="${ACTIVEMQ_TMP}" -Dcygwin.user.home="$CYGHOME" -jar "${ACTIVEMQ_HOME}/bin/activemq.jar" $@
else
- exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dactivemq.conf="${ACTIVEMQ_CONF}" -Dactivemq.data="${ACTIVEMQ_DATA}" -Djava.io.tmpdir="${ACTIVEMQ_TMP}" -jar "${ACTIVEMQ_HOME}/bin/run.jar" $@
+ exec "$JAVACMD" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS -Dactivemq.classpath="${ACTIVEMQ_CLASSPATH}" -Dactivemq.home="${ACTIVEMQ_HOME}" -Dactivemq.base="${ACTIVEMQ_BASE}" -Dactivemq.conf="${ACTIVEMQ_CONF}" -Dactivemq.data="${ACTIVEMQ_DATA}" -Djava.io.tmpdir="${ACTIVEMQ_TMP}" -jar "${ACTIVEMQ_HOME}/bin/activemq.jar" $@
fi
Modified: activemq/trunk/assembly/src/release/bin/activemq-admin.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin.bat?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin.bat Wed Dec 5 21:36:11 2012
@@ -95,7 +95,7 @@ REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xno
REM Setup ActiveMQ Classpath. Default is the conf directory.
set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_CONF%;%ACTIVEMQ_DATA%;%ACTIVEMQ_CLASSPATH%
-"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -Dactivemq.data="%ACTIVEMQ_DATA%" -Djava.io.tmpdir="%ACTIVEMQ_TMP%" -Dactivemq.conf="%ACTIVEMQ_CONF%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %*
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -Dactivemq.data="%ACTIVEMQ_DATA%" -Djava.io.tmpdir="%ACTIVEMQ_TMP%" -Dactivemq.conf="%ACTIVEMQ_CONF%" -jar "%ACTIVEMQ_HOME%/bin/activemq.jar" %*
goto end
Modified: activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq.bat Wed Dec 5 21:36:11 2012
@@ -92,7 +92,7 @@ REM Setup ActiveMQ Classpath.
REM Add instance conf dir before AMQ install conf dir to pick up instance-specific classpath entries first
set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_CONF%;%ACTIVEMQ_BASE%/conf;%ACTIVEMQ_HOME%/conf;%ACTIVEMQ_CLASSPATH%
-"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -Dactivemq.conf="%ACTIVEMQ_CONF%" -Dactivemq.data="%ACTIVEMQ_DATA%" -Djava.io.tmpdir="%ACTIVEMQ_TMP%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" start %*
+"%_JAVACMD%" %SUNJMX% %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% %SSL_OPTS% -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -Dactivemq.home="%ACTIVEMQ_HOME%" -Dactivemq.base="%ACTIVEMQ_BASE%" -Dactivemq.conf="%ACTIVEMQ_CONF%" -Dactivemq.data="%ACTIVEMQ_DATA%" -Djava.io.tmpdir="%ACTIVEMQ_TMP%" -jar "%ACTIVEMQ_HOME%/bin/activemq.jar" start %*
goto end
Modified: activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-32/wrapper.conf Wed Dec 5 21:36:11 2012
@@ -38,7 +38,7 @@ wrapper.java.mainclass=org.tanukisoftwar
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
-wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/activemq.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/linux-x86-32/
Modified: activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/linux-x86-64/wrapper.conf Wed Dec 5 21:36:11 2012
@@ -38,7 +38,7 @@ wrapper.java.mainclass=org.tanukisoftwar
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
-wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/activemq.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/linux-x86-64/
Modified: activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/macosx/wrapper.conf Wed Dec 5 21:36:11 2012
@@ -38,7 +38,7 @@ wrapper.java.mainclass=org.tanukisoftwar
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
-wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/activemq.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/macosx/
Modified: activemq/trunk/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/win32/wrapper.conf?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/win32/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/win32/wrapper.conf Wed Dec 5 21:36:11 2012
@@ -38,7 +38,7 @@ wrapper.java.mainclass=org.tanukisoftwar
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
-wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/activemq.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/win32
Modified: activemq/trunk/assembly/src/release/bin/win64/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/win64/wrapper.conf?rev=1417658&r1=1417657&r2=1417658&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/win64/wrapper.conf (original)
+++ activemq/trunk/assembly/src/release/bin/win64/wrapper.conf Wed Dec 5 21:36:11 2012
@@ -38,7 +38,7 @@ wrapper.java.mainclass=org.tanukisoftwar
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=%ACTIVEMQ_HOME%/bin/wrapper.jar
-wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/run.jar
+wrapper.java.classpath.2=%ACTIVEMQ_HOME%/bin/activemq.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/win64