cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2005-02-03 Thread markt 
markt   2005/02/03 15:39:18

  Modified:.tomcat.nsi
  Log:
  Fix bug 23277. Make clear WebDAV is one of the exmaple web apps in the windows
   installer.
   - Also upgraded to use modern UI.
  
  Revision  ChangesPath
  1.39  +57 -35jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- tomcat.nsi9 Sep 2004 20:46:57 -   1.38
  +++ tomcat.nsi3 Feb 2005 23:39:18 -   1.39
  @@ -1,6 +1,7 @@
   
   ; Tomcat 4 script for Nullsoft Installer
   ; $Id$
  +!include MUI.nsh
   
   Name Apache Tomcat 4.1
   OutFile tomcat4.exe
  @@ -9,38 +10,31 @@
   SetCompressor lzma
   SetDatablockOptimize on
   
  -BGGradient 00 80 FF
  -InstallColors FF8080 00
  -InstProgressFlags smooth colored
  -
   !include StrFunc.nsh
   ${StrRep}
   
  -PageEx license
  -  LicenseText You must read the following license before installing:
  -  LicenseData INSTALLLICENSE
  -PageExEnd
  -
  -PageEx components
  -  ComponentText This will install the Apache Tomcat 4.1 servlet container 
on your computer:
  -PageExEnd
  -
  -PageEx directory
  -  DirText Please select a location to install Tomcat 4.1 (or use the 
default):
  -PageExEnd
  +!define MUI_COMPONENTSPAGE_SMALLDESC
  +
  +!insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
  +
  +!define MUI_COMPONENTSPAGE_TEXT_TOP This will install the Apache Tomcat 4.1 
servlet container on your computer:
  +!insertmacro MUI_PAGE_COMPONENTS
  +
  +!define MUI_DIRECTORYPAGE_TEXT_TOP Please select a location to install 
Tomcat 4.1 (or use the default):
  +!insertmacro MUI_PAGE_DIRECTORY
  +
  +!insertmacro MUI_PAGE_INSTFILES
   
  -Page instfiles
   Page custom configure  : Basic settings
   
  -UninstPage uninstConfirm
  -UninstPage instfiles
  - 
  -Icon main.ico
  -UninstallIcon uninst.ico 
  +!insertmacro MUI_UNPAGE_CONFIRM
  +!insertmacro MUI_UNPAGE_INSTFILES
  +
  +!insertmacro MUI_LANGUAGE English
   
   InstType Normal
   InstType Minimum
  -InstType Full (w/ Source Code)
  +InstType Full (with source code)
   AutoCloseWindow false
   ShowInstDetails show
   SetOverwrite on
  @@ -49,10 +43,14 @@
   InstallDir $PROGRAMFILES\Apache Group\Tomcat 4.1
   InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\4.1 
   
  -SubSection /e Main
  -  Section Tomcat (required)
  +ReserveFile config.ini
  +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
  +!insertmacro MUI_RESERVEFILE_LANGDLL
   
  -SectionIn 1 2 3
  +SubSection /e Main Section1
  +  Section Tomcat (required) Section2
  +
  +SectionIn 1 2 3 RO
   
   SetOutPath $INSTDIR
   File tomcat.ico
  @@ -78,7 +76,7 @@
   
 SectionEnd
   
  -  Section NT Service (NT/2k/XP only)
  +  Section NT Service (NT/2k/XP only) Section3
   
   SectionIn 3
   
  @@ -94,7 +92,7 @@
   
 SectionEnd
   
  -  Section JSP Development Shell Extensions
  +  Section JSP Development Shell Extensions Section4
   
   SectionIn 1 2 3
   ; back up old value of .jsp
  @@ -113,7 +111,7 @@
   
 SectionEnd
   
  -  Section Tomcat Start Menu Group
  +  Section Tomcat Start Menu Group Section5
   
   SectionIn 1 2 3
   
  @@ -144,8 +142,8 @@
 SectionEnd
   SubSectionEnd
   
  -SubSection Documentation and Examples
  -  Section Tomcat Documentation
  +SubSection Documentation and Examples Section6
  +  Section Tomcat Documentation Section7
   
   SectionIn 1 3
   SetOutPath $INSTDIR\webapps
  @@ -162,7 +160,7 @@
   
 SectionEnd
   
  -  Section Example Web Applications
  +  Section Example Web Applications Section8
   
   SectionIn 1 3
   
  @@ -177,9 +175,9 @@
 SectionEnd
   
   SubSEctionEnd
  -SubSection Developer Resources
  +SubSection Developer Resources Section9
   
  -  Section Tomcat Source Code
  +  Section Tomcat Source Code Section10
   
   SectionIn 3
   SetOutPath $INSTDIR
  @@ -190,6 +188,30 @@
   
   SubSectionEnd
   
  +LangString DESC_Section1 ${LANG_ENGLISH} The core Tomcat components.
  +LangString DESC_Section2 ${LANG_ENGLISH} The Tomcat servlet container.
  +LangString DESC_Section3 ${LANG_ENGLISH} Additional files and configuration 
to enable Tomcat to be run as a Windows service.
  +LangString DESC_Section4 ${LANG_ENGLISH} Configure NotePad as the default 
editor for JSP files.
  +LangString DESC_Section5 ${LANG_ENGLISH} Add Tomcat icons to the Start 
menu.
  +LangString DESC_Section6 ${LANG_ENGLISH} Optional web applications.
  +LangString DESC_Section7 ${LANG_ENGLISH} Deploys the documentation web 
aplication.
  +LangString DESC_Section8 ${LANG_ENGLISH} Deploys the JSP  servlets 
examples web application and the WebDAV example web application.
  +LangString DESC_Section9 ${LANG_ENGLISH} Optional resource for developers.
  +LangString DESC_Section10 ${LANG_ENGLISH} Places the Tomcat and Tomcat 
Connector source code as

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2004-09-09 Thread markt 
markt   2004/09/09 13:46:57

  Modified:.tomcat.nsi
  Log:
  Add compression that is now required with new version of NSIS.
  
  Revision  ChangesPath
  1.38  +2 -1  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- tomcat.nsi22 May 2004 18:48:07 -  1.37
  +++ tomcat.nsi9 Sep 2004 20:46:57 -   1.38
  @@ -6,6 +6,7 @@
   OutFile tomcat4.exe
   CRCCheck on
   SetCompress force
  +SetCompressor lzma
   SetDatablockOptimize on
   
   BGGradient 00 80 FF
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2004-05-22 Thread markt 
markt   2004/05/22 11:48:07

  Modified:.tomcat.nsi
  Log:
  Fix bug 15798. Install fails if '' appears in admin user name or password.
  
  Revision  ChangesPath
  1.37  +22 -1 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- tomcat.nsi22 May 2004 17:34:57 -  1.36
  +++ tomcat.nsi22 May 2004 18:48:07 -  1.37
  @@ -12,6 +12,9 @@
   InstallColors FF8080 00
   InstProgressFlags smooth colored
   
  +!include StrFunc.nsh
  +${StrRep}
  +
   PageEx license
 LicenseText You must read the following license before installing:
 LicenseData INSTALLLICENSE
  @@ -317,6 +320,14 @@
 ReadINIStr $R1 $PLUGINSDIR\config.ini Field 5 State
 ReadINIStr $R2 $PLUGINSDIR\config.ini Field 7 State
   
  +  Push $R1
  +  Call xmlEscape
  +  Pop $R1
  +  
  +  Push $R2
  +  Call xmlEscape
  +  Pop $R2
  +
 StrCpy $R4 'port=$R0'
 StrCpy $R5 'user name=$R1 password=$R2 roles=admin,manager /'
   
  @@ -372,6 +383,16 @@
 Sleep 500
 BringToFront
   
  +FunctionEnd
  +
  +
  +Function xmlEscape
  +  Pop $0
  +  ${StrRep} $0 $0  amp;
  +  ${StrRep} $0 $0 $\ quot;
  +  ${StrRep} $0 $0  lt;
  +  ${StrRep} $0 $0  gt;
  +  Push $0
   FunctionEnd
   
   
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2004-04-27 Thread markt 
markt   2004/04/27 15:41:50

  Modified:.tomcat.nsi
  Log:
  Fix bug 20709. Use same setting for 'Djava.endorsed.dirs' when starting
