Repository: karaf Updated Branches: refs/heads/master e50186135 -> cc455cc7c
[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/cc455cc7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc455cc7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc455cc7 Branch: refs/heads/master Commit: cc455cc7cb0759a8cf7c9d388418469661e4ff64 Parents: e501861 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Oct 9 14:45:50 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Oct 9 14:45:50 2015 +0200 ---------------------------------------------------------------------- .../base/src/main/filtered-resources/resources/bin/client | 4 +++- .../base/src/main/filtered-resources/resources/bin/instance | 4 +++- .../base/src/main/filtered-resources/resources/bin/shell | 4 +++- .../base/src/main/filtered-resources/resources/bin/start | 4 +++- .../base/src/main/filtered-resources/resources/bin/status | 4 +++- .../features/base/src/main/filtered-resources/resources/bin/stop | 4 +++- assemblies/features/base/src/main/resources/resources/bin/karaf | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/client ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client b/assemblies/features/base/src/main/filtered-resources/resources/bin/client index 7b112ae..b900615 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client @@ -303,7 +303,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/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/instance ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance index ff717d3..2931372 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance @@ -339,7 +339,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/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell index 6f6dea7..143c629 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/base/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.impl.console.standalone.Main --classpath="$KARAF_HOME/system" "$@" http://git-wip-us.apache.org/repos/asf/karaf/blob/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/start ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/start b/assemblies/features/base/src/main/filtered-resources/resources/bin/start index 53e1e38..014b702 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/start +++ b/assemblies/features/base/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/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/status ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/status b/assemblies/features/base/src/main/filtered-resources/resources/bin/status index a015c50..2c80998 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/status +++ b/assemblies/features/base/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/cc455cc7/assemblies/features/base/src/main/filtered-resources/resources/bin/stop ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop b/assemblies/features/base/src/main/filtered-resources/resources/bin/stop index a58b987..3c96256 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/stop +++ b/assemblies/features/base/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/cc455cc7/assemblies/features/base/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf index ae03118..da5fc28 100755 --- a/assemblies/features/base/src/main/resources/resources/bin/karaf +++ b/assemblies/features/base/src/main/resources/resources/bin/karaf @@ -408,7 +408,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"`
