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:30:03 UTC
svn commit: r1515267 - in /karaf/trunk/instance/core/src/main:
java/org/apache/karaf/instance/core/internal/
resources/org/apache/karaf/instance/resources/bin/
Author: jbonofre
Date: Mon Aug 19 04:30:02 2013
New Revision: 1515267
URL: http://svn.apache.org/r1515267
Log:
[KARAF-2447] Support spaces in KARAF_HOME for instances
Modified:
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat
Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java?rev=1515267&r1=1515266&r2=1515267&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java Mon Aug 19 04:30:02 2013
@@ -421,7 +421,7 @@ public class InstanceServiceImpl impleme
+ " -Dkaraf.data=\"" + new File(new File(location).getCanonicalPath(), "data") + "\""
+ " -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 = new ProcessBuilderFactoryImpl().newBuilder()
Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat?rev=1515267&r1=1515266&r2=1515267&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/karaf.bat Mon Aug 19 04:30:02 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/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat?rev=1515267&r1=1515266&r2=1515267&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/start.bat Mon Aug 19 04:30:02 2013
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\instance.bat start %KARAF_NAME%
+"%KARAF_HOME%\bin\instance.bat" start %KARAF_NAME%
Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat?rev=1515267&r1=1515266&r2=1515267&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/bin/stop.bat Mon Aug 19 04:30:02 2013
@@ -21,4 +21,4 @@ REM ====================================
SET KARAF_HOME=${SUBST-KARAF-HOME}
SET KARAF_NAME=${SUBST-KARAF-NAME}
-%KARAF_HOME%\bin\instance.bat stop %KARAF_NAME%
+"%KARAF_HOME%\bin\instance.bat" stop %KARAF_NAME%