You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/04/13 20:01:57 UTC
svn commit: r1091864 -
/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
Author: chirino
Date: Wed Apr 13 18:01:57 2011
New Revision: 1091864
URL: http://svn.apache.org/viewvc?rev=1091864&view=rev
Log:
Use canonical paths in the created scripts.
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1091864&r1=1091863&r2=1091864&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala Wed Apr 13 18:01:57 2011
@@ -120,11 +120,7 @@ class Create extends Action {
val home = new File(System.getProperty("apollo.home"))
- println("Make sure the following directory is on your path: ")
- println("")
- println(" %s/bin".format((home / "bin").getCanonicalPath))
- println("")
- println("Then run the broker by executing: ")
+ println("Tou can now start the broker by executing: ")
println("")
println(" %s run".format((bin/"apollo-broker").getCanonicalPath))
println("")
@@ -162,7 +158,8 @@ class Create extends Action {
if( filter ) {
content = content.replaceAll(Pattern.quote("${host}"), Matcher.quoteReplacement(host))
content = content.replaceAll(Pattern.quote("${version}"), Matcher.quoteReplacement(Broker.version))
- content = content.replaceAll(Pattern.quote("${home}"), Matcher.quoteReplacement(System.getProperty("apollo.home")))
+ val home = new File(System.getProperty("apollo.home"))
+ content = content.replaceAll(Pattern.quote("${home}"), Matcher.quoteReplacement(home.getCanonicalPath))
}
// and then writing out in the new target encoding.