Author: jbonofre
Date: Fri Apr 12 07:14:23 2013
New Revision: 1467183
URL: http://svn.apache.org/r1467183
Log:
[KARAF-2236] Fix space support in path, in Karaf scripts
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client?rev=1467183&r1=1467182&r2=1467183&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
Fri Apr 12 07:14:23 2013
@@ -113,7 +113,7 @@ locateHome() {
# In POSIX shells, CDPATH may cause cd to write to stdout
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- KARAF_HOME=`cd $DIRNAME/..; pwd`
+ KARAF_HOME=`cd "$DIRNAME/.."; pwd`
if [ ! -d "$KARAF_HOME" ]; then
die "KARAF_HOME is not valid: $KARAF_HOME"
fi
@@ -291,7 +291,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances"
-Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE"
-Djava.io.tmpdir="$KARAF_DATA/tmp"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
$KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
+ exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances"
-Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE"
-Djava.io.tmpdir="$KARAF_DATA/tmp"
-Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties"
$KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
}
main() {
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance?rev=1467183&r1=1467182&r2=1467183&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
Fri Apr 12 07:14:23 2013
@@ -113,7 +113,7 @@ locateHome() {
# In POSIX shells, CDPATH may cause cd to write to stdout
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- KARAF_HOME=`cd $DIRNAME/..; pwd`
+ KARAF_HOME=`cd "$DIRNAME/.."; pwd`
if [ ! -d "$KARAF_HOME" ]; then
die "KARAF_HOME is not valid: $KARAF_HOME"
fi
@@ -263,7 +263,7 @@ setupDefaults() {
fi
# Add the jars in the lib dir
- for file in $KARAF_HOME/lib/*.jar
+ for file in "$KARAF_HOME"/lib/*.jar
do
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$file"
@@ -315,7 +315,7 @@ init() {
run() {
-
CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/${project.version}/org.apache.karaf.instance.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/${project.version}/org.apache.karaf.instance.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.table/${project.version}/org.apache.karaf.shell.table-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/syste
m/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar:${KARAF_HOME}/system/jline/jline/${jline.version}/jline-${jline.version}.jar
+
CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/${project.version}/org.apache.karaf.instance.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/${project.version}/org.apache.karaf.instance.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.table/${project.version}/org.apache.karaf.shell.table-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/syst
em/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar:${KARAF_HOME}/system/jline/jline/${jline.version}/jline-${jline.version}.jar"
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
@@ -323,7 +323,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances"
-Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE"
-Djava.io.tmpdir="$KARAF_DATA/tmp"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
$KARAF_OPTS $OPTS -classpath "$CLASSPATH"
org.apache.karaf.instance.main.Execute "$@"
+ exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances"
-Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE"
-Djava.io.tmpdir="$KARAF_DATA/tmp"
-Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties"
$KARAF_OPTS $OPTS -classpath "$CLASSPATH"
org.apache.karaf.instance.main.Execute "$@"
}
main() {
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1467183&r1=1467182&r2=1467183&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Fri Apr 12 07:14:23 2013
@@ -120,7 +120,7 @@ locateHome() {
# In POSIX shells, CDPATH may cause cd to write to stdout
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- KARAF_HOME=`cd $DIRNAME/..; pwd`
+ KARAF_HOME=`cd "$DIRNAME/.."; pwd`
if [ ! -d "$KARAF_HOME" ]; then
die "KARAF_HOME is not valid: $KARAF_HOME"
fi
