[infinispan-commits] Infinispan SVN: r1756 - in trunk: server/core/src/main/resources and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-05-07 08:44:33 -0400 (Fri, 07 May 2010)
New Revision: 1756

Modified:
   trunk/demos/gui/src/main/resources/runGuiDemo.sh
   trunk/server/core/src/main/resources/startServer.sh
Log:
Made shell scripts Cygwin friendly

Modified: trunk/demos/gui/src/main/resources/runGuiDemo.sh
===================================================================
--- trunk/demos/gui/src/main/resources/runGuiDemo.sh	2010-05-07 10:40:12 UTC (rev 1755)
+++ trunk/demos/gui/src/main/resources/runGuiDemo.sh	2010-05-07 12:44:33 UTC (rev 1756)
@@ -1,7 +1,22 @@
 #!/bin/bash
 
+add_to_classpath()
+{
+  DIR=${1}
+  for i in ${DIR}/*.jar ; do
+    CP=${CP}:${i}
+  done
+}
+
 DIRNAME=`dirname $0`
 
+# Detect Cygwin
+# Cygwin fix courtesy of Supin Ko
+cygwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+esac
+
 # Setup ISPN_HOME
 if [ "x$ISPN_HOME" = "x" ]; then
     # get the full path (without any relative bits)
@@ -11,23 +26,22 @@
 
 CP=${CP}:${ISPN_HOME}/etc
 
-CP=${CP}:${ISPN_HOME}/infinispan-core.jar
+add_to_classpath ${ISPN_HOME}
+add_to_classpath ${ISPN_HOME}/lib
+add_to_classpath ${ISPN_HOME}/modules/gui
+add_to_classpath ${ISPN_HOME}/modules/gui/lib
 
-for i in ${ISPN_HOME}/lib/*.jar ; do
-   CP=${i}:${CP}
-done
+if $cygwin; then
+   # Turn paths into Windows style for Cygwin
+   CP=`cygpath -wp ${CP}`
+   LOG4J_CONFIG=`cygpath -w ${ISPN_HOME}/etc/log4j.xml`
+else
+   LOG4J_CONFIG=${ISPN_HOME}/etc/log4j.xml
+fi
 
-for i in ${ISPN_HOME}/modules/gui/*.jar ; do
-   CP=${i}:${CP}
-done
+JVM_PARAMS="${JVM_PARAMS} -Dbind.address=127.0.0.1 -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${LOG4J_CONFIG}"
 
-for i in ${ISPN_HOME}/modules/gui/lib/*.jar ; do
-   CP=${i}:${CP}
-done
-
-JVM_PARAMS="${JVM_PARAMS} -Dbind.address=127.0.0.1 -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
-
 # Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
 
 java -cp ${CP} ${JVM_PARAMS} org.infinispan.demo.InfinispanDemo &

Modified: trunk/server/core/src/main/resources/startServer.sh
===================================================================
--- trunk/server/core/src/main/resources/startServer.sh	2010-05-07 10:40:12 UTC (rev 1755)
+++ trunk/server/core/src/main/resources/startServer.sh	2010-05-07 12:44:33 UTC (rev 1756)
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+add_to_classpath()
+{
+  DIR=${1}
+  if [ -e ${DIR} ] ; then
+    for i in ${DIR}/*.jar ; do
+      CP=${CP}:${i}
+    done
+  fi
+}
+
 DIRNAME=`dirname $0`
 
 # Setup ISPN_HOME
@@ -9,49 +19,32 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/infinispan-core.jar
+# Detect Cygwin
+# Cygwin fix courtesy of Supin Ko
+cygwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+esac
 
-if [ -e ${ISPN_HOME}/lib ]
-then
-   for JAR in ${ISPN_HOME}/lib/*
-   do
-      CP=$CP:$JAR
-   done
-fi
+add_to_classpath ${ISPN_HOME}
+add_to_classpath ${ISPN_HOME}/lib
+add_to_classpath ${ISPN_HOME}/modules/memcached
+add_to_classpath ${ISPN_HOME}/modules/memcached/lib
+add_to_classpath ${ISPN_HOME}/modules/hotrod
+add_to_classpath ${ISPN_HOME}/modules/hotrod/lib
+add_to_classpath ${ISPN_HOME}/modules/websocket
+add_to_classpath ${ISPN_HOME}/modules/websocket/lib
 
-CP=${CP}:${ISPN_HOME}/modules/memcached/infinispan-server-memcached.jar
-
-if [ -e ${ISPN_HOME}/modules/memcached/lib ]
-then
-   for JAR in ${ISPN_HOME}/modules/memcached/lib/*
-   do
-      CP=$CP:$JAR
-   done
+if $cygwin; then
+   # Turn paths into Windows style for Cygwin
+   CP=`cygpath -wp ${CP}`
+   LOG4J_CONFIG=`cygpath -w ${ISPN_HOME}/etc/log4j.xml`
+else
+   LOG4J_CONFIG=${ISPN_HOME}/etc/log4j.xml
 fi
 
-CP=${CP}:${ISPN_HOME}/modules/hotrod/infinispan-server-hotrod.jar
+JVM_PARAMS="${JVM_PARAMS} -Dbind.address=127.0.0.1 -Djava.net.preferIPv4Stack=true  -Dlog4j.configuration=file:${LOG4J_CONFIG}"
 
-if [ -e ${ISPN_HOME}/modules/hotrod/lib ]
-then
-   for JAR in ${ISPN_HOME}/modules/hotrod/lib/*
-   do
-      CP=$CP:$JAR
-   done
-fi
-
-CP=${CP}:${ISPN_HOME}/modules/websocket/infinispan-server-websocket.jar
-
-if [ -e ${ISPN_HOME}/modules/websocket/lib ]
-then
-   for JAR in ${ISPN_HOME}/modules/websocket/lib/*
-   do
-      CP=$CP:$JAR
-   done
-fi
-
-
-JVM_PARAMS="${JVM_PARAMS} -Dbind.address=127.0.0.1 -Djava.net.preferIPv4Stack=true  -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
-
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"