cvs commit: jakarta-tomcat-4.0/catalina/src/bin setenv.sh catalina.sh tool-wrapper.sh

[patrickl]

patrickl01/11/27 14:34:25

  Modified:catalina/src/bin catalina.sh tool-wrapper.sh
  Added:   catalina/src/bin setenv.sh
  Log:
  Added file for user customizable environment variables such as JAVA_HOME to be saved
  
  Revision  ChangesPath
  1.21  +4 -1  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- catalina.sh   2001/09/14 20:01:21 1.20
  +++ catalina.sh   2001/11/27 22:34:25 1.21
  @@ -24,7 +24,7 @@
   # (JSSE) installation, whose JAR files will be added to the
   # system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.20 2001/09/14 20:01:21 craigmcc Exp $
  +# $Id: catalina.sh,v 1.21 2001/11/27 22:34:25 patrickl Exp $
   # -
   
   
  @@ -52,6 +52,9 @@
echo Setting CATALINA_HOME to $CATALINA_HOME
   fi
   fi
  +
  +# Get user customizable environment variables
  +. $CATALINA_HOME/bin/setenv.sh
   
   if [ -z $CATALINA_OPTS ] ; then
 CATALINA_OPTS=
  
  
  
  1.2   +4 -1  jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh
  
  Index: tool-wrapper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tool-wrapper.sh   2001/11/13 16:57:21 1.1
  +++ tool-wrapper.sh   2001/11/27 22:34:25 1.2
  @@ -12,7 +12,7 @@
   #
   #   TOOL_OPTS (Optional) Java execution options for the tool.
   #
  -# $Id: tool-wrapper.sh,v 1.1 2001/11/13 16:57:21 craigmcc Exp $
  +# $Id: tool-wrapper.sh,v 1.2 2001/11/27 22:34:25 patrickl Exp $
   # -
   
   
  @@ -40,6 +40,9 @@
echo Setting CATALINA_HOME to $CATALINA_HOME
   fi
   fi
  +
  +# Get user customizable environment variables
  +. $CATALINA_HOME/bin/setenv.sh
   
   if [ -z $TOOL_OPTS ] ; then
 TOOL_OPTS=
  
  
  
  1.1  jakarta-tomcat-4.0/catalina/src/bin/setenv.sh
  
  Index: setenv.sh
  ===
  #!/bin/sh
  # -
  # setenv.sh - File to hold all user customizable environment variables
  #
  # $Id: setenv.sh,v 1.1 2001/11/27 22:34:25 patrickl Exp $
  # -
  
  # To permanently set your JAVA_HOME environment variable, uncomment and
  # customize the following line with the absolute path to your JAVA_HOME
  # JAVA_HOME=/usr/java
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-4.0/catalina/src/bin setenv.sh catalina.sh tool-wrapper.sh

[Daniel Rall]

Jon Stevens [EMAIL PROTECTED] writes:

 on 11/27/01 2:34 PM, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

 Index: setenv.sh
 ===
 #!/bin/sh
 # 
 -
 # setenv.sh - File to hold all user customizable environment variables
 #
 # $Id: setenv.sh,v 1.1 2001/11/27 22:34:25 patrickl Exp $
 # 
 -
 
 # To permanently set your JAVA_HOME environment variable, uncomment and
 # customize the following line with the absolute path to your JAVA_HOME
 # JAVA_HOME=/usr/java

 -1

 I don't think that this file should exist in CVS if it is a user file.

 The problem being that if a user upgrades to a new version of Catalina, then
 they will risk overwriting this file.

 Instead, it should be documented that the file needs to be created in order
 to be used.

I agree with Jon.  Files editted by the user should never be in CVS --
clear documentation is key here.  Other than that, I like the change!

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]