Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 3d30d029d -> 8b616f9f7
[KARAF-3964] Check if CLASSPATH is not empty on cygwin environment Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8b616f9f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8b616f9f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8b616f9f Branch: refs/heads/karaf-3.0.x Commit: 8b616f9f763f1d96d19c36d4abf248294f0d3b3b Parents: 3d30d02 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Oct 9 15:04:12 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Oct 9 15:04:12 2015 +0200 ---------------------------------------------------------------------- .../framework/src/main/filtered-resources/resources/bin/client | 4 +++- .../framework/src/main/filtered-resources/resources/bin/instance | 4 +++- .../framework/src/main/filtered-resources/resources/bin/shell | 4 +++- .../framework/src/main/filtered-resources/resources/bin/start | 4 +++- .../framework/src/main/filtered-resources/resources/bin/status | 4 +++- .../framework/src/main/filtered-resources/resources/bin/stop | 4 +++- .../features/framework/src/main/resources/resources/bin/karaf | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/client ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client index 3215632..39c7485 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client @@ -304,7 +304,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -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 "$@" http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance index 1ed5244..9052778 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance @@ -345,7 +345,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -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 "$@" http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell index cfe2ce8..acbf726 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell @@ -338,7 +338,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -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.shell.console.impl.Main --classpath="$KARAF_HOME/system" "$@" http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/start ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/start b/assemblies/features/framework/src/main/filtered-resources/resources/bin/start index 53e1e38..014b702 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/start +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/start @@ -142,7 +142,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi # Ensure the log directory exists -- we need to have a place to redirect stdout/stderr if [ ! -d "$KARAF_DATA/log" ]; then http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/status ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/status b/assemblies/features/framework/src/main/filtered-resources/resources/bin/status index a015c50..6747de4 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/status +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/status @@ -131,7 +131,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi # Ensure the log directory exists -- we need to have a place to redirect stdout/stderr if [ ! -d "$KARAF_DATA/log" ]; then http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop b/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop index a58b987..5ae21fd 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop @@ -131,7 +131,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi fi # Ensure the log directory exists -- we need to have a place to redirect stdout/stderr if [ ! -d "$KARAF_DATA/log" ]; then http://git-wip-us.apache.org/repos/asf/karaf/blob/8b616f9f/assemblies/features/framework/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf index 7c9ff2a..1a63823 100755 --- a/assemblies/features/framework/src/main/resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf @@ -407,7 +407,9 @@ run() { KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + if [ ! -z "$CLASSPATH" ]; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + fi JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` JAVA_EXT_DIRS=`cygpath --path --windows "$JAVA_EXT_DIRS"`
