You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/03/03 08:29:03 UTC
[1/2] activemq-6 git commit: Fixing examples on windows
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 <cl...@apache.org>
Authored: Mon Mar 2 16:57:32 2015 -0500
Committer: Clebert Suconic <cl...@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);
[2/2] activemq-6 git commit: merge #131 - Fixing examples on windows
Posted by an...@apache.org.
merge #131 - Fixing examples on windows
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/806b9d7e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/806b9d7e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/806b9d7e
Branch: refs/heads/master
Commit: 806b9d7e3f8b574cff0292eb3444063bd5287714
Parents: 6c75356 b634d91
Author: Andy Taylor <an...@gmail.com>
Authored: Tue Mar 3 07:28:23 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Tue Mar 3 07:28:23 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/activemq/server/ActiveMQBootstrap.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------