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 INSTALLLICENSE
Date Wed, 09 Oct 2002 12:20:40 GMT
remm        2002/10/09 05:20:40

  Modified:    .        build.xml tomcat.nsi
               resources INSTALLLICENSE
  Log:
  - Cleanups and small fixes.
  
  Revision  Changes    Path
  1.40      +1 -1      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml	9 Oct 2002 10:07:48 -0000	1.39
  +++ build.xml	9 Oct 2002 12:20:40 -0000	1.40
  @@ -419,7 +419,7 @@
   
     <!-- ==================== RELEASE: Create Release ======================= -->
     <target name="release" depends="prepare-release,clean,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz"
  -   description="Create a Tomcat 5 packaged distribution" if="full-dist">
  +   description="Create a Tomcat 5 packaged distribution">
   
       <mkdir dir="${tomcat.release}"/>
       <mkdir dir="${tomcat.release}/v${version}"/>
  
  
  
  1.9       +26 -25    jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- tomcat.nsi	8 Oct 2002 09:36:39 -0000	1.8
  +++ tomcat.nsi	9 Oct 2002 12:20:40 -0000	1.9
  @@ -12,6 +12,11 @@
   ;--------------------------------
   ;Configuration
   
  +  !define MUI_LICENSEPAGE
  +  !define MUI_COMPONENTPAGE
  +  !define MUI_DIRSELECTPAGE
  +  !define MUI_UNINSTALLER
  +
     ;Language
       ;English
       LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
  @@ -31,28 +36,18 @@
     !insertmacro MUI_INTERFACE "modern.exe" "adni18-installer-C-no48xp.ico" "adni18-uninstall-C-no48xp.ico"
"modern.bmp" "smooth" "$9"
   
     ;License dialog
  -  LicenseText "Press Page Down to see the rest of the agreement."
     LicenseData INSTALLLICENSE
   
  -  ;Component-select dialog
  -  ComponentText "Check the components you want to install and uncheck the components you
don't want to install. Click Next to continue."
  -
     ;Folder-select dialog
  -  !insertmacro MUI_ENGLISH_DIRTEXT
     InstallDir "$PROGRAMFILES\Apache Group\Tomcat 5.0"
   
  -  ;Uninstaller
  -  !insertmacro MUI_ENGLISH_UNINSTALLTEXT
  +  ;Install types
  +  InstType Normal
  +  InstType Minimum
  +  InstType Full
   
  -InstType Normal
  -InstType Minimum
  -InstType Full
  -AutoCloseWindow false
  -ShowInstDetails show
  -SetOverwrite on
  -SetDateSave on
  -
  -InstallDirRegKey HKLM "SOFTWARE\Apache Group\Tomcat\5.0" ""
  +  ; Main registry key
  +  InstallDirRegKey HKLM "SOFTWARE\Apache Group\Tomcat\5.0" ""
   
   SubSection "Tomcat" SecTomcat
   
  @@ -66,6 +61,7 @@
     File /r bin
     Delete "$INSTDIR\bin\tomcat.exe"
     File /r common
  +  File /r conf
     File /r shared
     File /r logs
     File /r server
  @@ -79,6 +75,7 @@
     Pop $2
   
     CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
  +  BringToFront
   
   SectionEnd
   
  @@ -94,6 +91,7 @@
     
     ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Apache Tomcat 5.0" "$2" -Djava.class.path="$INSTDIR\bin\bootstrap.jar"
-Dcatalina.home="$INSTDIR" -Djava.endorsed.dirs="$INSTDIR\common\endorsed" -start org.apache.catalina.startup.BootstrapService
-params start -stop org.apache.catalina.startup.BootstrapService -params stop -out "$INSTDIR\logs\stdout.log"
-err "$INSTDIR\logs\stderr.log"'
     
  +  BringToFront
     ClearErrors
   
   SectionEnd
  @@ -172,12 +170,6 @@
   
     WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  -  SetOverwrite off
  -  SetOutPath $INSTDIR
  -  File /r conf
  -
  -  SetOverwrite on
  -
     Call startService
   
     WriteRegStr HKLM "SOFTWARE\Apache Group\Tomcat\5.0" "" $INSTDIR
  @@ -412,6 +404,9 @@
     StrCpy $R4 'port="$R0"'
     StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
   
  +  DetailPrint 'HTTP/1.1 Connector configured on port "$R0"'
  +  DetailPrint 'Admin user added: "$R1"'
  +
     SetOutPath $TEMP
     File /r confinstall
   
  @@ -427,6 +422,8 @@
   
     FileClose $R9
   
  +  DetailPrint "server.xml written"
  +
     ; Build final tomcat-users.xml
     Delete "$INSTDIR\conf\tomcat-users.xml"
     FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
  @@ -439,6 +436,8 @@
   
     FileClose $R9
   
  +  DetailPrint "tomcat-users.xml written"
  +
     ; Creating a few shortcuts
     IfFileExists "$SMPROGRAMS\Apache Tomcat 5.0" 0 NoLinks
   
  @@ -499,7 +498,8 @@
   
     IfFileExists "$INSTDIR\bin\tomcat.exe" 0 NoService
     ExecWait 'net start "Apache Tomcat 5.0"'
  -  Sleep 4000
  +  Sleep 3000
  +  BringToFront
   
    NoService:
   
  @@ -516,7 +516,8 @@
   
     IfFileExists "$INSTDIR\bin\tomcat.exe" 0 NoService
     ExecWait 'net stop "Apache Tomcat 5.0"'
  -  Sleep 2000
  +  Sleep 1000
  +  BringToFront
   
    NoService:
   
  
  
  
  1.3       +4 -4      jakarta-tomcat-5/resources/INSTALLLICENSE
  
  Index: INSTALLLICENSE
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/INSTALLLICENSE,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- INSTALLLICENSE	9 Oct 2002 10:06:07 -0000	1.2
  +++ INSTALLLICENSE	9 Oct 2002 12:20:40 -0000	1.3
  @@ -1,11 +1,11 @@
  -=====================================================
  +================================================
                                                                            
                      The Apache Software License,  Version 1.1                
                                                                            
         Copyright (c) 1999, 2000, 2001  The Apache Software Foundation.        
                                 All rights reserved.                           
                                                                            
  -=====================================================
  +================================================
                                                                            
   Redistribution and use in source and binary forms,  with or without modi-
   fication, are permitted provided that the following conditions are met:  
  @@ -51,10 +51,10 @@
   SOFTWARE,  EVEN  IF  ADVISED  OF THE POSSIBILITY 
   OF SUCH DAMAGE.                                              
                                                                            
  -=====================================================
  +================================================
                                                                            
   This software  consists of voluntary  contributions made  by many indivi-
   duals on behalf of the  Apache Software Foundation.  For more information
   on the Apache Software Foundation, please see <http://www.apache.org/>.  
                                                                            
  -=====================================================
  +================================================
  
  
  

--
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