via menu as for service and batch file.
  
  Revision  ChangesPath
  1.35  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- tomcat.nsi6 Oct 2003 12:23:19 -   1.34
  +++ tomcat.nsi27 Apr 2004 22:41:50 -  1.35
  @@ -115,7 +115,7 @@
   
 CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Start Tomcat.lnk \
$2\bin\java.exe \
  - '-jar -Duser.dir=$INSTDIR $INSTDIR\bin\bootstrap.jar start' \
  + '-jar -Duser.dir=$INSTDIR 
-Djava.endorsed.dirs=$INSTDIR\common\endorsed $INSTDIR\bin\bootstrap.jar start' \
$INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
 CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Stop Tomcat.lnk \
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2003-10-06 Thread remm 
remm2003/10/06 05:23:19

  Modified:.tomcat.nsi
  Log:
  - Port patch.
  - Set proprietary JDK 1.4.2 flag.
  
  Revision  ChangesPath
  1.34  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- tomcat.nsi5 Jul 2002 07:44:28 -   1.33
  +++ tomcat.nsi6 Oct 2003 12:23:19 -   1.34
  @@ -70,7 +70,7 @@
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat 4.1 $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'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat 4.1 $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR 
-Djava.endorsed.dirs=$INSTDIR\common\endorsed -Dsun.io.useCanonCaches=false -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'
 
 ClearErrors
   
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-07-05 Thread remm 

remm2002/07/05 00:44:28

  Modified:.tomcat.nsi
  Log:
  - Small cosmetic change.
  
  Revision  ChangesPath
  1.33  +2 -3  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- tomcat.nsi13 Jun 2002 00:21:36 -  1.32
  +++ tomcat.nsi5 Jul 2002 07:44:28 -   1.33
  @@ -2,8 +2,7 @@
   ; Tomcat 4 script for Nullsoft Installer
   ; $Id$
   
  -Name apache-tomcat-4.1
  -Caption Apache Tomcat @VERSION@
  +Name Apache Tomcat @VERSION@
   OutFile tomcat4.exe
   CRCCheck on
   SetCompress force
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-06-10 Thread remm 

remm2002/06/10 17:27:56

  Modified:.tomcat.nsi
  Log:
  - Fix (non fatal) error message.
  
  Revision  ChangesPath
  1.31  +8 -6  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- tomcat.nsi18 Feb 2002 09:01:05 -  1.30
  +++ tomcat.nsi11 Jun 2002 00:27:56 -  1.31
  @@ -331,6 +331,7 @@
 File /r confinstall
   
 ; Build final server.xml
  +  Delete $INSTDIR\conf\server.xml
 FileOpen $R9 $INSTDIR\conf\server.xml w
   
 Push $TEMP\confinstall\server_1.xml
  @@ -341,9 +342,8 @@
   
 FileClose $R9
   
  -  CopyFiles $R9 $INSTDIR\conf 18
  -
 ; Build final tomcat-users.xml
  +  Delete $INSTDIR\conf\tomcat-users.xml
 FileOpen $R9 $INSTDIR\conf\tomcat-users.xml w
   
 Push $TEMP\confinstall\tomcat-users_1.xml
  @@ -354,8 +354,6 @@
   
 FileClose $R9
   
  -  CopyFiles $R9 $INSTDIR\conf 5
  -
 ; Creating a few shortcuts
 IfFileExists $SMPROGRAMS\Apache Tomcat 4.1 0 NoLinks
   
  @@ -389,11 +387,15 @@
   
 FileOpen $1 $0 r
   
  -  NoError:
  + NoError:
  +
 FileRead $1 $2
  +  IfErrors EOF 0
 FileWrite $R9 $2
   
 IfErrors 0 NoError
  +
  + EOF:
   
 FileClose $1
   
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-02-07 Thread remm 

remm02/02/07 12:52:06

  Modified:.tomcat.nsi
  Log:
  - If failed to find a JDK, mention that a JAVA_HOME environment variable
should be defined.
  
  Revision  ChangesPath
  1.29  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- tomcat.nsi1 Feb 2002 22:10:10 -   1.28
  +++ tomcat.nsi7 Feb 2002 20:52:06 -   1.29
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.28 2002/02/01 22:10:10 remm Exp $
  +; $Id: tomcat.nsi,v 1.29 2002/02/07 20:52:06 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -241,7 +241,7 @@
   
 IfErrors 0 NoAbort
   MessageBox MB_OK Couldn't find a Java Development Kit installed on this \
  -computer. Please download one from http://java.sun.com.;
  +computer. Please download one from http://java.sun.com. If there is already \ a JDK 
installed on this computer, set an environment variable JAVA_HOME to the \ pathname of 
the directory where it is installed.
   Abort
   
 NoAbort:
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-02-07 Thread remm 

remm02/02/07 12:52:26

  Modified:.Tag: tomcat_40_branch tomcat.nsi
  Log:
  - If failed to find a JDK, mention that a JAVA_HOME environment variable
should be defined.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.16.2.4  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16.2.3
  retrieving revision 1.16.2.4
  diff -u -r1.16.2.3 -r1.16.2.4
  --- tomcat.nsi19 Dec 2001 18:00:35 -  1.16.2.3
  +++ tomcat.nsi7 Feb 2002 20:52:26 -   1.16.2.4
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16.2.3 2001/12/19 18:00:35 remm Exp $
  +; $Id: tomcat.nsi,v 1.16.2.4 2002/02/07 20:52:26 remm Exp $
   
   Name apache-tomcat-4.0
   Caption Apache Tomcat 4.0
  @@ -245,7 +245,7 @@
   
 IfErrors 0 NoAbort
   MessageBox MB_OK Couldn't find a Java Development Kit installed on this \
  -computer. Please download one from http://java.sun.com.;
  +computer. Please download one from http://java.sun.com. If there is already \ a JDK 
installed on this computer, set an environment variable JAVA_HOME to the \ pathname of 
the directory where it is installed.
   Abort
   
 NoAbort:
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-02-01 Thread remm 

remm02/02/01 14:10:10

  Modified:.tomcat.nsi
  Log:
  - Update to use the same install directory and registry keys that the HTTPd uses.
  - At the end of the installation, the NT service will be started (if installed).
  - Before uninstalling, the NT service will be stopped (if installed).
  
  Revision  ChangesPath
  1.28  +47 -21jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- tomcat.nsi1 Feb 2002 01:12:26 -   1.27
  +++ tomcat.nsi1 Feb 2002 22:10:10 -   1.28
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.27 2002/02/01 01:12:26 remm Exp $
  +; $Id: tomcat.nsi,v 1.28 2002/02/01 22:10:10 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -30,8 +30,8 @@
   SetOverwrite on
   SetDateSave on
   
  -InstallDir $PROGRAMFILES\Apache Tomcat 4.1
  -InstallDirRegKey HKLM SOFTWARE\Apache\Apache Tomcat 4.1 
  +InstallDir $PROGRAMFILES\Apache Group\Tomcat 4.1
  +InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\4.1 
   
   Section Tomcat (required)
   
  @@ -41,6 +41,7 @@
 File tomcat.ico
 File LICENSE
 File /r bin
  +  Delete $INSTDIR\bin\tomcat.exe
 File /r common
 File /r shared
 File /r logs
  @@ -70,7 +71,7 @@
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR -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'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat 4.1 $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR -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'
 
 ClearErrors
   
  @@ -123,17 +124,6 @@
