activemq-artemis git commit: ARTEMIS-1150 fixing logging with spaces on windows service [Forced Update!]

[clebertsuconic]

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 
Authored: Fri May 5 16:40:51 2017 -0400
Committer: Clebert Suconic 
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 @@
 


+   
 
${artemis.instance}\log
roll
@@ -43,12 +44,19 @@
-Dartemis.remoting.hornetq.port=5446
-->
 
+   
+
-classpath
%ARTEMIS_HOME%\lib\artemis-boot.jar
-Dartemis.home=%ARTEMIS_HOME%
-Dartemis.instance=%ARTEMIS_INSTANCE%

-Djava.util.logging.manager=org.jboss.logmanager.LogManager
-   
-Dlogging.configuration=file:%ARTEMIS_INSTANCE%\etc\logging.properties
+   
-Dlogging.configuration=%ARTEMIS_INSTANCE_URI%/etc/logging.properties

-Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config
 
 

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

activemq-artemis git commit: ARTEMIS-1150 fixing logging with spaces on windows service

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a915e8b90 -> a5ac95e55


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/a5ac95e5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a5ac95e5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a5ac95e5

Branch: refs/heads/master
Commit: a5ac95e559d47c56ade1d8d24da6339b3d24c666
Parents: a915e8b
Author: Clebert Suconic 
Authored: Fri May 5 16:40:51 2017 -0400
Committer: Clebert Suconic 
Committed: Fri May 5 17:51:33 2017 -0400

--
 .../org/apache/activemq/artemis/cli/commands/Create.java  |  2 ++
 .../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, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a5ac95e5/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..0d67a79 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,8 @@ 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("%", "%%"));
+  System.out.println(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/a5ac95e5/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 @@
 


+   
 
${artemis.instance}\log
roll
@@ -43,12 +44,19 @@
-Dartemis.remoting.hornetq.port=5446
-->
 
+   
+
-classpath
%ARTEMIS_HOME%\lib\artemis-boot.jar
-Dartemis.home=%ARTEMIS_HOME%
-Dartemis.instance=%ARTEMIS_INSTANCE%

-Djava.util.logging.manager=org.jboss.logmanager.LogManager
-   
-Dlogging.configuration=file:%ARTEMIS_INSTANCE%\etc\logging.properties
+   
-Dlogging.configuration=%ARTEMIS_INSTANCE_URI%/etc/logging.properties

-Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a5ac95e5/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%