You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/02/06 15:05:09 UTC
[activemq-artemis] branch 2.6.x updated: ARTEMIS-1058 Jars in web
tmp dir locked on Windows
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 912f3ed ARTEMIS-1058 Jars in web tmp dir locked on Windows
912f3ed is described below
commit 912f3edbb92feafb79da4ed3ddc0bc4952935f67
Author: Howard Gao <ho...@gmail.com>
AuthorDate: Thu Jan 31 22:33:33 2019 +0800
ARTEMIS-1058 Jars in web tmp dir locked on Windows
This is the second commit. It improves the windows service
configuration file so that the service can be shutdown
gracefully (clean shutdown) and allow for a chance to
clean up the web tmp dir.
(cherry picked from commit d29b70b9961f50a4c64ba10672d977127e4123b7)
---
.../artemis/cli/commands/bin/artemis-service.xml | 73 ++++++++++++++--------
1 file changed, 46 insertions(+), 27 deletions(-)
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 fac8f53..1b2e998 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
@@ -33,39 +33,58 @@
<logmode>roll</logmode>
<executable>%JAVA_HOME%\bin\java.exe</executable>
- <argument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</argument>
- <argument>-XX:+UseParallelGC</argument>
- <argument>-Xms512M</argument>
- <argument>-Xmx1024M</argument>
-
- <!-- Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
- <argument>-Dartemis.remoting.default.port=61617</argument>
- <argument>-Dartemis.remoting.amqp.port=5673</argument>
- <argument>-Dartemis.remoting.stomp.port=61614</argument>
- <argument>-Dartemis.remoting.hornetq.port=5446</argument>
+ <startargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</startargument>
+ <startargument>-XX:+UseParallelGC</startargument>
+ <startargument>-Xms512M</startargument>
+ <startargument>-Xmx1024M</startargument>
+
+ <!-- Cluster Properties: Used to pass startarguments to ActiveMQ Artemis which can be referenced in broker.xml
+ <startargument>-Dartemis.remoting.default.port=61617</startargument>
+ <startargument>-Dartemis.remoting.amqp.port=5673</startargument>
+ <startargument>-Dartemis.remoting.stomp.port=61614</startargument>
+ <startargument>-Dartemis.remoting.hornetq.port=5446</startargument>
-->
- <argument>-classpath</argument>
- <argument>%ARTEMIS_HOME%\lib\artemis-boot.jar</argument>
- <argument>-Dartemis.home=%ARTEMIS_HOME%</argument>
- <argument>-Dartemis.instance=%ARTEMIS_INSTANCE%</argument>
- <argument>-Ddata.dir=%ARTEMIS_DATA_DIR%</argument>
- <argument>-Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%"</argument>
- <argument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argument>
- <argument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</argument>
- <argument>-Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config</argument>
- <argument>-Dhawtio.realm=activemq</argument>
- <argument>-Dhawtio.offline="true"</argument>
- <argument>-Dhawtio.role=${role}</argument>
- <argument>-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal</argument>
- <argument>-Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%/jolokia-access.xml</argument>
+ <startargument>-classpath</startargument>
+ <startargument>%ARTEMIS_HOME%\lib\artemis-boot.jar</startargument>
+ <startargument>-Dartemis.home=%ARTEMIS_HOME%</startargument>
+ <startargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</startargument>
+ <startargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</startargument>
+ <startargument>-Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%"</startargument>
+ <startargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</startargument>
+ <startargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</startargument>
+ <startargument>-Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config</startargument>
+ <startargument>-Dhawtio.realm=activemq</startargument>
+ <startargument>-Dhawtio.offline="true"</startargument>
+ <startargument>-Dhawtio.role=${role}</startargument>
+ <startargument>-Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal</startargument>
+ <startargument>-Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%/jolokia-access.xml</startargument>
<!-- Debug args: Uncomment to enable debug
- <argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument>
+ <startargument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</startargument>
-->
- <argument>org.apache.activemq.artemis.boot.Artemis</argument>
+ <startargument>org.apache.activemq.artemis.boot.Artemis</startargument>
+
+ <startargument>run</startargument>
+
+ <stopexecutable>%JAVA_HOME%\bin\java.exe</stopexecutable>
+ <stopargument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</stopargument>
+ <stopargument>-XX:+UseParallelGC</stopargument>
+ <stopargument>-Xms512M</stopargument>
+ <stopargument>-Xmx1024M</stopargument>
+
+ <stopargument>-classpath</stopargument>
+ <stopargument>%ARTEMIS_HOME%\lib\artemis-boot.jar</stopargument>
+ <stopargument>-Dartemis.home=%ARTEMIS_HOME%</stopargument>
+ <stopargument>-Dartemis.instance=%ARTEMIS_INSTANCE%</stopargument>
+ <stopargument>-Ddata.dir=%ARTEMIS_DATA_DIR%</stopargument>
+ <stopargument>-Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%"</stopargument>
+ <stopargument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</stopargument>
+ <stopargument>-Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties</stopargument>
+
+ <stopargument>org.apache.activemq.artemis.boot.Artemis</stopargument>
- <argument>run</argument>
+ <stopargument>stop</stopargument>
</service>
\ No newline at end of file