'-jar -Duser.dir=$INSTDIR $INSTDIR\bin\bootstrap.jar stop' \
$INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
   
  -  SetOutPath $SMPROGRAMS\Apache Tomcat 4.1\Configuration
  -
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Configuration\Edit Server 
Configuration.lnk \
  - notepad $INSTDIR\conf\server.xml
  -
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Configuration\Edit Webapp 
Defaults.lnk \
  - notepad $INSTDIR\conf\web.xml
  -
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Configuration\Edit Users.lnk \
  - notepad $INSTDIR\conf\tomcat-users.xml
  -
   SectionEnd
   
   SectionDivider  documentation and examples 
  @@ -192,7 +182,9 @@
   
 Call configure
   
  -  WriteRegStr HKLM SOFTWARE\Apache\Apache Tomcat 4.1  $INSTDIR
  +  Call startService
  +
  +  WriteRegStr HKLM SOFTWARE\Apache Group\Tomcat\4.1  $INSTDIR
 WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 4.1 \
  DisplayName Apache Tomcat 4.1 (remove only)
 WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 4.1 \
  @@ -369,9 +361,7 @@
   
 SetOutPath $SMPROGRAMS\Apache Tomcat 4.1
   
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\My Tomcat.lnk \
  - http://127.0.0.1:$R0;
  -  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Configuration\Tomcat 
Administration.lnk \
  +  CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Tomcat Administration.lnk \
http://127.0.0.1:$R0/admin;
   
NoLinks:
  @@ -412,6 +402,39 @@
   FunctionEnd
   
   
  +; =
  +; StartService Function
  +; =
  +;
  +; Start Tomcat NT Service
  +;
  +Function startService
  +
  +  IfFileExists $INSTDIR\bin\tomcat.exe 0 NoService
  +  ExecWait 'net start Apache Tomcat 4.1'
  +  Sleep 4000
  +
  + NoService:
  +
  +FunctionEnd
  +
  +
  +; =
  +; StopService Function
  +; =
  +;
  +; Stop Tomcat NT Service
  +;
  +Function un.stopService
  +
  +  IfFileExists $INSTDIR\bin\tomcat.exe 0 NoService
  +  ExecWait 'net stop Apache Tomcat 4.1'
  +  Sleep 2000
  +
  + NoService:
  +
  +FunctionEnd
  +
   
   UninstallText This will uninstall Apache Tomcat 4.1 from your system:
   
  @@ -420,6 +443,9 @@
   
 Delete $INSTDIR\uninst-tomcat4.exe
   
  +  ; Stopping NT service (if in use)
  +  Call un.stopService
  +
 ReadRegStr $1 HKCR .jsp 
 StrCmp $1 JSPFile 0 NoOwn ; only do this if we own it
   ReadRegStr $1 HKCR .jsp backup_val
  @@ -431,12 +457,12 @@
 DeleteRegValue HKCR .jsp backup_val
 NoOwn:
   
  -  ExecWait

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2002-01-31 Thread remm 

