activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4594 - fix hawtio issues; linkage error and authentication
Date Wed, 04 Sep 2013 15:36:49 GMT
Updated Branches:
  refs/heads/trunk b47b9aa64 -> 1f57a6408


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


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1f57a640
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1f57a640
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1f57a640

Branch: refs/heads/trunk
Commit: 1f57a6408fe878424d0d32a963582f4befae7399
Parents: b47b9aa
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Wed Sep 4 17:36:08 2013 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Wed Sep 4 17:36:38 2013 +0200

----------------------------------------------------------------------
 assembly/src/main/descriptors/common-bin.xml | 7 ++++---
 assembly/src/release/bin/activemq            | 2 +-
 assembly/src/release/bin/activemq-admin      | 2 +-
 assembly/src/release/bin/activemq-admin.bat  | 2 +-
 assembly/src/release/bin/activemq.bat        | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/1f57a640/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 8e536c7..9efc53f 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/1f57a640/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index ba399b3..038b1b3 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -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

http://git-wip-us.apache.org/repos/asf/activemq/blob/1f57a640/assembly/src/release/bin/activemq-admin
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq-admin b/assembly/src/release/bin/activemq-admin
index b508aa4..0c0877f 100644
--- a/assembly/src/release/bin/activemq-admin
+++ b/assembly/src/release/bin/activemq-admin
@@ -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

http://git-wip-us.apache.org/repos/asf/activemq/blob/1f57a640/assembly/src/release/bin/activemq-admin.bat
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq-admin.bat b/assembly/src/release/bin/activemq-admin.bat
index bcec637..47f2a22 100644
--- a/assembly/src/release/bin/activemq-admin.bat
+++ b/assembly/src/release/bin/activemq-admin.bat
@@ -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

http://git-wip-us.apache.org/repos/asf/activemq/blob/1f57a640/assembly/src/release/bin/activemq.bat
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq.bat b/assembly/src/release/bin/activemq.bat
index 89bdf14..2cb0850 100755
--- a/assembly/src/release/bin/activemq.bat
+++ b/assembly/src/release/bin/activemq.bat
@@ -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


Mime
View raw message