avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/src/bin merlinx.bat merlinx.sh merlin-server.sh merlin.sh
Date Fri, 19 Dec 2003 17:41:22 GMT
mcconnell    2003/12/19 09:41:22

  Modified:    merlin/platform/src/bin merlin-server.sh merlin.sh
  Added:       merlin/platform/src/bin merlinx.bat merlinx.sh
  Log:
  Sync. with repo RC4 and include Cygen scripts.
  
  Revision  Changes    Path
  1.6       +9 -14     avalon/merlin/platform/src/bin/merlin-server.sh
  
  Index: merlin-server.sh
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- merlin-server.sh	18 Dec 2003 01:33:52 -0000	1.5
  +++ merlin-server.sh	19 Dec 2003 17:41:21 -0000	1.6
  @@ -62,6 +62,14 @@
   
   unset THIS_PROG
   
  +# For Cygwin this script does not make too much sense, since there is
  +# no native JVM available.
  +if $cygwin; then
  +  echo "This script is used to install Merlin as \*nix service."
  +  echo "Please use $PRGDIR/nt/InstallService-NT.bat to do so for Windows."
  +  exit 1
  +fi
  +
   if [ -r "$MERLIN_HOME"/bin/setenv.sh ]; then
     . "$MERLIN_HOME"/bin/setenv.sh
   fi
  @@ -84,16 +92,6 @@
     exit 1
   fi
   
  -# For Cygwin, ensure paths are in UNIX format before anything is touched
  -if $cygwin; then
  -  [ -n "$MERLIN_HOME" ] && MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
  -fi
  -
  -# For Cygwin, switch paths to Windows format before running java
  -if $cygwin; then
  -  MERLIN_HOME=`cygpath --path --windows "$MERLIN_HOME"`
  -fi
  -
   # ----- Execute The Requested Command -----------------------------------------
   
   
  @@ -107,13 +105,10 @@
   # thus breaking Merlin 
   # 
   JVM_EXT_DIRS="$MERLIN_HOME/ext" 
  -if $cygwin; then
  -  JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"` 
  -fi
   JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Djava.ext.dirs=$JVM_EXT_DIRS"

   
   # Get the run cmd
  -RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -Dmerlin.home=$MERLIN_HOME
-jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
  +RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
$*"
   
   echo "Using MERLIN_HOME:   $MERLIN_HOME"
   echo "Using JAVA_HOME:     $JAVA_HOME"
  
  
  
  1.7       +14 -4     avalon/merlin/platform/src/bin/merlin.sh
  
  Index: merlin.sh
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- merlin.sh	18 Dec 2003 01:33:52 -0000	1.6
  +++ merlin.sh	19 Dec 2003 17:41:21 -0000	1.7
  @@ -28,11 +28,21 @@
   
   # For Cygwin, ensure paths are in UNIX format before anything is touched
   if $cygwin; then
  -  [ -n "$MERLIN_HOME" ] && MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
  -  # switch paths to Windows format before running java
  -  MERLIN_HOME=`cygpath --path --windows "$MERLIN_HOME"`
  +  JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
  +  MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
  +  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
   fi
   
  -RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-cli-3.2.jar $*"
  +JAVA=$JAVA_HOME/bin/java
  +
  +# switch necessary paths to Windows format before running java
  +if $cygwin; then
  +  JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
  +  MERLIN_HOME=`cygpath --windows "$MERLIN_HOME"`
  +  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  +fi
  +
  +RUN_CMD="\"$JAVA\" \"-Djava.security.policy=$MERLIN_HOME/bin/security.policy\" \"-Djava.ext.dirs=$MERLIN_HOME/ext\"
-jar \"$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar\" \"$@\""
   echo "RUN CMD IS: $RUN_CMD"
   exec $RUN_CMD
  +
  
  
  
  1.6       +2 -2      avalon/merlin/platform/src/bin/merlinx.bat
  
  
  
  
  1.6       +25 -1     avalon/merlin/platform/src/bin/merlinx.sh
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message