You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/08/19 06:38:53 UTC
svn commit: r1515268 - in /karaf/branches/karaf-2.x/admin/core/src/main:
java/org/apache/karaf/admin/internal/ resources/org/apache/karaf/admin/bin/
Author: jbonofre
Date: Mon Aug 19 04:38:52 2013
New Revision: 1515268
URL: http://svn.apache.org/r1515268
Log:
[KARAF-2447] Support spaces in KARAF_HOME for instances
Modified:
karaf/branches/karaf-2.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat
karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat
karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat
Modified: karaf/branches/karaf-2.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java?rev=1515268&r1=1515267&r2=1515268&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java (original)
+++ karaf/branches/karaf-2.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java Mon Aug 19 04:38:52 2013
@@ -405,7 +405,7 @@ public class AdminServiceImpl implements
+ " -Dkaraf.base=\"" + new File(location).getCanonicalPath() + "\""
+ " -Dkaraf.startLocalConsole=false"
+ " -Dkaraf.startRemoteShell=true"
- + " -classpath " + classpath.toString()
+ + " -classpath \"" + classpath.toString() + "\""
+ " org.apache.karaf.main.Main";
LOGGER.debug("Starting instance " + name + " with command: " + command);
org.apache.karaf.jpm.Process process = ProcessBuilderFactory.newInstance().newBuilder()
Modified: karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat?rev=1515268&r1=1515267&r2=1515268&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat (original)
+++ karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat Mon Aug 19 04:38:52 2013
@@ -22,4 +22,4 @@ SETLOCAL
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_BASE=${SUBST-KARAF-BASE}
-%KARAF_HOME%\bin\karaf.bat %*
+"%KARAF_HOME%\bin\karaf.bat" %*
Modified: karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat?rev=1515268&r1=1515267&r2=1515268&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat (original)
+++ karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat Mon Aug 19 04:38:52 2013
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\admin.bat start %KARAF_NAME%
+"%KARAF_HOME%\bin\admin.bat" start %KARAF_NAME%
Modified: karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat?rev=1515268&r1=1515267&r2=1515268&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat (original)
+++ karaf/branches/karaf-2.x/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat Mon Aug 19 04:38:52 2013
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\admin.bat stop %KARAF_NAME%
+"%KARAF_HOME%\bin\admin.bat" stop %KARAF_NAME%