activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: use proper hawtio config for all shell scripts
Date Wed, 09 Oct 2013 08:22:32 GMT
Updated Branches:
  refs/heads/trunk 0f9a34799 -> 981c8e247


use proper hawtio config for all shell scripts


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

Branch: refs/heads/trunk
Commit: 981c8e247f11871265a20a48e463096028188f36
Parents: 0f9a347
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Wed Oct 9 10:21:33 2013 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Wed Oct 9 10:22:07 2013 +0200

----------------------------------------------------------------------
 assembly/src/release/bin/activemq-admin            | 2 +-
 assembly/src/release/bin/activemq-admin.bat        | 2 +-
 assembly/src/release/bin/activemq.bat              | 2 +-
 assembly/src/release/bin/linux-x86-32/wrapper.conf | 4 ++++
 assembly/src/release/bin/linux-x86-64/wrapper.conf | 4 ++++
 assembly/src/release/bin/macosx/wrapper.conf       | 4 ++++
 assembly/src/release/bin/win32/wrapper.conf        | 4 ++++
 assembly/src/release/bin/win64/wrapper.conf        | 4 ++++
 8 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/assembly/src/release/bin/activemq-admin
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq-admin b/assembly/src/release/bin/activemq-admin
index 0c0877f..193c181 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="-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties
-Dhawtio.authenticationEnabled=false"
+        ACTIVEMQ_OPTS="-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties
-Dhawtio.realm=activemq -Dhawtio.role=admins -Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
-Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
     fi
 
     if [ -z "$SUNJMX" ] ; then

http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/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 47f2a22..c36f7c5 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=-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=logging.properties -Dhawtio.authenticationEnabled=false
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx1G -Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=logging.properties -Dhawtio.realm=activemq -Dhawtio.role=admins
-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal -Djava.security.auth.login.config=%ACTIVEMQ_CONF%\login.config
 
 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/981c8e24/assembly/src/release/bin/activemq.bat
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq.bat b/assembly/src/release/bin/activemq.bat
index 2cb0850..908ef19 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
-Dhawtio.authenticationEnabled=false
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xms1G -Xmx1G -Djava.util.logging.config.file=logging.properties
-Dhawtio.realm=activemq -Dhawtio.role=admins -Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
-Djava.security.auth.login.config=%ACTIVEMQ_CONF%\login.config
 
 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/981c8e24/assembly/src/release/bin/linux-x86-32/wrapper.conf
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/linux-x86-32/wrapper.conf b/assembly/src/release/bin/linux-x86-32/wrapper.conf
index d8b3fc9..4f5b328 100644
--- a/assembly/src/release/bin/linux-x86-32/wrapper.conf
+++ b/assembly/src/release/bin/linux-x86-32/wrapper.conf
@@ -56,6 +56,10 @@ wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
 wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
+wrapper.java.additional.12=-Dhawtio.realm=activemq
+wrapper.java.additional.13=-Dhawtio.role=admins
+wrapper.java.additional.14=-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
+wrapper.java.additional.15=-Djava.security.auth.login.config=%ACTIVEMQ_CONF%/login.config
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/assembly/src/release/bin/linux-x86-64/wrapper.conf
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/linux-x86-64/wrapper.conf b/assembly/src/release/bin/linux-x86-64/wrapper.conf
index bd4e645..927921e 100644
--- a/assembly/src/release/bin/linux-x86-64/wrapper.conf
+++ b/assembly/src/release/bin/linux-x86-64/wrapper.conf
@@ -56,6 +56,10 @@ wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
 wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
+wrapper.java.additional.12=-Dhawtio.realm=activemq
+wrapper.java.additional.13=-Dhawtio.role=admins
+wrapper.java.additional.14=-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
+wrapper.java.additional.15=-Djava.security.auth.login.config=%ACTIVEMQ_CONF%/login.config
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/assembly/src/release/bin/macosx/wrapper.conf
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/macosx/wrapper.conf b/assembly/src/release/bin/macosx/wrapper.conf
index 0a9fcb0..87ff567 100644
--- a/assembly/src/release/bin/macosx/wrapper.conf
+++ b/assembly/src/release/bin/macosx/wrapper.conf
@@ -56,6 +56,10 @@ wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf=%ACTIVEMQ_CONF%
 wrapper.java.additional.11=-Dactivemq.data=%ACTIVEMQ_DATA%
+wrapper.java.additional.12=-Dhawtio.realm=activemq
+wrapper.java.additional.13=-Dhawtio.role=admins
+wrapper.java.additional.14=-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
+wrapper.java.additional.15=-Djava.security.auth.login.config=%ACTIVEMQ_CONF%/login.config
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/assembly/src/release/bin/win32/wrapper.conf
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/win32/wrapper.conf b/assembly/src/release/bin/win32/wrapper.conf
index 6ae9b77..d771387 100644
--- a/assembly/src/release/bin/win32/wrapper.conf
+++ b/assembly/src/release/bin/win32/wrapper.conf
@@ -56,6 +56,10 @@ wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf="%ACTIVEMQ_CONF%"
 wrapper.java.additional.11=-Dactivemq.data="%ACTIVEMQ_DATA%"
+wrapper.java.additional.12=-Dhawtio.realm=activemq
+wrapper.java.additional.13=-Dhawtio.role=admins
+wrapper.java.additional.14=-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
+wrapper.java.additional.15=-Djava.security.auth.login.config=%ACTIVEMQ_CONF%/login.config
 
 # Uncomment to enable remote jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

http://git-wip-us.apache.org/repos/asf/activemq/blob/981c8e24/assembly/src/release/bin/win64/wrapper.conf
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/win64/wrapper.conf b/assembly/src/release/bin/win64/wrapper.conf
index 6e323ba..2ca5b2b 100644
--- a/assembly/src/release/bin/win64/wrapper.conf
+++ b/assembly/src/release/bin/win64/wrapper.conf
@@ -56,6 +56,10 @@ wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf="%ACTIVEMQ_CONF%"
 wrapper.java.additional.11=-Dactivemq.data="%ACTIVEMQ_DATA%"
+wrapper.java.additional.12=-Dhawtio.realm=activemq
+wrapper.java.additional.13=-Dhawtio.role=admins
+wrapper.java.additional.14=-Dhawtio.rolePrincipalClasses=org.apache.activemq.jaas.GroupPrincipal
+wrapper.java.additional.15=-Djava.security.auth.login.config=%ACTIVEMQ_CONF%/login.config
 
 # Uncomment to enable remote jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616


Mime
View raw message