You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2016/02/08 17:52:17 UTC
[29/32] incubator-geode git commit: GEODE-14: Update scripts with
correct jars
GEODE-14: Update scripts with correct jars
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c221b2a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c221b2a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c221b2a5
Branch: refs/heads/develop
Commit: c221b2a534c94259410bf031027f3039b74ca7f9
Parents: cea74ab
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Feb 3 23:52:26 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Feb 8 07:06:27 2016 -0800
----------------------------------------------------------------------
.../release/scripts/cacheserver.sh | 15 ++++-----------
.../release/scripts/gemfire.sh | 7 +++----
2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c221b2a5/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh b/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
index e216251..24946a6 100755
--- a/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
+++ b/extensions/gemfire-modules-assembly/release/scripts/cacheserver.sh
@@ -33,7 +33,7 @@ fi
ARGS=( "$@" )
ARGS_LENGTH=${#ARGS[@]}
CLASS_ARGS=()
-for (( i==0; i<$ARGS_LENGTH; i++ ));
+for (( i=0; i<$ARGS_LENGTH; i++ ));
do
if [ "${ARGS[$i]}" == "-d" ]; then
i=$(($i+1))
@@ -73,26 +73,19 @@ if [ "x$WINDIR" != "x" ]; then
exit 1
fi
-if [ ! -f $GEMFIRE/lib/gemfire.jar ]; then
+GEMFIRE_DEP_JAR=$GEMFIRE/lib/gemfire-core-dependencies.jar
+if [ ! -f "$GEMFIRE_DEP_JAR" ]; then
echo "ERROR: Could not determine GEMFIRE location."
exit 1
fi
-# Initialize classpath
-
-LOG4J_API=$( ls $GEMFIRE/lib/log4j-api*jar )
-LOG4J_CORE=$( ls $GEMFIRE/lib/log4j-core*jar )
-
MOD_JAR=`ls $GEMFIRE/lib/gemfire-modules-?.*.jar` 2>/dev/null
if [ -z "$MOD_JAR" ]; then
MOD_JAR=$GEMFIRE/lib/gemfire-modules.jar
fi
-# Add GemFire classes
-GEMFIRE_JARS=$GEMFIRE/lib/gemfire.jar:$GEMFIRE/lib/antlr.jar:$LOG4J_API:$LOG4J_CORE
-
# Add Tomcat classes
-GEMFIRE_JARS=$GEMFIRE_JARS:$MOD_JAR:$TOMCAT_DIR/lib/servlet-api.jar:$TOMCAT_DIR/lib/catalina.jar:$TOMCAT_DIR/lib/tomcat-util.jar:$TOMCAT_DIR/bin/tomcat-juli.jar
+GEMFIRE_JARS=$GEMFIRE_DEP_JAR:$MOD_JAR:$TOMCAT_DIR/lib/servlet-api.jar:$TOMCAT_DIR/lib/catalina.jar:$TOMCAT_DIR/lib/tomcat-util.jar:$TOMCAT_DIR/bin/tomcat-juli.jar
# Add configuration
GEMFIRE_JARS=$GEMFIRE_JARS:$GEMFIRE/conf
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c221b2a5/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh b/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
index c36c320..7ca2c21 100755
--- a/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
+++ b/extensions/gemfire-modules-assembly/release/scripts/gemfire.sh
@@ -27,14 +27,13 @@ if [ "x$WINDIR" != "x" ]; then
exit 1
fi
-if [ ! -f $GEMFIRE/lib/gemfire.jar ]; then
+GEMFIRE_DEP_JAR=$GEMFIRE/lib/gemfire-core-dependencies.jar
+if [ ! -f "$GEMFIRE_DEP_JAR" ]; then
echo "ERROR: Could not determine GEMFIRE location."
exit 1
fi
-LOG4J_API=$( ls $GEMFIRE/lib/log4j-api*jar )
-LOG4J_CORE=$( ls $GEMFIRE/lib/log4j-core*jar )
-GEMFIRE_JARS=$GEMFIRE/lib/gemfire.jar:$GEMFIRE/lib/antlr.jar:$LOG4J_API:$LOG4J_CORE
+GEMFIRE_JARS=$GEMFIRE_DEP_JAR
if [ "x$CLASSPATH" != "x" ]; then
GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH