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

https://issues.apache.org/jira/browse/AMQ-4594 - fix hawtio issues; linkage error and authentication

This commit is contained in:
Dejan Bosanac 2013-09-04 17:36:08 +02:00
parent b47b9aa64a
commit 1f57a6408f
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assembly/src/main/descriptors/common-bin.xml
View File

@ -101,9 +101,10 @@
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>WEB-INF/lib/slf4j-api-1.6.1.jar</exclude>
<exclude>WEB-INF/lib/log4j-1.2.16.jar</exclude>
<exclude>WEB-INF/lib/commons-codec-1.2.jar</exclude>
<exclude>WEB-INF/lib/slf4j-api-*.jar</exclude>
<exclude>WEB-INF/lib/log4j-*.jar</exclude>
<exclude>WEB-INF/lib/commons-codec-*.jar</exclude>
<exclude>WEB-INF/lib/org.eclipse.jgit-*.jar</exclude>
</excludes>
</unpackOptions>
<scope>runtime</scope>

2
assembly/src/release/bin/activemq
View File

@ -249,7 +249,7 @@ if [ "$CONFIG_LOAD" != "yes" ];then
fi
if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties"
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Dhawtio.authenticationEnabled=false"
fi
# create configuration if requested

2
assembly/src/release/bin/activemq-admin
View File

@ -148,7 +148,7 @@ ACTIVEMQ_CLASSPATH="${ACTIVEMQ_CONF};"$ACTIVEMQ_CLASSPATH
if [ ""$1 = "start" ] ; then
if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
ACTIVEMQ_OPTS="-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties -Dhawtio.authenticationEnabled=false"
fi
if [ -z "$SUNJMX" ] ; then

2
assembly/src/release/bin/activemq-admin.bat
View File

@ -80,7 +80,7 @@ if "%ACTIVEMQ_TMP%" == "" set ACTIVEMQ_TMP=%ACTIVEMQ_DATA%\tmp
if /i not "%1" == "start" goto debugOpts
if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties
if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties -Dhawtio.authenticationEnabled=false
if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false

2
assembly/src/release/bin/activemq.bat
View File

@ -77,7 +77,7 @@ if "%ACTIVEMQ_DATA%" == "" set ACTIVEMQ_DATA=%ACTIVEMQ_HOME%\data
if "%ACTIVEMQ_TMP%" == "" set ACTIVEMQ_TMP=%ACTIVEMQ_DATA%\tmp
if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xms1G -Xmx1G -Djava.util.logging.config.file=logging.properties
if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xms1G -Xmx1G -Djava.util.logging.config.file=logging.properties -Dhawtio.authenticationEnabled=false
if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false