remm02/01/31 17:12:26

  Modified:.tomcat.nsi
  Log:
  - Attempt to support the IBM SDK in the installer, for setting up the NT service.
  - Untested (I'm not even sure the IBM JDK is compatible with JavaService).
  - Thanks to Henri Gomez for the info on the IBM JDK binary distribution.
  
  Revision  ChangesPath
  1.27  +12 -4 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- tomcat.nsi1 Feb 2002 00:14:54 -   1.26
  +++ tomcat.nsi1 Feb 2002 01:12:26 -   1.27
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.26 2002/02/01 00:14:54 remm Exp $
  +; $Id: tomcat.nsi,v 1.27 2002/02/01 01:12:26 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -270,11 +270,19 @@
   Function findJVMPath
   
 ReadEnvStr $1 JAVA_HOME
  -  IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
  -StrCpy $2 $1\jre\bin\hotspot\jvm.dll
  +  IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
  +StrCpy $2 $1\jre\bin\hotspot\jvm.dll
   Goto EndIfFileExists
 TryJDK14:
  -StrCpy $2 $1\jre\bin\server\jvm.dll
  +  IfFileExists $1\jre\bin\server\jvm.dll 0 TryClassic
  +StrCpy $2 $1\jre\bin\server\jvm.dll
  +Goto EndIfFileExists
  +  TryClassic:
  +  IfFileExists $1\jre\bin\classic\jvm.dll 0 JDKNotFound
  +StrCpy $2 $1\jre\bin\classic\jvm.dll
  +Goto EndIfFileExists
  +  JDKNotFound:
  +SetErrors
 EndIfFileExists:
   
 IfErrors 0 FoundJVMPath
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-12-25 Thread glenn 

glenn   01/12/25 17:23:49

  Modified:.tomcat.nsi
  Log:
  JVM Temporary Directory (java.io.tmpdir property) security patch
  
  
  The java.io.File.createTempFile() methods use the property
  java.io.tmpdir for the location of the directory where the JVM
  places temporary files.  If this property doesn't exist,
  /tmp or /var/tmp gets used on unix systems or c:\\temp on WIN32 systems.
  
  This default directory is the same directory that all applications
  can use for temporary files.  Sharing the same system temporary
  directory between Tomcat and other applications could be a security
  risk if sensitive data is stored there by other applications.
  
  If you run Tomcat with the SecurityManager enabled you would have to
  grant Tomcat a FilePermission with read, write, and delete for the
  temporary directory.
  
  This series of patches enables the use of a temporary directory
  located at $CATALINA_BASE/temp so that Tomcat's use of the temporary
  directory is isolated from the rest of the system.
  
  Revision  ChangesPath
  1.24  +3 -1  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- tomcat.nsi2001/12/19 17:53:33 1.23
  +++ tomcat.nsi2001/12/26 01:23:49 1.24
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.23 2001/12/19 17:53:33 remm Exp $
  +; $Id: tomcat.nsi,v 1.24 2001/12/26 01:23:49 glenn Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -46,6 +46,7 @@
 File /r logs
 File /r server
 File /r work
  +  File /r temp
 SetOutPath $INSTDIR\webapps
 File webapps\*.xml
 File /r webapps\ROOT
  @@ -335,6 +336,7 @@
 RMDir /r $INSTDIR\webapps\webdav
 RMDir $INSTDIR\webapps
 RMDir /r $INSTDIR\work
  +  RMDir /r $INSTDIR\temp
 RMDir /r $INSTDIR\src
 RMDir $INSTDIR
   
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-12-19 Thread remm 

remm01/12/19 09:53:33

  Modified:.tomcat.nsi
  Log:
  - Fix a bug where the uninstaller was deleted at the end of the installation
(because the way the uninstaller is generated has changed).
  
  Revision  ChangesPath
  1.23  +2 -6  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- tomcat.nsi2001/12/19 17:02:26 1.22
  +++ tomcat.nsi2001/12/19 17:53:33 1.23
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.22 2001/12/19 17:02:26 remm Exp $
  +; $Id: tomcat.nsi,v 1.23 2001/12/19 17:53:33 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -55,7 +55,7 @@
   
 CopyFiles $2\lib\tools.jar $INSTDIR\common\lib 4500
   
  -  WriteUninstaller uninst-tomcat4.exe
  +  WriteUninstaller $INSTDIR\uninst-tomcat4.exe
   
   SectionEnd
   
  @@ -187,10 +187,6 @@
 File /r conf
   
 SetOverwrite on
  -
  -  ; since the installer is now created last (in 1.2+), this makes sure 
  -  ; that any old installer that is readonly is overwritten.
  -  Delete $INSTDIR\uninst-tomcat4.exe 
   
 WriteRegStr HKLM SOFTWARE\Apache\Apache Tomcat 4.1  $INSTDIR
 WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 4.1 \
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-11-21 Thread remm 

remm01/11/21 13:04:52

  Modified:.tomcat.nsi
  Log:
  - Update the install script after figuring out out to handle parameters in
functions in NSIS (use the stack, assembly style ...). Using functions avoids
code duplication, and will maybe allow enhancing further the env detection.
  - Add findJavaPath function: returns the JDK path.
  - Add findJVMPath function: returns the full path to the JVM DLL.
  - NSIS 1.67 recommended.
  
  Revision  ChangesPath
  1.21  +80 -47jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- tomcat.nsi2001/11/17 22:32:30 1.20
  +++ tomcat.nsi2001/11/21 21:04:52 1.21
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.20 2001/11/17 22:32:30 remm Exp $
  +; $Id: tomcat.nsi,v 1.21 2001/11/21 21:04:52 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -11,6 +11,7 @@
   
   BGGradient 00 80 FF
   InstallColors FF8080 00
  +InstProgressFlags smooth colored
   
   Icon main.ico
   UninstallIcon uninst.ico 
  @@ -32,7 +33,7 @@
   InstallDir $PROGRAMFILES\Apache Tomcat 4.1
   InstallDirRegKey HKLM SOFTWARE\Apache\Apache Tomcat 4.1 
   
  -Section Tomcat 4.1 (required)
  +Section Tomcat (required)
   
 SectionIn 1 2 3
   
  @@ -49,17 +50,9 @@
 File webapps\*.xml
 File /r webapps\ROOT
   
  -  ReadEnvStr $2 JAVA_HOME
  +  Call findJavaPath
  +  Pop $2
   
  -  IfErrors 0 FoundJDK
  -
  -  ClearErrors
  -
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  -
  -  FoundJDK:
  -
 CopyFiles $2\lib\tools.jar $INSTDIR\common\lib 4500
   
   SectionEnd
  @@ -67,24 +60,10 @@
   Section NT Service (NT/2k/XP only)
   
 SectionIn 3
  -
  -  ReadEnvStr $1 JAVA_HOME
  -  IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
  -StrCpy $2 $1\jre\bin\hotspot\jvm.dll
  -Goto EndIfFileExists
  -  TryJDK14:
  -StrCpy $2 $1\jre\bin\server\jvm.dll
  -  EndIfFileExists:
  -
  -  IfErrors 0 FoundJDK
   
  -  ClearErrors
  +  Call findJVMPath
  +  Pop $2
   
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 RuntimeLib
  -  
  -  FoundJDK:
  -  
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  @@ -113,21 +92,13 @@
   
   SectionEnd
   
  -Section Tomcat 4.1 Start Menu Group
  +Section Tomcat Start Menu Group
   
 SectionIn 1 2 3
   
  -  ReadEnvStr $2 JAVA_HOME
  -
  -  IfErrors 0 FoundJDK
  -
  -  ClearErrors
  +  Call findJavaPath
  +  Pop $2
   
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 JavaHome
  -
  -  FoundJDK:
  -
 SetOutPath $SMPROGRAMS\Apache Tomcat 4.1
   
 CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Tomcat Home Page.lnk \
  @@ -162,9 +133,9 @@
   
   SectionEnd
   
  -SectionDivider
  +SectionDivider  documentation and examples 
   
  -Section Tomcat 4.1 Documentation
  +Section Tomcat Documentation
   
 SectionIn 1 3
 SetOutPath $INSTDIR\webapps
  @@ -195,9 +166,9 @@
   
   SectionEnd
   
  -SectionDivider
  +SectionDivider  developer resources 
   
  -Section Tomcat 4.1 Source Code
  +Section Tomcat Source Code
   
 SectionIn 3
 SetOutPath $INSTDIR
  @@ -235,8 +206,32 @@
   
 ClearErrors
   
  -  Call doUpdate
  +  Call findJavaPath
  +  Pop $1
  +  MessageBox MB_OK Using Java Development Kit found in $1
   
  +FunctionEnd
  +
  +
  +Function .onInstSuccess
  +
  +  ExecShell open '$SMPROGRAMS\Apache Tomcat 4.1'
  +
  +FunctionEnd
  +
  +
  +; =
  +; FindJavaPath Function
  +; =
  +;
  +; Find the JAVA_HOME used on the system, and put the result on the top of the
  +; stack
  +; Will exit if the path cannot be determined
  +;
  +Function findJavaPath
  +
  +  ClearErrors
  +
 ReadEnvStr $1 JAVA_HOME
   
 IfErrors 0 FoundJDK
  @@ -256,18 +251,56 @@
   Abort
   
 NoAbort:
  -MessageBox MB_OK Using Java Development Kit found in $1
   
  +  ; Put the result in the stack
  +  Push $1
  +
   FunctionEnd
   
   
  -Function .onInstSuccess
  +; 
  +; FindJVMPath Function
  +; 
  +;
  +; Find the full JVM path, and put the result on top of the stack
  +; Will exit if the path cannot be determined
  +;
  +Function findJVMPath
   
  -  ExecShell open '$SMPROGRAMS\Apache Tomcat 4.1'
  +  ReadEnvStr $1 JAVA_HOME
  +  IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
  +StrCpy $2 $1\jre\bin\hotspot\jvm.dll
  +Goto EndIfFileExists
  +  TryJDK14:
  +StrCpy

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-11-17 Thread remm 

remm01/11/17 14:32:30

  Modified:.tomcat.nsi
  Log:
  - Justin Frankel (the author of WinAMP as well of NSIS) recently added
environment variable support to NSIS, so it's now possible to use
the value of JAVA_HOME.
  - If JAVA_HOME isn't found, the installer will check the registry.
  - Note: There's still a hack to make the service installation work,
as JavaService needs the full path to the JVM DLL to be specified.
The hack works with JDK 1.3 and 1.4 (and possibly other versions).
  - With JDK 1.4, the server VM is used (it starts up slower, but should be faster
overall). Since the system service would be mostly used in a pure server
deployment, I think it's reasonable.
  - This patch will be ported to the 4.0 branch, as the lack of support for JAVA_HOME
has caused a lot of bugs reports and questions in tomcat-user (unfortunately,
I couldn't fix it until now).
  
  Revision  ChangesPath
  1.20  +42 -4 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- tomcat.nsi2001/11/06 08:44:34 1.19
  +++ tomcat.nsi2001/11/17 22:32:30 1.20
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.19 2001/11/06 08:44:34 remm Exp $
  +; $Id: tomcat.nsi,v 1.20 2001/11/17 22:32:30 remm Exp $
   
   Name apache-tomcat-4.1
   Caption Apache Tomcat 4.1
  @@ -49,9 +49,17 @@
 File webapps\*.xml
 File /r webapps\ROOT
   
  +  ReadEnvStr $2 JAVA_HOME
  +
  +  IfErrors 0 FoundJDK
  +
  +  ClearErrors
  +
 ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
 ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
   
  +  FoundJDK:
  +
 CopyFiles $2\lib\tools.jar $INSTDIR\common\lib 4500
   
   SectionEnd
  @@ -60,9 +68,23 @@
   
 SectionIn 3
   
  +  ReadEnvStr $1 JAVA_HOME
  +  IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14
  +StrCpy $2 $1\jre\bin\hotspot\jvm.dll
  +Goto EndIfFileExists
  +  TryJDK14:
  +StrCpy $2 $1\jre\bin\server\jvm.dll
  +  EndIfFileExists:
  +
  +  IfErrors 0 FoundJDK
  +
  +  ClearErrors
  +
 ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
 ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 RuntimeLib
 
  +  FoundJDK:
  +  
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  @@ -95,9 +117,17 @@
   
 SectionIn 1 2 3
   
  +  ReadEnvStr $2 JAVA_HOME
  +
  +  IfErrors 0 FoundJDK
  +
  +  ClearErrors
  +
 ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
 ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 JavaHome
   
  +  FoundJDK:
  +
 SetOutPath $SMPROGRAMS\Apache Tomcat 4.1
   
 CreateShortCut $SMPROGRAMS\Apache Tomcat 4.1\Tomcat Home Page.lnk \
  @@ -207,18 +237,26 @@
   
 Call doUpdate
   
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  +  ReadEnvStr $1 JAVA_HOME
  +
  +  IfErrors 0 FoundJDK
  +
  +  ClearErrors
  +
  +  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  +  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit\$2 JavaHome
 ReadRegStr $3 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
 ReadRegStr $4 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$3 RuntimeLib
   
  +  FoundJDK:
  +
 IfErrors 0 NoAbort
   MessageBox MB_OK Couldn't find a Java Development Kit installed on this \
   computer. Please download one from http://java.sun.com.;
   Abort
   
 NoAbort:
  -MessageBox MB_OK Using Java Development Kit version $1 found in $2$\r$\nUsing 
Java Runtime Environment version $3 found in $4
  +MessageBox MB_OK Using Java Development Kit found in $1
   
   FunctionEnd
   
  
  
  

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

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-10-04 Thread remm 

remm01/10/04 17:26:01

  Modified:.Tag: tomcat_40_branch tomcat.nsi
  Log:
  - Fix merge mistake with the installer script ('shared' doesn't exist).
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.16.2.2  +7 -4  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -u -r1.16.2.1 -r1.16.2.2
  --- tomcat.nsi2001/10/04 19:24:45 1.16.2.1
  +++ tomcat.nsi2001/10/05 00:26:01 1.16.2.2
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16.2.1 2001/10/04 19:24:45 remm Exp $
  +; $Id: tomcat.nsi,v 1.16.2.2 2001/10/05 00:26:01 remm Exp $
   
   Name apache-tomcat-4.0
   Caption Apache Tomcat 4.0
  @@ -40,8 +40,9 @@
 File tomcat.ico
 File LICENSE
 File /r bin
  +  File /r classes
 File /r common
  -  File /r shared
  +  File /r lib
 File /r logs
 File /r server
 File /r work
  @@ -248,7 +249,8 @@
 File LICENSE
 File /r bin
 File /r common
  -  File /r shared
  +  File /r lib
  +  File /r classes
 File /r logs
 File /r server
 File /r work
  @@ -295,9 +297,10 @@
 Delete $INSTDIR\tomcat.ico
 Delete $INSTDIR\LICENSE
 RMDir /r $INSTDIR\bin
  +  RMDir /r $INSTDIR\classes
 RMDir /r $INSTDIR\common
 Delete $INSTDIR\conf\*.dtd
  -  RMDir /r $INSTDIR\shared
  +  RMDir /r $INSTDIR\lib
 RMDir $INSTDIR\logs
 RMDir /r $INSTDIR\server
 RMDir /r $INSTDIR\webapps\manager

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-10-02 Thread remm 

remm01/10/02 01:10:34

  Modified:.tomcat.nsi
  Log:
  - Update the install script after removing the Jasper directory from the
distribution.
  
  Revision  ChangesPath
  1.17  +1 -4  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- tomcat.nsi2001/09/11 23:40:38 1.16
  +++ tomcat.nsi2001/10/02 08:10:33 1.17
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16 2001/09/11 23:40:38 remm Exp $
  +; $Id: tomcat.nsi,v 1.17 2001/10/02 08:10:33 remm Exp $
   
   Name apache-tomcat-4.0
   Caption Apache Tomcat 4.0
  @@ -41,7 +41,6 @@
 File LICENSE
 File /r bin
 File /r common
  -  File /r jasper
 File /r lib
 File /r logs
 File /r server
  @@ -249,7 +248,6 @@
 File LICENSE
 File /r bin
 File /r common
  -  File /r jasper
 File /r lib
 File /r logs
 File /r server
  @@ -299,7 +297,6 @@
 RMDir /r $INSTDIR\bin
 RMDir /r $INSTDIR\common
 Delete $INSTDIR\conf\*.dtd
  -  RMDir /r $INSTDIR\jasper
 RMDir /r $INSTDIR\lib
 RMDir $INSTDIR\logs
 RMDir /r $INSTDIR\server

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-09-11 Thread remm 

remm01/09/11 16:40:38

  Modified:.tomcat.nsi
  Log:
  - Back to using catalina.home (it's more consistent now).
  
  Revision  ChangesPath
  1.16  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- tomcat.nsi2001/09/10 05:21:34 1.15
  +++ tomcat.nsi2001/09/11 23:40:38 1.16
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.15 2001/09/10 05:21:34 remm Exp $
  +; $Id: tomcat.nsi,v 1.16 2001/09/11 23:40:38 remm Exp $
   
   Name apache-tomcat-4.0
   Caption Apache Tomcat 4.0
  @@ -67,7 +67,7 @@
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Duser.dir=$INSTDIR -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'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR -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'
 
 ClearErrors

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-09-06 Thread remm 

remm01/09/06 20:50:03

  Modified:.tomcat.nsi
  Log:
  - Fixes problems with JDK 1.4 installing the NT service.
  - Also fix a bug where the service was incorrectly installed if the path to the JDK
contained a path.
  - The installer now uses the JRE for everything, but still needs to copy tools.jar
from the JDK.
  - Fixes bug 3445, reported by Dylan Schell dylans at xs4all.nl.
  
  Revision  ChangesPath
  1.14  +6 -6  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- tomcat.nsi2001/08/29 01:28:50 1.13
  +++ tomcat.nsi2001/09/07 03:50:03 1.14
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.13 2001/08/29 01:28:50 remm Exp $
  +; $Id: tomcat.nsi,v 1.14 2001/09/07 03:50:03 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -63,13 +63,13 @@
   
 SectionIn 3
   
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  +  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
  +  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 RuntimeLib
 
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path=$INSTDIR\bin\bootstrap.jar 
-Duser.dir=$INSTDIR -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'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat $2 
-Djava.class.path=$INSTDIR\bin\bootstrap.jar -Duser.dir=$INSTDIR -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'
 
 ClearErrors
   
  @@ -98,8 +98,8 @@
   
 SectionIn 1 2 3
   
  -  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  -  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  +  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion
  +  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 JavaHome
   
 SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-08-28 Thread remm 

remm01/08/28 18:28:50

  Modified:.tomcat.nsi
  Log:
  - Use user.dir property to specify the Catalina path, instead of catalina.home.
  
  Revision  ChangesPath
  1.13  +4 -4  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- tomcat.nsi2001/07/18 23:14:03 1.12
  +++ tomcat.nsi2001/08/29 01:28:50 1.13
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.12 2001/07/18 23:14:03 remm Exp $
  +; $Id: tomcat.nsi,v 1.13 2001/08/29 01:28:50 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -69,7 +69,7 @@
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path=$INSTDIR\bin\bootstrap.jar 
-Dcatalina.home=$INSTDIR -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'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path=$INSTDIR\bin\bootstrap.jar 
-Duser.dir=$INSTDIR -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'
 
 ClearErrors
   
  @@ -114,12 +114,12 @@
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk \
$2\bin\java.exe \
  - '-jar -Dcatalina.home=$INSTDIR $INSTDIR\bin\bootstrap.jar 
start' \
  + '-jar -Duser.dir=$INSTDIR $INSTDIR\bin\bootstrap.jar start' \
$INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk \
$2\bin\java.exe \
  - '-jar -Dcatalina.home=$INSTDIR $INSTDIR\bin\bootstrap.jar 
stop' \
  + '-jar -Duser.dir=$INSTDIR $INSTDIR\bin\bootstrap.jar stop' \
$INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
   
 SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-18 Thread remm 

remm01/07/18 15:49:02

  Modified:.tomcat.nsi
  Log:
  - Use BootstrapService class instead of Bootstrap.
  
  Revision  ChangesPath
  1.11  +3 -3  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tomcat.nsi2001/07/18 18:32:49 1.10
  +++ tomcat.nsi2001/07/18 22:49:02 1.11
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.10 2001/07/18 18:32:49 remm Exp $
  +; $Id: tomcat.nsi,v 1.11 2001/07/18 22:49:02 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -55,7 +55,7 @@
 ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
 ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
   
  -  CopyFiles $2\lib\tools.jar $INSTDIR\common\lib 5
  +  CopyFiles $2\lib\tools.jar $INSTDIR\common\lib 4500
   
   SectionEnd
   
  @@ -69,7 +69,7 @@
 SetOutPath $INSTDIR\bin
 File /oname=tomcat.exe bin\tomcat.exe
 
  -  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path=$INSTDIR\bin\bootstrap.jar 
-Dcatalina.home=$INSTDIR -start org.apache.catalina.startup.Bootstrap -params start 
-stop org.apache.catalina.startup.Bootstrap -params stop -out 
$INSTDIR\logs\stdout.log -err $INSTDIR\logs\stderr.log'
  +  ExecWait '$INSTDIR\bin\tomcat.exe -install Jakarta Tomcat 
$2\jre\bin\hotspot\jvm.dll -Djava.class.path=$INSTDIR\bin\bootstrap.jar 
-Dcatalina.home=$INSTDIR -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'
 
 ClearErrors

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-18 Thread remm 

remm01/07/18 16:14:04

  Modified:.tomcat.nsi
  Log:
  - Don't install the system service by default.
  
  Revision  ChangesPath
  1.12  +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- tomcat.nsi2001/07/18 22:49:02 1.11
  +++ tomcat.nsi2001/07/18 23:14:03 1.12
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.11 2001/07/18 22:49:02 remm Exp $
  +; $Id: tomcat.nsi,v 1.12 2001/07/18 23:14:03 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -61,7 +61,7 @@
   
   Section NT Service (NT/2k/XP only)
   
  -  SectionIn 1 2 3
  +  SectionIn 3
   
 ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
 ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-16 Thread remm 

remm01/07/16 00:50:33

  Modified:.tomcat.nsi
  Log:
  - Forgot '-jar'.
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- tomcat.nsi2001/07/16 06:56:35 1.7
  +++ tomcat.nsi2001/07/16 07:50:33 1.8
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.7 2001/07/16 06:56:35 remm Exp $
  +; $Id: tomcat.nsi,v 1.8 2001/07/16 07:50:33 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -97,7 +97,7 @@
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk \
$2\bin\java.exe \
  - '-Dcatalina.home=$INSTDIR $INSTDIR\bin\bootstrap.jar stop' \
  + '-jar -Dcatalina.home=$INSTDIR $INSTDIR\bin\bootstrap.jar 
stop' \
$INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
   
 SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-15 Thread remm 

remm01/07/15 00:43:27

  Modified:.tomcat.nsi
  Log:
  - Never overwrite the configuration files when installing. That will allow fast
installation of a new build by running the installer and selecting a minimum
installation (upgrading a build with Windows was really annoying to do
by hand before).
  - Add links to edit the configuration files (with the notepad at the moment).
  - Don't delete the configuration files by default when uninstalling.
  - Add new alternate server configuration used with the minimum installation.
  
  Revision  ChangesPath
  1.4   +45 -24jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tomcat.nsi2001/07/14 06:47:12 1.3
  +++ tomcat.nsi2001/07/15 07:43:27 1.4
  @@ -25,7 +25,7 @@
   SetDateSave on
   
   InstallDir $PROGRAMFILES\Jakarta Tomcat 4.0
  -InstallDirRegKey HKLM SOFTWARE\Apache\Jakarta\Tomcat 4.0 
  +InstallDirRegKey HKLM SOFTWARE\Apache\Jakarta Tomcat 4.0 
   
   Section Tomcat 4.0 (required)
   
  @@ -36,7 +36,6 @@
 File README.txt
 File /r bin
 File /r common
  -  File /r conf
 File /r jasper
 File /r lib
 File /r logs
  @@ -73,27 +72,38 @@
   
 SectionIn 1 2 3
   
  -  SetOutPath $SMPROGRAMS\Tomcat 4.0
  +  SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat Home Page.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Tomcat Home Page.lnk \
http://jakarta.apache.org/tomcat;
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Uninstall Tomcat 4.0.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Uninstall Tomcat 4.0.lnk \
$INSTDIR\uninst-tomcat4.exe
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Program Directory.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Tomcat 4.0 Program Directory.lnk \
$INSTDIR
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Start Tomcat.lnk \
  - %JAVA_HOME%\bin\java \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk \
  + %JAVA_HOME%\bin\java.exe \
'-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap start' \
$INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Stop Tomcat.lnk \
  - %JAVA_HOME%\bin\java \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk \
  + %JAVA_HOME%\bin\java.exe \
'-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap stop' \
$INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
   
  +  SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration
  +
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration\Edit Server 
Configuration.lnk \
  + notepad $INSTDIR\conf\server.xml
  +
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration\Edit Webapp 
Defaults.lnk \
  + notepad $INSTDIR\conf\web.xml
  +
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration\Edit Users.lnk \
  + notepad $INSTDIR\conf\tomcat-users.xml
  +
   SectionEnd
   
   SectionDivider
  @@ -104,20 +114,20 @@
 SetOutPath $INSTDIR\webapps
 File /r webapps\ROOT
   
  -  IfFileExists $SMPROGRAMS\Tomcat 4.0 0 NoLinks
  +  IfFileExists $SMPROGRAMS\Jakarta Tomcat 4.0 0 NoLinks
   
  -  SetOutPath $SMPROGRAMS\Tomcat 4.0\Documentation
  +  SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0\Documentation
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Tomcat Documentation.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Documentation\Tomcat 
Documentation.lnk \
$INSTDIR\webapps\ROOT\docs\index.html
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Catalina Javadoc.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Documentation\Catalina 
Javadoc.lnk \
$INSTDIR\webapps\ROOT\catalina-javadoc\index.html
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Jasper Javadoc.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Documentation\Jasper Javadoc.lnk \
$INSTDIR\webapps\ROOT\jasper-javadoc\index.html
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Servlet API Javadoc.lnk \
  +  CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Documentation\Servlet API 
Javadoc.lnk \
$INSTDIR\webapps\ROOT\servletapi-javadoc\index.html
   
NoLinks:
  @@ -127,6 +137,11 @@
   Section Example Web Applications
   
 SectionIn 1 3
  +
  +  SetOverwrite off
  +  SetOutPath $INSTDIR\conf
  +  File conf\server.xml
  +

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-15 Thread remm 

remm01/07/15 19:47:02

  Modified:.tomcat.nsi
  Log:
  - Find the path to JavaHome in the registry instead of using an environment
variable.
  - Will complain if no JDK is found.
  
  Revision  ChangesPath
  1.6   +19 -9 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tomcat.nsi2001/07/15 19:39:06 1.5
  +++ tomcat.nsi2001/07/16 02:47:02 1.6
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.5 2001/07/15 19:39:06 remm Exp $
  +; $Id: tomcat.nsi,v 1.6 2001/07/16 02:47:02 remm Exp $
   
   Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
  @@ -77,6 +77,9 @@
   
 SectionIn 1 2 3
   
  +  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  +  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  +
 SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Tomcat Home Page.lnk \
  @@ -89,13 +92,13 @@
$INSTDIR
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk \
  - %JAVA_HOME%\bin\java.exe \
  - '-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap start' \
  + $2\bin\java.exe \
  + '-cp $INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap start' \
$INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
   
 CreateShortCut $SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk \
  - %JAVA_HOME%\bin\java.exe \
  - '-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap stop' \
  + $2\bin\java.exe \
  + '-cp $INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap stop' \
$INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
   
 SetOutPath $SMPROGRAMS\Jakarta Tomcat 4.0\Configuration
  @@ -189,12 +192,19 @@
   SectionEnd
   
   Function .onInit
  +
  +  ClearErrors
  +
  +  ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Development Kit CurrentVersion
  +  ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Development Kit\$1 JavaHome
  +
  +  IfErrors 0 NoAbort
  +MessageBox MB_OK Couldn't find a Java Development Kit installed on this \
  +computer. Please download one from http://java.sun.com.;
  +Abort
   
  -MessageBox MB_YESNO|MB_ICONEXCLAMATION If not done already, you need to set 
the JAVA_HOME \
  -environment variable and have it point to your JDK installation directory. \
  -Answer No to quit the installer if your environment is not properly set. IDYES 
NoAbort
  -  Abort ; causes installer to quit.
 NoAbort:
  +MessageBox MB_OK Using Java Development Kit version $1 found in $2
   
   FunctionEnd

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-14 Thread remm 

remm01/07/13 23:47:12

  Modified:.tomcat.nsi
  Log:
  - Add some links for documentation only if doncumentation is installed.
  - Fix minor issues with desinstallation.
  
  Revision  ChangesPath
  1.3   +25 -9 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tomcat.nsi2001/07/14 03:03:39 1.2
  +++ tomcat.nsi2001/07/14 06:47:12 1.3
  @@ -81,9 +81,6 @@
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Uninstall Tomcat 4.0.lnk \
$INSTDIR\uninst-tomcat4.exe
   
  -  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Documentation.lnk \
  - http://jakarta.apache.org/tomcat/tomcat-4.0-doc/index.html;
  -
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Program Directory.lnk \
$INSTDIR
   
  @@ -107,6 +104,24 @@
 SetOutPath $INSTDIR\webapps
 File /r webapps\ROOT
   
  +  IfFileExists $SMPROGRAMS\Tomcat 4.0 0 NoLinks
  +
  +  SetOutPath $SMPROGRAMS\Tomcat 4.0\Documentation
  +
  +  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Tomcat Documentation.lnk \
  + $INSTDIR\webapps\ROOT\docs\index.html
  +
  +  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Catalina Javadoc.lnk \
  + $INSTDIR\webapps\ROOT\catalina-javadoc\index.html
  +
  +  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Jasper Javadoc.lnk \
  + $INSTDIR\webapps\ROOT\jasper-javadoc\index.html
  +
  +  CreateShortCut $SMPROGRAMS\Tomcat 4.0\Documentation\Servlet API Javadoc.lnk \
  + $INSTDIR\webapps\ROOT\servletapi-javadoc\index.html
  +
  + NoLinks:
  +
   SectionEnd
   
   Section Example Web Applications
  @@ -166,6 +181,8 @@
   
   Section Uninstall
   
  +  Delete $INSTDIR\uninst-tomcat4.exe
  +
 ReadRegStr $1 HKCR .jsp 
 StrCmp $1 JSPFile 0 NoOwn ; only do this if we own it
   ReadRegStr $1 HKCR .jsp backup_val
  @@ -180,8 +197,7 @@
 DeleteRegKey HKCR JSPFile
 DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomcat 4.0
 DeleteRegKey HKLM SOFTWARE\Apache\Jakarta\Tomcat 4.0
  -  Delete $SMPROGRAMS\Tomcat 4.0\*.lnk
  -  RMDir $SMPROGRAMS\Tomcat 4.0
  +  RMDir /r $SMPROGRAMS\Tomcat 4.0
 Delete $INSTDIR\tomcat.ico
 Delete $INSTDIR\LICENSE
 Delete $INSTDIR\README.txt
  @@ -202,13 +218,13 @@
 RMDir $INSTDIR
   
 ; if $INSTDIR was removed, skip these next ones
  -  IfFileExists $INSTDIR 0 Removed 
  +  IfFileExists $INSTDIR 0 Removed 
   MessageBox MB_YESNO|MB_ICONQUESTION \
 Remove all files in your Tomcat 4.0 directory? (If you have anything\
you created that you want to keep, click No) IDNO Removed
  -Delete $INSTDIR\*.* ; this would be skipped if the user hits no
  -RMDir /r $INSTDIR
  -IfFileExists $INSTDIR 0 Removed 
  +Delete $INSTDIR\*.* ; this would be skipped if the user hits no
  +RMDir /r $INSTDIR
  +IfFileExists $INSTDIR 0 Removed 
 MessageBox MB_OK|MB_ICONEXCLAMATION \
Note: $INSTDIR could not be removed.
 Removed:

cvs commit: jakarta-tomcat-4.0 tomcat.nsi tomcat.ico build.xml

2001-07-13 Thread remm 

remm01/07/13 16:15:28

  Modified:.build.xml
  Added:   .tomcat.nsi tomcat.ico
  Log:
  - Add an experimental installer based on Nullsoft Installer. I just
started toying with it a couple hours ago, but it's so easy to use I was able
to generate an install script for Tomcat in no time.
  - It's Windows-only, sorry. I like native installers a lot better. The main advantage
of using Nullsoft's is that :
- It's free (open source)
- It's easy to use
- It's small and fast
  - The installer will only be able to set CATALINA_HOME under Win2k or WinXP.
Under older versions of Windows, you may have to set it manually. You need
to log off and back on before you can use Tomcat 4.0.
  - The uninstaller won't remove the CATALINA_HOME env variable it creates
(attempting to do it wiped out all my user env variables on my setup, so
I removed it until I figure out how to do it right).
  - I'll upload (if I have enough karma) a generated installer to the
Tomcat 4 nightly directory, so that people can easily try it (and complain :))
  - Comments are welcome :)
  - Download Nullsoft Installer (only needed to generate the installer) at
http://www.winamp.com/nsdn/superpimp
  - Thanks to Henri for suggesting we should have a look at it.
  
  Revision  ChangesPath
  1.24  +13 -0 jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml 2001/05/22 01:59:04 1.23
  +++ build.xml 2001/07/13 23:15:28 1.24
  @@ -162,6 +162,19 @@
 /target
   
   
  +  !-- = DIST: Create Windows Installer === --
  +  target name=installer depends=dist
  +echo message=Builds a Windows installer based on Nullsoft Installer/
  +echo message=The target requires Nullsoft Installer to be in your PATH/
  +copy file=tomcat.ico tofile=${tomcat.dist}/tomcat.ico/
  +copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi/
  +copy file=README.txt tofile=${tomcat.dist}/README.txt/
  +exec dir=${tomcat.dist} executable=makensis.exe
  +  arg value=tomcat.nsi/
  +/exec
  +  /target
  +
  +
 !-- == DIST: Clean Directory === --
 target name=dist-clean
   delete dir=${tomcat.dist}/
  
  
  
  1.1  jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  
  ; Tomcat 4 script for Nullsoft Installer
  
  !ifdef NO_COMPRESSION
  SetCompress off
  SetDatablockOptimize off
  !endif
  
  !ifdef NO_CRC
  CRCCheck off
  !endif
  
  Name NSIS
  Caption Jakarta Tomcat 4.0
  OutFile tomcat4.exe
  
  #BGGradient 00 80 FF
  #InstallColors FF8080 00
  
  LicenseText You must read the following license before installing:
  LicenseData LICENSE
  ComponentText This will install the Jakarta Tomcat 4.0 servlet container on your 
computer:
  InstType Normal
  InstType Full (w/ Source Code)
  AutoCloseWindow false
  ShowInstDetails show
  DirText Please select a location to install Tomcat 4.0 (or use the default):
  SetOverwrite on
  SetDateSave on
  !ifdef HAVE_UPX
!packhdr tmp.dat upx\upx --best --compress-icons=1 tmp.dat
  !endif
  
  InstallDir $PROGRAMFILES\Jakarta Tomcat 4.0
  InstallDirRegKey HKLM SOFTWARE\Apache\Jakarta\Tomcat 4.0 
  
  Section Tomcat 4.0 (required)
SectionIn 1 2
SetOutPath $INSTDIR
File tomcat.ico
File LICENSE
File README.txt
File /r bin
File /r common
File /r conf
File /r jasper
File /r lib
File /r logs
File /r server
File /r webapps
File /r work
  SectionEnd
  
  Section JSP Development Shell Extensions
SectionIn 1 2
  
; back up old value of .nsi
ReadRegStr $1 HKCR .jsp 
StrCmp $1  Label1
  StrCmp $1 JSPFile Label1
  WriteRegStr HKCR .jsp backup_val $1
  Label1:
  
WriteRegStr HKCR .jsp  JSPFile
WriteRegStr HKCR JSPFile  Java Server Pages source
WriteRegStr HKCR JSPFile\shell  open
WriteRegStr HKCR JSPFile\DefaultIcon  $INSTDIR\tomcat.ico
WriteRegStr HKCR JSPFile\shell\open\command  'notepad.exe %1'
WriteRegStr HKCR JSPFile\shell\compile  Compile JSP
WriteRegStr HKCR JSPFile\shell\compile\command  '$INSTDIR\bin\jspc.bat %1'
  SectionEnd
  
  Section Tomcat 4.0 Start Menu Group
SectionIn 1 2
SetOutPath $SMPROGRAMS\Tomcat 4.0
CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat Home Page.lnk \
   http://jakarta.apache.org/tomcat;
CreateShortCut $SMPROGRAMS\Tomcat 4.0\Uninstall Tomcat 4.0.lnk \
   $INSTDIR\uninst-tomcat4.exe
CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Documentation.lnk \
   http://jakarta.apache.org/tomcat/tomcat-4.0-doc/index.html;
CreateShortCut

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

2001-07-13 Thread remm 

remm01/07/13 20:03:40

  Modified:.tomcat.nsi
  Log:
  - Plenty of fixes
  - Don't try to modify the env variables in the registry
  - The shortcuts should now run with Win9x (since they don't rely anymore on
CATALINA_HOME being set)
  - Add a warning dialog explaining that the JAVA_HOME env variable must be set
  - Added additional categories (docs, examples)
  - NOTE : The default installation won't work at the moment unless Catalina
config is edited to remove references to the examples webapp
  - Minimum install is 1.6M
  - Desinstallation works :)
  
  Revision  ChangesPath
  1.2   +90 -52jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tomcat.nsi2001/07/13 23:15:28 1.1
  +++ tomcat.nsi2001/07/14 03:03:39 1.2
  @@ -1,41 +1,35 @@
   
   ; Tomcat 4 script for Nullsoft Installer
   
  -!ifdef NO_COMPRESSION
  -SetCompress off
  -SetDatablockOptimize off
  -!endif
  -
  -!ifdef NO_CRC
  -CRCCheck off
  -!endif
  -
  -Name NSIS
  +Name jakarta-tomcat-4.0
   Caption Jakarta Tomcat 4.0
   OutFile tomcat4.exe
  -
  -#BGGradient 00 80 FF
  -#InstallColors FF8080 00
  +CRCCheck on
  +SetCompress force
  +SetDatablockOptimize on
  +
  +BGGradient 00 80 FF
  +InstallColors FF8080 00
  +Icon tomcat.ico
   
   LicenseText You must read the following license before installing:
   LicenseData LICENSE
   ComponentText This will install the Jakarta Tomcat 4.0 servlet container on your 
computer:
   InstType Normal
  +InstType Minimum
   InstType Full (w/ Source Code)
   AutoCloseWindow false
   ShowInstDetails show
   DirText Please select a location to install Tomcat 4.0 (or use the default):
   SetOverwrite on
   SetDateSave on
  -!ifdef HAVE_UPX
  -  !packhdr tmp.dat upx\upx --best --compress-icons=1 tmp.dat
  -!endif
   
   InstallDir $PROGRAMFILES\Jakarta Tomcat 4.0
   InstallDirRegKey HKLM SOFTWARE\Apache\Jakarta\Tomcat 4.0 
   
   Section Tomcat 4.0 (required)
  -  SectionIn 1 2
  +
  +  SectionIn 1 2 3
 SetOutPath $INSTDIR
 File tomcat.ico
 File LICENSE
  @@ -47,58 +41,95 @@
 File /r lib
 File /r logs
 File /r server
  -  File /r webapps
 File /r work
  +  SetOutPath $INSTDIR\webapps
  +  File /r webapps\manager
  +  SetOutPath $INSTDIR\webapps\ROOT
  +  File /r webapps\ROOT\WEB-INF
  +  File webapps\ROOT\*.*
  +
   SectionEnd
   
   Section JSP Development Shell Extensions
  -  SectionIn 1 2
   
  -  ; back up old value of .nsi
  +  SectionIn 1 2 3
  +  ; back up old value of .jsp
 ReadRegStr $1 HKCR .jsp 
 StrCmp $1  Label1
   StrCmp $1 JSPFile Label1
   WriteRegStr HKCR .jsp backup_val $1
  +
   Label1:
   
 WriteRegStr HKCR .jsp  JSPFile
 WriteRegStr HKCR JSPFile  Java Server Pages source
 WriteRegStr HKCR JSPFile\shell  open
  -  WriteRegStr HKCR JSPFile\DefaultIcon  $INSTDIR\tomcat.ico
  +  WriteRegStr HKCR JSPFile\DefaultIcon  $INSTDIR\tomcat.ico
 WriteRegStr HKCR JSPFile\shell\open\command  'notepad.exe %1'
  -  WriteRegStr HKCR JSPFile\shell\compile  Compile JSP
  -  WriteRegStr HKCR JSPFile\shell\compile\command  '$INSTDIR\bin\jspc.bat %1'
  +
   SectionEnd
   
   Section Tomcat 4.0 Start Menu Group
  -  SectionIn 1 2
  +
  +  SectionIn 1 2 3
  +
 SetOutPath $SMPROGRAMS\Tomcat 4.0
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat Home Page.lnk \
http://jakarta.apache.org/tomcat;
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Uninstall Tomcat 4.0.lnk \
$INSTDIR\uninst-tomcat4.exe
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Documentation.lnk \
http://jakarta.apache.org/tomcat/tomcat-4.0-doc/index.html;
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Tomcat 4.0 Program Directory.lnk \
$INSTDIR
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Start Tomcat.lnk \
  - $INSTDIR\bin\startup.bat
  + %JAVA_HOME%\bin\java \
  + '-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap start' \
  + $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL
  +
 CreateShortCut $SMPROGRAMS\Tomcat 4.0\Stop Tomcat.lnk \
  - $INSTDIR\bin\shutdown.bat
  + %JAVA_HOME%\bin\java \
  + '-cp $INSTDIR\bin\bootstrap.jar;%JAVA_HOME%\lib\tools.jar 
-Dcatalina.home=$INSTDIR org.apache.catalina.startup.Bootstrap stop' \
  + $INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED
  +
  +SectionEnd
  +
  +SectionDivider
  +
  +Section Tomcat 4.0 Documentation
  +
  +  SectionIn 1 3
  +  SetOutPath $INSTDIR\webapps
  +  File /r webapps\ROOT
  +
  +SectionEnd
  +
  +Section Example Web Applications
  +
  +  SectionIn 1 3
  +