[activemq-artemis] branch main updated: ARTEMIS-2933 Add .NET Famework v4.0 supported runtime for com.sun.winsw

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brusdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 493bd22  ARTEMIS-2933 Add .NET Famework v4.0 supported runtime for com.sun.winsw
493bd22 is described below

commit 493bd225e4478782a7198c78ef1ae00496c76e63
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Wed Oct 7 00:06:23 2020 +0200

    ARTEMIS-2933 Add .NET Famework v4.0 supported runtime for com.sun.winsw
---
 .../main/java/org/apache/activemq/artemis/cli/commands/Create.java  | 2 ++
 .../activemq/artemis/cli/commands/bin/artemis-service.exe.config    | 6 ++++++
 .../test/java/org/apache/activemq/cli/test/StreamClassPathTest.java | 1 +
 3 files changed, 9 insertions(+)

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 54745a4..cb0863c 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
@@ -76,6 +76,7 @@ public class Create extends InputAbstract {
 
    public static final String BIN_ARTEMIS_CMD = "bin/artemis.cmd";
    public static final String BIN_ARTEMIS_SERVICE_EXE = "bin/artemis-service.exe";
+   public static final String BIN_ARTEMIS_SERVICE_EXE_CONFIG = "bin/artemis-service.exe.config";
    public static final String BIN_ARTEMIS_SERVICE_XML = "bin/artemis-service.xml";
    public static final String ETC_ARTEMIS_PROFILE_CMD = "artemis.profile.cmd";
    public static final String BIN_ARTEMIS = "bin/artemis";
@@ -803,6 +804,7 @@ public class Create extends InputAbstract {
       if (IS_WINDOWS) {
          write(BIN_ARTEMIS_CMD, filters, false);
          write(BIN_ARTEMIS_SERVICE_EXE);
+         write(BIN_ARTEMIS_SERVICE_EXE_CONFIG);
          write(BIN_ARTEMIS_SERVICE_XML, filters, false);
          writeEtc(ETC_ARTEMIS_PROFILE_CMD, etcFolder, filters, false);
       }
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.exe.config b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.exe.config
new file mode 100644
index 0000000..816ca74
--- /dev/null
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.exe.config
@@ -0,0 +1,6 @@
+<configuration>
+   <startup>
+      <supportedRuntime version="v2.0.50727" />
+      <supportedRuntime version="v4.0" />
+   </startup>
+</configuration>
\ No newline at end of file
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
index 0aae575..4dd273b 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
@@ -33,6 +33,7 @@ public class StreamClassPathTest {
    public void testFindStreams() throws Exception {
       testStream(Create.class, Create.BIN_ARTEMIS_CMD);
       testStream(Create.class, Create.BIN_ARTEMIS_SERVICE_EXE);
+      testStream(Create.class, Create.BIN_ARTEMIS_SERVICE_EXE_CONFIG);
       testStream(Create.class, Create.BIN_ARTEMIS_SERVICE_XML);
       testStream(Create.class, "etc/" + Create.ETC_ARTEMIS_PROFILE_CMD);
       testStream(Create.class, Create.BIN_ARTEMIS);