From commits-return-55036-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Feb 6 15:05:10 2019 Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC63D1828C for ; Wed, 6 Feb 2019 15:05:10 +0000 (UTC) Received: (qmail 42165 invoked by uid 500); 6 Feb 2019 15:05:10 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 42126 invoked by uid 500); 6 Feb 2019 15:05:10 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 42117 invoked by uid 99); 6 Feb 2019 15:05:10 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2019 15:05:10 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 19AD180660; Wed, 6 Feb 2019 15:05:10 +0000 (UTC) Date: Wed, 06 Feb 2019 15:05:09 +0000 To: "commits@activemq.apache.org" Subject: [activemq-artemis] branch 2.6.x updated: ARTEMIS-1058 Jars in web tmp dir locked on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154946550986.15237.12522943482924691116@gitbox.apache.org> From: clebertsuconic@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: activemq-artemis X-Git-Refname: refs/heads/2.6.x X-Git-Reftype: branch X-Git-Oldrev: 3ee6699a0ea576975b78f0248fe061d26296805b X-Git-Newrev: 912f3edbb92feafb79da4ed3ddc0bc4952935f67 X-Git-Rev: 912f3edbb92feafb79da4ed3ddc0bc4952935f67 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 @@ roll %JAVA_HOME%\bin\java.exe - -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} - -XX:+UseParallelGC - -Xms512M - -Xmx1024M - - - -classpath - %ARTEMIS_HOME%\lib\artemis-boot.jar - -Dartemis.home=%ARTEMIS_HOME% - -Dartemis.instance=%ARTEMIS_INSTANCE% - -Ddata.dir=%ARTEMIS_DATA_DIR% - -Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%" - -Djava.util.logging.manager=org.jboss.logmanager.LogManager - -Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties - -Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config - -Dhawtio.realm=activemq - -Dhawtio.offline="true" - -Dhawtio.role=${role} - -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal - -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%/jolokia-access.xml + -classpath + %ARTEMIS_HOME%\lib\artemis-boot.jar + -Dartemis.home=%ARTEMIS_HOME% + -Dartemis.instance=%ARTEMIS_INSTANCE% + -Ddata.dir=%ARTEMIS_DATA_DIR% + -Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%" + -Djava.util.logging.manager=org.jboss.logmanager.LogManager + -Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties + -Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config + -Dhawtio.realm=activemq + -Dhawtio.offline="true" + -Dhawtio.role=${role} + -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal + -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%/jolokia-access.xml - org.apache.activemq.artemis.boot.Artemis + org.apache.activemq.artemis.boot.Artemis + + run + + %JAVA_HOME%\bin\java.exe + -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} + -XX:+UseParallelGC + -Xms512M + -Xmx1024M + + -classpath + %ARTEMIS_HOME%\lib\artemis-boot.jar + -Dartemis.home=%ARTEMIS_HOME% + -Dartemis.instance=%ARTEMIS_INSTANCE% + -Ddata.dir=%ARTEMIS_DATA_DIR% + -Dartemis.instance.etc="%ARTEMIS_INSTANCE_ETC%" + -Djava.util.logging.manager=org.jboss.logmanager.LogManager + -Dlogging.configuration=%ARTEMIS_INSTANCE_ETC_URI%/logging.properties + + org.apache.activemq.artemis.boot.Artemis - run + stop \ No newline at end of file