activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: ARTEMIS-1150 fixing logging with spaces on windows service [Forced Update!]
Date Fri, 05 May 2017 22:01:42 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a5ac95e55 -> 7c96ab6bd (forced update)


ARTEMIS-1150 fixing logging with spaces on windows service


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

Branch: refs/heads/master
Commit: 7c96ab6bd751a7058c339f81b92ae60b64f00e7f
Parents: a915e8b
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri May 5 16:40:51 2017 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri May 5 18:01:33 2017 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/cli/commands/Create.java  |  1 +
 .../activemq/artemis/cli/commands/bin/artemis-service.xml | 10 +++++++++-
 .../apache/activemq/artemis/cli/commands/bin/artemis.cmd  |  6 +++---
 .../activemq/artemis/cli/commands/etc/artemis.profile.cmd |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7c96ab6b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 783ed50..9cc5bf3 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -589,6 +589,7 @@ public class Create extends InputAbstract {
       filters.put("${artemis.home}", path(getHome().toString()));
       filters.put("${artemis.instance}", path(directory));
       filters.put("${artemis.instance.uri}", directory.toURI().toString());
+      filters.put("${artemis.instance.uri.windows}", directory.toURI().toString().replaceAll("%",
"%%"));
       filters.put("${artemis.instance.name}", directory.getName());
       filters.put("${java.home}", path(System.getProperty("java.home")));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7c96ab6b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 6752b11..904f97c 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -24,6 +24,7 @@
 
    <env name="ARTEMIS_HOME" value="${artemis.home}"/>
    <env name="ARTEMIS_INSTANCE" value="${artemis.instance}"/>
+   <env name="ARTEMIS_INSTANCE_URI" value="${artemis.instance.uri}"/>
 
    <logpath>${artemis.instance}\log</logpath>
    <logmode>roll</logmode>
@@ -43,12 +44,19 @@
    <argument>-Dartemis.remoting.hornetq.port=5446</argument>
    -->
 
+   <!-- uncomment this if you want to connect jconsole to connect
+    <argument>-Dcom.sun.management.jmxremote</argument>
+    <argument>-Dcom.sun.management.jmxremote.port=8086</argument>
+    <argument>-Dcom.sun.management.jmxremote.ssl=false</argument>
+    <argument>-Dcom.sun.management.jmxremote.authenticate=false</argument>
+   -->
+
    <argument>-classpath</argument>
    <argument>%ARTEMIS_HOME%\lib\artemis-boot.jar</argument>
    <argument>-Dartemis.home=%ARTEMIS_HOME%</argument>
    <argument>-Dartemis.instance=%ARTEMIS_INSTANCE%</argument>
    <argument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argument>
-   <argument>-Dlogging.configuration=file:%ARTEMIS_INSTANCE%\etc\logging.properties</argument>
+   <argument>-Dlogging.configuration=%ARTEMIS_INSTANCE_URI%/etc/logging.properties</argument>
    <argument>-Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config</argument>
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7c96ab6b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
index 9c6fd7d..b6f2d0a 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
@@ -47,14 +47,14 @@ echo.
 
 :RUN_JAVA
 
+rem "Load Profile Config"
+call %ARTEMIS_INSTANCE%\etc\artemis.profile.cmd %*
+
 rem "Set Defaults."
 set ARTEMIS_LOGGING_CONF=%ARTEMIS_INSTANCE_URI%/etc/logging.properties
 set ARTEMIS_DATA_DIR=%ARTEMIS_INSTANCE%\data
 set ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
 
-rem "Load Profile Config"
-call %ARTEMIS_INSTANCE%\etc\artemis.profile.cmd %*
-
 rem "Create full JVM Args"
 set JVM_ARGS=%JAVA_ARGS%
 if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7c96ab6b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index fe37275..e2d7ded 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -22,7 +22,7 @@ set ARTEMIS_INSTANCE="${artemis.instance}"
 rem The logging config will need an URI
 rem this will be encoded in case you use spaces or special characters
 rem on your directory structure
-set ARTEMIS_INSTANCE_URI="${artemis.instance.uri}"
+set ARTEMIS_INSTANCE_URI="${artemis.instance.uri.windows}"
 
 rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced
in broker.xml
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673
-Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446


Mime
View raw message