Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace file separate in ACTIVEMQ_HOME for Windows 

ActiveMQ uses URI's for locating files on a file system.  Absolute file
URIs are generated using an ACTIVEMQ_HOME variable defined via the start
up scripts.  For Windows this will contain "\" character as file path
separator.  This is invalid for the file URI scheme.  This patch
rewrites the ACTIVEMQ_HOME variable ensuring "/" are used on both
Windows and Linux.
This commit is contained in:
Martyn Taylor 2015-03-02 12:18:32 +00:00
parent 2e0e662c07
commit 9e4b40b033
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java
View File

@ -52,7 +52,11 @@ public class Run implements Action
ActiveMQ.printBanner(); ActiveMQ.printBanner();
/* We use File URI for locating files. The ACTIVEMQ_HOME variable is used to determine file paths. For Windows
the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */
String activemqHome = System.getProperty("activemq.home").replace("\\", "/"); String activemqHome = System.getProperty("activemq.home").replace("\\", "/");
System.setProperty("activemq.home", activemqHome);
if (configuration == null) if (configuration == null)
{ {

8
activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java
View File

@ -33,9 +33,15 @@ public class Stop implements Action
@Override @Override
public Object execute(ActionContext context) throws Exception public Object execute(ActionContext context) throws Exception
{ {
/* We use File URI for locating files. The ACTIVEMQ_HOME variable is used to determine file paths. For Windows
the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */
String activemqHome = System.getProperty("activemq.home").replace("\\", "/");
System.setProperty("activemq.home", activemqHome);
if (configuration == null) if (configuration == null)
{ {
configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml"; configuration = "xml:" + activemqHome + "/config/non-clustered/bootstrap.xml";
} }
BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration); BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration);