Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ISPN-1875 Fix demo scripts and add remote jmx port allocation
- Loading branch information
1 parent
da69e47
commit 646a45c
Showing
2 changed files
with
28 additions
and
190 deletions.
There are no files selected for viewing
109 changes: 14 additions & 95 deletions
109
demos/distexec/src/main/resources/runPiApproximationDemo.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,103 +1,22 @@ | |||
| #!/bin/bash | #!/bin/bash | ||
|
|
|
||
| add_to_classpath() | source "`dirname "$0"`/functions.sh" | ||
| { | |||
| DIR=${1} | |||
| for i in ${DIR}/*.jar ; do | |||
| CP=${CP}:${i} | |||
| done | |||
| } | |||
|
|
|
||
| # OS specific support. | add_classpath "${ISPN_HOME}"/*.jar | ||
| cygwin=false; | add_classpath "${ISPN_HOME}/lib" | ||
| darwin=false; | add_classpath "${ISPN_HOME}/modules/demos/distexec" | ||
| mingw=false | |||
| case "`uname`" in | |||
| CYGWIN*) cygwin=true ;; | |||
| MINGW*) mingw=true;; | |||
| Darwin*) darwin=true | |||
| if [ -z "$JAVA_VERSION" ] ; then | |||
| JAVA_VERSION="CurrentJDK" | |||
| else | |||
| echo "Using Java version: $JAVA_VERSION" | |||
| fi | |||
| if [ -z "$JAVA_HOME" ] ; then | |||
| JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home | |||
| fi | |||
| ;; | |||
| esac | |||
|
|
|
||
| if [ -z "$JAVA_HOME" ] ; then | add_jvm_args $JVM_PARAMS | ||
| if [ -r /etc/gentoo-release ] ; then | add_jvm_args '-Djava.net.preferIPv4Stack=true' | ||
| JAVA_HOME=`java-config --jre-home` | |||
| fi | |||
| fi | |||
|
|
|||
| # For Cygwin, ensure paths are in UNIX format before anything is touched | |||
| if $cygwin ; then | |||
| [ -n "$JAVA_HOME" ] && | |||
| JAVA_HOME=`cygpath --unix "$JAVA_HOME"` | |||
| fi | |||
|
|
|||
| # For Migwn, ensure paths are in UNIX format before anything is touched | |||
| if $mingw ; then | |||
| [ -n "$JAVA_HOME" ] && | |||
| JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" | |||
| fi | |||
|
|
|||
| if [ -z "$JAVACMD" ] ; then | |||
| if [ -n "$JAVA_HOME" ] ; then | |||
| if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | |||
| # IBM's JDK on AIX uses strange locations for the executables | |||
| JAVACMD="$JAVA_HOME/jre/sh/java" | |||
| else | |||
| JAVACMD="$JAVA_HOME/bin/java" | |||
| fi | |||
| else | |||
| JAVACMD="`which java`" | |||
| fi | |||
| fi | |||
|
|
|||
| if [ ! -x "$JAVACMD" ] ; then | |||
| echo "Error: JAVA_HOME is not defined correctly." | |||
| echo " We cannot execute $JAVACMD" | |||
| exit 1 | |||
| fi | |||
|
|
|||
| DIRNAME=`dirname $0` | |||
|
|
|||
| # Setup ISPN_HOME | |||
| if [ "x$ISPN_HOME" = "x" ]; then | |||
| # get the full path (without any relative bits) | |||
| ISPN_HOME=`cd $DIRNAME/..; pwd` | |||
| fi | |||
| export ISPN_HOME | |||
|
|
|||
| CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/distexec-demo | |||
|
|
|||
|
|
|||
| add_to_classpath ${ISPN_HOME} | |||
| add_to_classpath ${ISPN_HOME}/lib | |||
| add_to_classpath ${ISPN_HOME}/modules/demos/distexec | |||
| add_to_classpath ${ISPN_HOME}/modules/demos/distexec/lib | |||
|
|
|||
| 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 | |||
|
|
|||
| JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${LOG4J_CONFIG}" | |||
|
|
|
||
| # RHQ monitoring options | # RHQ monitoring options | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.ssl=false" | add_jvm_args '-Dcom.sun.management.jmxremote.ssl=false' | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.authenticate=false" | add_jvm_args '-Dcom.sun.management.jmxremote.authenticate=false' | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.port=6996" | add_jvm_args -Dcom.sun.management.jmxremote.port=$(find_tcp_port) | ||
|
|
|||
| # Sample JPDA settings for remote socket debugging | |||
| #add_jvm_args "-Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n" | |||
|
|
|
||
| # Sample JPDA settings for remote socket debuging | add_program_args $@ | ||
| #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n" | |||
| #echo Classpath is $CP | |||
|
|
|
||
| ${JAVACMD} -cp ${CP} ${JVM_PARAMS} org.infinispan.demo.distexec.PiApproximationDemo "$@" | start org.infinispan.demo.distexec.PiApproximationDemo | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,103 +1,22 @@ | |||
| #!/bin/bash | #!/bin/bash | ||
|
|
|
||
| add_to_classpath() | source "`dirname "$0"`/functions.sh" | ||
| { | |||
| DIR=${1} | |||
| for i in ${DIR}/*.jar ; do | |||
| CP=${CP}:${i} | |||
| done | |||
| } | |||
|
|
|
||
| # OS specific support. | add_classpath "${ISPN_HOME}"/*.jar | ||
| cygwin=false; | add_classpath "${ISPN_HOME}/lib" | ||
| darwin=false; | add_classpath "${ISPN_HOME}/modules/demos/distexec" | ||
| mingw=false | |||
| case "`uname`" in | |||
| CYGWIN*) cygwin=true ;; | |||
| MINGW*) mingw=true;; | |||
| Darwin*) darwin=true | |||
| if [ -z "$JAVA_VERSION" ] ; then | |||
| JAVA_VERSION="CurrentJDK" | |||
| else | |||
| echo "Using Java version: $JAVA_VERSION" | |||
| fi | |||
| if [ -z "$JAVA_HOME" ] ; then | |||
| JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home | |||
| fi | |||
| ;; | |||
| esac | |||
|
|
|
||
| if [ -z "$JAVA_HOME" ] ; then | add_jvm_args $JVM_PARAMS | ||
| if [ -r /etc/gentoo-release ] ; then | add_jvm_args '-Djava.net.preferIPv4Stack=true' | ||
| JAVA_HOME=`java-config --jre-home` | |||
| fi | |||
| fi | |||
|
|
|||
| # For Cygwin, ensure paths are in UNIX format before anything is touched | |||
| if $cygwin ; then | |||
| [ -n "$JAVA_HOME" ] && | |||
| JAVA_HOME=`cygpath --unix "$JAVA_HOME"` | |||
| fi | |||
|
|
|||
| # For Migwn, ensure paths are in UNIX format before anything is touched | |||
| if $mingw ; then | |||
| [ -n "$JAVA_HOME" ] && | |||
| JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" | |||
| fi | |||
|
|
|||
| if [ -z "$JAVACMD" ] ; then | |||
| if [ -n "$JAVA_HOME" ] ; then | |||
| if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | |||
| # IBM's JDK on AIX uses strange locations for the executables | |||
| JAVACMD="$JAVA_HOME/jre/sh/java" | |||
| else | |||
| JAVACMD="$JAVA_HOME/bin/java" | |||
| fi | |||
| else | |||
| JAVACMD="`which java`" | |||
| fi | |||
| fi | |||
|
|
|||
| if [ ! -x "$JAVACMD" ] ; then | |||
| echo "Error: JAVA_HOME is not defined correctly." | |||
| echo " We cannot execute $JAVACMD" | |||
| exit 1 | |||
| fi | |||
|
|
|||
| DIRNAME=`dirname $0` | |||
|
|
|||
| # Setup ISPN_HOME | |||
| if [ "x$ISPN_HOME" = "x" ]; then | |||
| # get the full path (without any relative bits) | |||
| ISPN_HOME=`cd $DIRNAME/..; pwd` | |||
| fi | |||
| export ISPN_HOME | |||
|
|
|||
| CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/distexec-demo | |||
|
|
|||
|
|
|||
| add_to_classpath ${ISPN_HOME} | |||
| add_to_classpath ${ISPN_HOME}/lib | |||
| add_to_classpath ${ISPN_HOME}/modules/demos/distexec | |||
| add_to_classpath ${ISPN_HOME}/modules/demos/distexec/lib | |||
|
|
|||
| 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 | |||
|
|
|||
| JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${LOG4J_CONFIG}" | |||
|
|
|
||
| # RHQ monitoring options | # RHQ monitoring options | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.ssl=false" | add_jvm_args '-Dcom.sun.management.jmxremote.ssl=false' | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.authenticate=false" | add_jvm_args '-Dcom.sun.management.jmxremote.authenticate=false' | ||
| #JVM_PARAMS="$JVM_PARAMS -Dcom.sun.management.jmxremote.port=6996" | add_jvm_args -Dcom.sun.management.jmxremote.port=$(find_tcp_port) | ||
|
|
|||
| # Sample JPDA settings for remote socket debugging | |||
| #add_jvm_args "-Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n" | |||
|
|
|
||
| # Sample JPDA settings for remote socket debuging | add_program_args $@ | ||
| #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n" | |||
| #echo Classpath is $CP | |||
|
|
|
||
| ${JAVACMD} -cp ${CP} ${JVM_PARAMS} org.infinispan.demo.mapreduce.WordCountDemo "$@" | start org.infinispan.demo.mapreduce.WordCountDemo | ||