geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r376526 - in /geronimo/branches/1.0/modules/scripts/src/resources/bin: deploy.bat deploy.sh geronimo.bat geronimo.sh
Date Fri, 10 Feb 2006 01:32:36 GMT
Author: jsisson
Date: Thu Feb  9 17:32:35 2006
New Revision: 376526

URL: http://svn.apache.org/viewcvs?rev=376526&view=rev
Log:
GERONIMO-1604 - Make scripts consistent in the output of environment variable information
(previously deploy.bat and deploy.sh did not output this information).  Also allow environment
variable information to be turned off using the new GERONIMO_ENV_INFO environment variable.
(merged from trunk)

Modified:
    geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
    geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh
    geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
    geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat?rev=376526&r1=376525&r2=376526&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat Thu Feb  9 17:32:35
2006
@@ -70,6 +70,13 @@
 @REM                        "on" results in each batch file to pause at the
 @REM                        end of execution
 @REM
+@REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+@REM                        "on" (the default) outputs the values of  
+@REM                        GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM                        JAVA_HOME and JRE_HOME before the command is
+@REM                        issued. Set to "off" if you do not want this
+@REM                        information displayed.
+@REM
 @REM Batch files called by this batch file:
 @REM 
 @REM   %GERONIMO_HOME%\bin\setenv.bat
@@ -143,6 +150,16 @@
 if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
 set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
 :gotTmpdir
+
+@REM ----- Execute The Requested Command ---------------------------------------
+@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
+echo Using GERONIMO_BASE:   %GERONIMO_BASE%
+echo Using GERONIMO_HOME:   %GERONIMO_HOME%
+echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
+if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
+if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
+
+:skipEnvInfo
 
 @REM Capture any passed in arguments
 set ARGS=%*

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh?rev=376526&r1=376525&r2=376526&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh Thu Feb  9 17:32:35
2006
@@ -59,6 +59,15 @@
 #
 #   JAVA_OPTS       (Optional) Java runtime options.
 #
+# Troubleshooting execution of this script file:
+#
+#  GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+#                       "on" (the default) outputs the 
+#                       values of GERONIMO_HOME, GERONIMO_BASE, 
+#                       GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
+#                       the command is issued. Set to "off" if you
+#                       do want to see this information.
+#
 # Scripts called by this script:
 # 
 #   $GERONIMO_HOME/bin/setenv.sh
@@ -167,6 +176,19 @@
   GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
   GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
   GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
+fi
+
+# ----- Execute The Requested Command -----------------------------------------
+if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+  echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
+  echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
+  echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
+  if [ "$1" = "debug" ] ; then
+    echo "Using JAVA_HOME:       $JAVA_HOME"
+    echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
+  else
+    echo "Using JRE_HOME:        $JRE_HOME"
+  fi
 fi
 
 exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat?rev=376526&r1=376525&r2=376526&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat Thu Feb  9 17:32:35
2006
@@ -88,6 +88,13 @@
 @REM                        "on" results in each batch file to pause at the
 @REM                        end of execution
 @REM
+@REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
+@REM                        "on" (the default) outputs the values of  
+@REM                        GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM                        JAVA_HOME and JRE_HOME before the command is
+@REM                        issued. Set to "off" if you do not want this
+@REM                        information displayed.
+@REM
 @REM Batch files called by this batch file:
 @REM 
 @REM   %GERONIMO_HOME%\bin\setenv.bat
@@ -164,12 +171,13 @@
 :gotTmpdir
 
 @REM ----- Execute The Requested Command ---------------------------------------
-
+@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
 echo Using GERONIMO_BASE:   %GERONIMO_BASE%
 echo Using GERONIMO_HOME:   %GERONIMO_HOME%
 echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
 if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
 if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
+:skipEnvInfo
 
 set _EXECJAVA=%_RUNJAVA%
 @REM MAINCLASS required for jdb debugger as it requires the mainclass

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh?rev=376526&r1=376525&r2=376526&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh Thu Feb  9 17:32:35
2006
@@ -93,6 +93,14 @@
 #                   the OS provides a command that allows you to start a process
 #                   with in a specified CPU or priority.
 #
+# Troubleshooting execution of this script file:
+#
+#  GERONIMO_ENV_INFO (Optional) Environment variable that when set to "on"
+#                    (the default) outputs the values of the GERONIMO_HOME,
+#                    GERONIMO_BASE, GERONIMO_TMPDIR, JAVA_HOME and
+#                    JRE_HOME before the command is issued. Set to "off"    
+#                    if you do not want this information displayed.
+#
 # Scripts called by this script:
 # 
 #   $GERONIMO_HOME/bin/setenv.sh
@@ -217,21 +225,24 @@
 fi
 
 # ----- Execute The Requested Command -----------------------------------------
-
-echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
-echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
-echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
-if [ "$1" = "debug" ] ; then
-  echo "Using JAVA_HOME:       $JAVA_HOME"
-  echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
-else
-  echo "Using JRE_HOME:        $JRE_HOME"
+if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+  echo "Using GERONIMO_BASE:   $GERONIMO_BASE"
+  echo "Using GERONIMO_HOME:   $GERONIMO_HOME"
+  echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
+  if [ "$1" = "debug" ] ; then
+    echo "Using JAVA_HOME:       $JAVA_HOME"
+    echo "Using JDB_SRCPATH:     $JDB_SRCPATH"
+  else
+    echo "Using JRE_HOME:        $JRE_HOME"
+  fi
 fi
 
 LONG_OPT=
 if [ "$1" = "start" ] ; then
   LONG_OPT=--long
-  echo "Using GERONIMO_OUT:    $GERONIMO_OUT"
+  if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
+    echo "Using GERONIMO_OUT:    $GERONIMO_OUT"
+  fi
 fi
 
 if [ "$1" = "jpda" ] ; then



Mime
View raw message