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/resources/confinstall server_1.xml server_2.xml
Date Sun, 11 Aug 2002 13:50:54 GMT
remm        2002/08/11 06:50:54

  Modified:    .        build.properties.default build.xml tomcat.nsi
               resources/confinstall server_1.xml server_2.xml
  Log:
  - Updates to use NSIS 2.0 and the launcher.
  
  Revision  Changes    Path
  1.23      +3 -2      jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.properties.default	11 Aug 2002 12:28:14 -0000	1.22
  +++ build.properties.default	11 Aug 2002 13:50:54 -0000	1.23
  @@ -172,6 +172,7 @@
   
   # ----- JavaService, version 1.2.0 or later -----
   javaservice.home=${base.path}/javaservice
  +javaservice.exe=${javaservice.home}/bin/JavaService.exe
   javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
   
   
  @@ -219,7 +220,7 @@
   # ----- NSIS, version 2.0a6 or later -----
   nsis.home=${base.path}/nsis-2.0
   nsis.exe=${nsis.home}/makensis.exe
  -nsis.installoptions=${nsis.home}/Bin/InstallOptions.dll
  +nsis.installoptions.dll=${nsis.home}/Bin/InstallOptions.dll
   nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis2k/nsis20a6.exe
   
   
  
  
  
  1.21      +8 -9      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	11 Aug 2002 11:54:35 -0000	1.20
  +++ build.xml	11 Aug 2002 13:50:54 -0000	1.21
  @@ -280,14 +280,12 @@
       <copy todir="${tomcat.dist}">
         <fileset dir="resources" />
       </copy>
  -    <copy file="${nsis.home}/InstallOptions.dll" 
  -     todir="${tomcat.dist}" />
  -    <copy file="${javaservice.home}/bin/JavaService.exe" 
  -     tofile="${tomcat.dist}/bin/tomcat.exe" />
  +    <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
  +    <copy file="${javaservice.exe}" tofile="${tomcat.dist}/bin/tomcat.exe" />
       <filter token="VERSION" value="${version}"/>
       <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" 
        filtering="true"/>
  -    <exec dir="${tomcat.dist}" executable="${nsis.home}\makensis-bz2.exe">
  +    <exec dir="${tomcat.dist}" executable="${nsis.exe}">
         <arg value="tomcat.nsi" />
       </exec>
       <move file="${tomcat.dist}/tomcat-installer.exe" 
  @@ -336,8 +334,9 @@
       <condition property="execute.installer">
         <and>
           <os family="windows" />
  -        <available file="${javaservice.home}/bin/JavaService.exe" />
  -        <available file="${nsis.home}/makensis-bz2.exe" />
  +        <available file="${javaservice.exe}" />
  +        <available file="${nsis.exe}" />
  +        <available file="${nsis.installoptions.dll}" />
         </and>
       </condition>
     </target>
  @@ -586,7 +585,7 @@
       </antcall>
       <antcall target="downloadzip">
         <param name="sourcefile" value="${javaservice.loc}"/>
  -      <param name="destfile" value="${javaservice.home}/bin/JavaService.exe"/>
  +      <param name="destfile" value="${javaservice.exe}"/>
         <param name="destdir" value="${javaservice.home}"/>
       </antcall>
       <antcall target="downloadgz">
  @@ -600,7 +599,7 @@
       </antcall>
       <antcall target="downloadfile">
         <param name="sourcefile" value="${nsis.loc}"/>
  -      <param name="destfile" value="${nsis.home}/nsis198.exe"/>
  +      <param name="destfile" value="${nsis.home}/nsis.exe"/>
         <param name="destdir" value="${nsis.home}"/>
       </antcall>
       <antcall target="downloadgz">
  
  
  
  1.3       +5 -11     jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tomcat.nsi	26 Jul 2002 16:28:50 -0000	1.2
  +++ tomcat.nsi	11 Aug 2002 13:50:54 -0000	1.3
  @@ -14,8 +14,6 @@
   
   Icon main.ico
   UninstallIcon uninst.ico 
  -EnabledBitmap tickyes.bmp 
  -DisabledBitmap tickno.bmp
   
   LicenseText "You must read the following license before installing:"
   LicenseData INSTALLLICENSE
  @@ -115,18 +113,16 @@
   
     CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk" \
                    "$2\bin\java.exe" \
  -                 '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" start' \
  +                 '-Duser.dir="$INSTDIR\bin" LauncherBootstrap -launchfile catalina.xml
catalina start' \
                    "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
   
     CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Stop Tomcat.lnk" \
                    "$2\bin\java.exe" \
  -                 '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
  +                 '-Duser.dir="$INSTDIR\bin" LauncherBootstrap -launchfile catalina.xml
catalina stop' \
                    "$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
   
   SectionEnd
   
  -SectionDivider " documentation and examples "
  -
   Section "Tomcat Documentation"
   
     SectionIn 1 3
  @@ -153,12 +149,10 @@
     File conf\server.xml
     SetOverwrite on
     SetOutPath $INSTDIR\webapps
  -  File /r webapps\examples
  -  File /r webapps\webdav
  +;*** TEMP
  +;  File /r webapps\examples
   
   SectionEnd
  -
  -SectionDivider " developer resources "
   
   Section "Tomcat Source Code"
   
  
  
  
  1.3       +1 -1      jakarta-tomcat-5/resources/confinstall/server_1.xml
  
  Index: server_1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- server_1.xml	30 Jul 2002 03:57:24 -0000	1.2
  +++ server_1.xml	11 Aug 2002 13:50:54 -0000	1.3
  @@ -83,4 +83,4 @@
       -->
   
       <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8081 -->
  -    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
  +    <Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
  
  
  
  1.3       +1 -1      jakarta-tomcat-5/resources/confinstall/server_2.xml
  
  Index: server_2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_2.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- server_2.xml	30 Jul 2002 03:57:24 -0000	1.2
  +++ server_2.xml	11 Aug 2002 13:50:54 -0000	1.3
  @@ -18,7 +18,7 @@
       -->
   
       <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
  -    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
  +    <Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
                  port="8009" minProcessors="5" maxProcessors="75"
                  enableLookups="true" redirectPort="8443"
                  acceptCount="10" debug="0" connectionTimeout="20000"
  
  
  

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


Mime
View raw message