You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/10/28 05:53:56 UTC
svn commit: r1028173 - in
/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin:
client deploy geronimo
Author: genspring
Date: Thu Oct 28 03:53:55 2010
New Revision: 1028173
URL: http://svn.apache.org/viewvc?rev=1028173&view=rev
Log:
GERONIMO-5661 additional patch from Viola to fix same problem in all shell script.
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client?rev=1028173&r1=1028172&r2=1028173&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client Thu Oct 28 03:53:55 2010
@@ -164,7 +164,7 @@ if [ -z "$GERONIMO_TMPDIR" ] ; then
fi
# Classpath: Add the jars in the lib dir
-for file in $GERONIMO_HOME/lib/*.jar
+for file in "$GERONIMO_HOME"/lib/*.jar
do
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$file"
@@ -205,7 +205,7 @@ if [ -f "$JAVA_AGENT_JAR" ]; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -217,7 +217,7 @@ else
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy?rev=1028173&r1=1028172&r2=1028173&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/deploy Thu Oct 28 03:53:55 2010
@@ -164,7 +164,7 @@ if [ -z "$GERONIMO_TMPDIR" ] ; then
fi
# Classpath: Add the jars in the lib dir
-for file in $GERONIMO_HOME/lib/*.jar
+for file in "$GERONIMO_HOME"/lib/*.jar
do
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$file"
@@ -201,7 +201,7 @@ fi
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=1028173&r1=1028172&r2=1028173&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo Thu Oct 28 03:53:55 2010
@@ -309,7 +309,7 @@ if [ "$1" = "debug" ] ; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -326,7 +326,7 @@ elif [ "$1" = "run" ]; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -338,7 +338,7 @@ elif [ "$1" = "run" ]; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -356,7 +356,7 @@ elif [ "$1" = "start" ] ; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -374,7 +374,7 @@ elif [ "$1" = "start" ] ; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -403,7 +403,7 @@ elif [ "$1" = "stop" ] ; then
-Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Dkaraf.home="$GERONIMO_HOME" \
-Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.util.logging.config.file="$GERONIMO_HOME"/etc/java.util.logging.properties \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \