Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1131154 - in /activemq/activemq-apollo/trunk:
 apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/
 apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/
 apollo-distro/src/main/release/bin/
Date: Fri, 03 Jun 2011 19:24:46 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
Message-Id: <20110603192446.CE12323889E0@eris.apache.org>

Author: chirino
Date: Fri Jun  3 19:24:46 2011
New Revision: 1131154

URL: http://svn.apache.org/viewvc?rev=1131154&view=rev
Log:
Fixes https://issues.apache.org/jira/browse/APLO-10 : Support installing/running from folder pathnames with spaces

Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd
    activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd?rev=1131154&r1=1131153&r2=1131154&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker.cmd Fri Jun  3 19:24:46 2011
@@ -15,13 +15,17 @@
 @REM limitations under the License.
 @REM
 @echo off
-
 setlocal
 
 if "%APOLLO_HOME%"=="" set APOLLO_HOME=${home}
 
-if "%APOLLO_BASE%"=="" set APOLLO_BASE=%~dp0..
+if NOT "%APOLLO_BASE%"=="" goto RUN
+PUSHD .
+CD %~dp0..
+set APOLLO_BASE=%CD%
+POPD
 
+:RUN
 "%APOLLO_HOME%\bin\apollo" %*
 
 :END

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=1131154&r1=1131153&r2=1131154&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 Fri Jun  3 19:24:46 2011
@@ -134,7 +134,7 @@ class Create extends Action {
       println("")
       println("You can now start the broker by executing:  ")
       println("")
-      println("   %s run".format((bin/"apollo-broker").getCanonicalPath))
+      println("   \"%s\" run".format((bin/"apollo-broker").getCanonicalPath))
 
       val service = bin / "apollo-broker-service"
       println("")
@@ -146,14 +146,14 @@ class Create extends Action {
 
           println("Or you can setup the broker as system service and run it in the background:")
           println("")
-          println("   sudo ln -s %s /etc/init.d/".format(service.getCanonicalPath))
+          println("   sudo ln -s \"%s\" /etc/init.d/".format(service.getCanonicalPath))
           println("   /etc/init.d/apollo-broker-service start")
 
         } else {
 
           println("Or you can run the broker in the background using:")
           println("")
-          println("   %s start".format(service.getCanonicalPath))
+          println("   \"%s\" start".format(service.getCanonicalPath))
 
         }
 
@@ -161,8 +161,8 @@ class Create extends Action {
       
         println("Or you can setup the broker as system service and run it in the background:")
         println("")
-        println("   %s install".format(service.getCanonicalPath))
-        println("   %s start".format(service.getCanonicalPath))
+        println("   \"%s\" install".format(service.getCanonicalPath))
+        println("   \"%s\" start".format(service.getCanonicalPath))
 
       }
       println("")

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd?rev=1131154&r1=1131153&r2=1131154&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd Fri Jun  3 19:24:46 2011
@@ -79,7 +79,7 @@ if NOT "x%APOLLO_BASE%" == "x" set JVM_F
 set JVM_FLAGS=%JVM_FLAGS% -Djava.util.logging.config.file="%JUL_CONFIG_FILE%"
 set JVM_FLAGS=%JVM_FLAGS% -classpath "%CLASSPATH%"
 
-"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.apollo.boot.Boot %BOOTDIRS% org.apache.activemq.apollo.cli.Apollo %*
+"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.apollo.boot.Boot "%BOOTDIRS%" org.apache.activemq.apollo.cli.Apollo %*
 
 :END
 endlocal