From 600799de30a0d1106540e054ce17c0cccc92cd9e Mon Sep 17 00:00:00 2001
From: five-iron <33008162+five-iron@users.noreply.github.com>
Date: Mon, 5 Jun 2023 16:27:45 -0400
Subject: [PATCH] ARTEMIS-4303 Fix windows service

When installing artemis on windows as a service, if your chosen
installation path contained a space, then an extra escape
character (%) was being inserted in the generated
artemis-service.xml, causing the service to fail to start.
This fix changes the value of ARTEMIS_INSTANCE_ETC_URI in that file
from "artemis.instance.etc.uri.windows" to "artemis.instance.etc.uri"
to get rid of that unnecessary escape character.
---
 .../activemq/artemis/cli/commands/bin/artemis-service.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fc76661261..f7390552c5 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
@@ -26,7 +26,7 @@
    <env name="ARTEMIS_INSTANCE" value="@artemis.instance@"/>
    <env name="ARTEMIS_INSTANCE_ETC" value="${artemis.instance.etc}"/>
    <env name="ARTEMIS_INSTANCE_URI" value="${artemis.instance.uri}"/>
-   <env name="ARTEMIS_INSTANCE_ETC_URI" value="${artemis.instance.etc.uri.windows}"/>
+   <env name="ARTEMIS_INSTANCE_ETC_URI" value="${artemis.instance.etc.uri}"/>
    <env name="ARTEMIS_DATA_DIR" value="${artemis.instance.data}"/>
 
    <logpath>@artemis.instance@\log</logpath>