tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
Date Thu, 03 Mar 2005 15:13:39 GMT
remm        2005/03/03 07:13:39

  Modified:    catalina/src/bin catalina.bat catalina.sh
               .        build.xml tomcat.nsi
  Log:
  - Add some script magic for Juli.
  
  Revision  Changes    Path
  1.12      +5 -1      jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.bat	23 Sep 2004 20:14:48 -0000	1.11
  +++ catalina.bat	3 Mar 2005 15:13:39 -0000	1.12
  @@ -77,6 +77,10 @@
   set CATALINA_TMPDIR=%CATALINA_BASE%\temp
   :gotTmpdir
   
  +if not exist "%CATALINA_HOME%\bin\tomcat-juli.jar" goto noJuli
  +set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
  +:noJuli
  +
   rem ----- Execute The Requested Command ---------------------------------------
   
   echo Using CATALINA_BASE:   %CATALINA_BASE%
  
  
  
  1.19      +6 -1      jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- catalina.sh	10 Jan 2005 18:16:10 -0000	1.18
  +++ catalina.sh	3 Mar 2005 15:13:39 -0000	1.19
  @@ -114,6 +114,11 @@
     fi
   fi
   
  +# Set juli LogManager if it is present
  +if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
  +  JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
  +fi
  +
   # Add on extra jar files to CLASSPATH
   if [ -n "$JSSE_HOME" ]; then
     CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
  
  
  
  1.226     +0 -1      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- build.xml	3 Mar 2005 13:34:17 -0000	1.225
  +++ build.xml	3 Mar 2005 15:13:39 -0000	1.226
  @@ -1229,7 +1229,6 @@
         	<exclude name="*-using-launcher.*"/>
         	<exclude name="LauncherBootstrap.class"/>
         	<exclude name="launcher.properties"/>
  -      	<exclude name="tomcat-juli.jar"/>
         </fileset>
       </copy>
       <copy todir="${tomcat.dist}/common/classes">
  
  
  
  1.70      +3 -2      jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- tomcat.nsi	15 Feb 2005 15:32:32 -0000	1.69
  +++ tomcat.nsi	3 Mar 2005 15:13:39 -0000	1.70
  @@ -131,6 +131,7 @@
     SetOutPath $INSTDIR\bin
     File bin\bootstrap.jar
     File bin\commons-logging-api.jar
  +  File bin\tomcat-juli.jar
     File bin\*.exe
     SetOutPath $INSTDIR\conf
     File conf\*.*
  @@ -307,7 +308,7 @@
   
   Section -post
     nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Classpath "$INSTDIR\bin\bootstrap.jar"
--StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap
--StartParams start --StopParams stop  --StartMode jvm --StopMode jvm'
  -  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp"
--StdOutput auto --StdError auto'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
--StdOutput auto --StdError auto'
   
     WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message