activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [1/2] activemq-6 git commit: Fixing examples on windows
Date Tue, 03 Mar 2015 07:29:03 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master 6c7535685 -> 806b9d7e3


Fixing examples on windows

The examples on windows are not working properly
This is because we are using concatenation to locate directories instead of File(parent, child)
Using that constructor we can then convert to URI and that would work independently of the
OS


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/b634d914
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/b634d914
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/b634d914

Branch: refs/heads/master
Commit: b634d9142dbe19d0e372d52c37fe9f27c019ed9c
Parents: 6c75356
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Mar 2 16:57:32 2015 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Mar 2 16:58:29 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/activemq/server/ActiveMQBootstrap.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/b634d914/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
index 43dd087..bb7faf4 100644
--- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
@@ -98,14 +98,14 @@ public class ActiveMQBootstrap
          {
             //extendPluginClasspath(configurationDir);
             configuration = new FileConfiguration();
-            File file = new File(configurationDir + "/" + "activemq-configuration.xml");
+            File file = new File(new File(configurationDir), "activemq-configuration.xml");
             jmsFileConfiguration = new FileJMSConfiguration();
-            FileDeploymentManager deploymentManager = new FileDeploymentManager(file.toURI().toURL().toExternalForm());
+            FileDeploymentManager deploymentManager = new FileDeploymentManager(file.toURI().toString());
             deploymentManager.addDeployable((FileConfiguration)configuration);
             deploymentManager.addDeployable((FileJMSConfiguration) jmsFileConfiguration);
 
-            securityConfiguration = new FileSecurityConfiguration("file://" + configurationDir
+ "/" + "activemq-users.properties",
-                                                                  "file://" + configurationDir
+ "/" + "activemq-roles.properties",
+            securityConfiguration = new FileSecurityConfiguration(new File(configurationDir,
"activemq-users.properties").toURI().toString(),
+                                                                  new File(configurationDir,
"activemq-roles.properties").toURI().toString(),
                                                                   "guest",
                                                                   false,
                                                                   null);


Mime
View raw message