cvs commit: jakarta-tomcat-4.0 tomcat.nsi

[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/catalina/src/share/org/apache/catalina/loader LocalStrings.properties WebappClassLoader.java WebappLoader.java

[remm]

remm01/07/13 23:51:40

  Modified:catalina/src/share/org/apache/catalina/loader
LocalStrings.properties WebappClassLoader.java
WebappLoader.java
  Log:
  - Fix a race condition in the modified method, as reported by Jon Stevens.
One of the arrays could be could be bigger than the other by one elemnt.
  - If there is an exception in modified, it is now logged and caught, instead of
killing the thread which tracks modifications.
  
  Revision  ChangesPath
  1.3   +1 -0  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings.properties   2001/06/21 01:39:07 1.2
  +++ LocalStrings.properties   2001/07/14 06:51:39 1.3
  @@ -27,3 +27,4 @@
   webappLoader.removeRepository=Removing repository {0}
   webappLoader.starting=Starting this Loader
   webappLoader.stopping=Stopping this Loader
  +webappLoader.failModifiedCheck=Error tracking modifications
  
  
  
  1.9   +22 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebappClassLoader.java2001/07/12 21:22:25 1.8
  +++ WebappClassLoader.java2001/07/14 06:51:39 1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.8 2001/07/12 21:22:25 remm Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/07/12 21:22:25 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.9 2001/07/14 06:51:39 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/07/14 06:51:39 $
*
* 
*
  @@ -123,7 +123,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2001/07/12 21:22:25 $
  + * @version $Revision: 1.9 $ $Date: 2001/07/14 06:51:39 $
*/
   public class WebappClassLoader
   extends URLClassLoader
  @@ -687,13 +687,23 @@
   // Checking for modified loaded resources
   int length = paths.length;
   
  +// A rare race condition can occur in the updates of the two arrays
  +// It's totally ok if the latest class added is not checked (it will
  +// be checked the next time
  +int length2 = lastModifiedDates.length;
  +if (length  length2)
  +length = length2;
  +
   for (int i = 0; i  length; i++) {
   try {
   long lastModified = 
   ((ResourceAttributes) resources.getAttributes(paths[i]))
   .getLastModified().getTime();
   if (lastModified != lastModifiedDates[i]) {
  -log(  Resource ' + paths[i] + ' was modified);
  +log(  Resource ' + paths[i] 
  ++ ' was modified; Date is now:  
  ++ new java.util.Date(lastModified) +  Was: 
  ++ new java.util.Date(lastModifiedDates[i]));
   return (true);
   }
   } catch (NamingException e) {
  @@ -1535,19 +1545,19 @@
   
   int j;
   
  -String[] result = new String[paths.length + 1];
  -for (j = 0; j  paths.length; j++) {
  -result[j] = paths[j];
  -}
  -result[paths.length] = fullPath;
  -paths = result;
  -
   long[] result2 = new long[lastModifiedDates.length + 1];
   for (j = 0; j  lastModifiedDates.length; j++) {
   result2[j] = lastModifiedDates[j];
   }
   result2[lastModifiedDates.length] = entry.lastModified;
   lastModifiedDates = result2;
  +
  +String[] result = new String[paths.length + 1];
  +for (j = 0; j  paths.length; j++) {
  +result[j] = paths[j];
  +}
  +result[paths.length] = fullPath;
  +paths = result;
   
   }
   
  
  
  
  1.11  +12 -7 

Tomcat 4 installer - testers needed

[Remy Maucherat]

Hi all,

I spent some time this afternoon trying Nullsoft Installer, and to see what
it could do, I wrote an installation script for Tomcat 4.0.

I'd like to get some feedback and testing on the generated installer. It
should run on Win9x and up, although I only tested it on Win2k.
(This binary is based on the current CVS tree)
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/jakarta-tomcat-4
.0-20010714.exe

Remy

RE: HttpServletRequestFacade

[Martin van den Bemt]

No hablo espagnol ;-))

 -Original Message-
 From: Ignacio J. Ortega [mailto:[EMAIL PROTECTED]]
 Sent: Friday, July 13, 2001 11:55 PM
 To: '[EMAIL PROTECTED]'
 Subject: RE: HttpServletRequestFacade


 Me equivoque al responderte era este al que me referia

 Saludos ,
 Ignacio J. Ortega

 -Mensaje original-
 De: Tomas Perez Garcia [mailto:[EMAIL PROTECTED]]
 Enviado el: viernes 13 de julio de 2001 13:56
 Para: tomcat development
 Asunto: HttpServletRequestFacade


 I'm using apache with tomcat3.2.

 The HttpServletRequestFacade lib colud be at org.apache.tomcat.core path
 but it isn't
 I have found the HttpServletRequestFacade at org.apache.tomcat.facade
 path but now,
 a error ocurr because this lib isn't public class or it isn't public
 interface.

 I think that in the tomcat3.2 a redistribution of libs has ocurred, but
 I' m not sure.

 Can yout help me, please?



 Tomás Pérez García
 Ingeniero de software


 [EMAIL PROTECTED]
 http://www.renr.esTlf:
 Fax: 96.598.71.70
  96.592.43.12


 Recursos en la Red,S.L.U.
 Pintor Cabrera, 22 - Esc.B 3º
 03003 Alicante (España)

Re: Tomcat 4 installer - testers needed

[hiten pandya]

hi Remy, all,

i am right on the testing of the .exe file, i am currently using Win98 SE, 
so any report i make will be regarding Windows 98 SE version.

thanx in advance,

Hiten Pandya(15)
[EMAIL PROTECTED]



From: Remy Maucherat [EMAIL PROTECTED]
Reply-To: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Subject: Tomcat 4 installer - testers needed
Date: Sat, 14 Jul 2001 00:42:36 -0700
MIME-Version: 1.0
Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id 
MHotMailBD1942AF00504004314D40D02A2912900; Sat, 14 Jul 2001 00:41:36 -0700
Received: (qmail 91791 invoked by uid 500); 14 Jul 2001 07:41:20 -
Received: (qmail 91782 invoked from network); 14 Jul 2001 07:41:20 -
From tomcat-dev-return-24463-h_pandya5 Sat, 14 Jul 2001 00:41:37 -0700
Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm
Precedence: bulk
list-help: mailto:[EMAIL PROTECTED]
list-unsubscribe: mailto:[EMAIL PROTECTED]
list-post: mailto:[EMAIL PROTECTED]
Delivered-To: mailing list [EMAIL PROTECTED]
Message-ID: 030b01c10c38$8d17be90$82deb018@c538761a
References: [EMAIL PROTECTED]
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4522.1200
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4522.1200
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

Hi all,

I spent some time this afternoon trying Nullsoft Installer, and to see what
it could do, I wrote an installation script for Tomcat 4.0.

I'd like to get some feedback and testing on the generated installer. It
should run on Win9x and up, although I only tested it on Win2k.
(This binary is based on the current CVS tree)
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/jakarta-tomcat-4
.0-20010714.exe

Remy


_
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.

[PATCH] Splash screen for Tomcat 4.0 Windows Installer

[hiten pandya]

hi everyone,
hope everyone is fine and fit,

I hope this patch gets accepted...
its a splash screen for the jakarta-tomcat 4.0 nullsoft based installer.
i made this splash screen because when i got a mail from Remy, in the morning, i thought to make something for the project, so i made a nice splash screen for it.

I am attaching a tar.gz file which has the neccesary files for the splash screen (tcwinsplash.bmp) and the tcpatch.txt (tomcat.nsi patch file)
START OF PATCH
---

Index: tomcat.nsi===RCS file: /home/cvspublic/jakarta-tomcat-4.0/tomcat.nsi,vretrieving revision 1.3diff -u -r1.3 tomcat.nsi--- tomcat.nsi2001/07/14 06:47:121.3+++ tomcat.nsi2001/07/14 13:14:01@@ -1,6 +1,15 @@; Tomcat 4 script for Nullsoft Installer+Function .onInit+SetOutPath $TEMP+File /oname=spltmp.dat "tcwinsplash.bmp"+File /oname=spltmp.exe "splash.exe"+ExecWait '"$TEMP\spltmp.exe" 2000 $HWNDPARENT spltmp.dat'+Delete $TEMP\spltmp.exe+Delete $TEMP\spltmp.dat+FunctionEnd+Name "jakarta-tomcat-4.0"Caption "Jakarta Tomcat 4.0"OutFile tomcat4.exeIndex: tomcat.nsi===RCS file: /home/cvspublic/jakarta-tomcat-4.0/tomcat.nsi,vretrieving revision 1.3diff -u -r1.3 tomcat.nsi--- tomcat.nsi2001/07/14 06:47:121.3+++ tomcat.nsi2001/07/14 13:28:58@@ -1,5 +1,17 @@; Tomcat 4 script for Nullsoft Installer+; The builder will have to download the bitmap file from the+; CVS repository++Function .onInit+SetOutPath $TEMP+File /oname=spltmp.dat "tcwinsplash.bmp"+File /oname=spltmp.exe "splash.exe"+; The file splash.exe is located in the nullsoft installer directory+ExecWait '"$TEMP\spltmp.exe" 2000 $HWNDPARENT spltmp.dat'+Delete $TEMP\spltmp.exe+Delete $TEMP\spltmp.dat+FunctionEndName "jakarta-tomcat-4.0"Caption "Jakarta Tomcat 4.0"Index: tomcat.nsi===RCS file: /home/cvspublic/jakarta-tomcat-4.0/tomcat.nsi,vretrieving revision 1.3diff -u -r1.3 tomcat.nsi--- tomcat.nsi2001/07/14 06:47:121.3+++ tomcat.nsi2001/07/14 13:31:31@@ -1,5 +1,17 @@; Tomcat 4 script for Nullsoft Installer+; The builder will have to download the bitmap file from the+; CVS repository++Function .onInit+SetOutPath $TEMP+File /oname=spltmp.dat "tcwinsplash.bmp"+File /oname=spltmp.exe "splash.exe"+; The file splash.exe is located in the nullsoft installer directory+ExecWait '"$TEMP\spltmp.exe" 2000 $HWNDPARENT spltmp.dat'+Delete $TEMP\spltmp.exe+Delete $TEMP\spltmp.dat+FunctionEndName "jakarta-tomcat-4.0"Caption "Jakarta Tomcat 4.0"
--
END OF PATCH


thanx in advance,

Hiten Pandya (15)
[EMAIL PROTECTED]Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com. tcplash.tar.gz

Re: [PATCH] Splash screen for Tomcat 4.0 Windows Installer

[Remy Maucherat]

hi everyone,
hope everyone is fine and fit,

I hope this patch gets accepted...
its a splash screen for the jakarta-tomcat 4.0 nullsoft based installer.
i made this splash screen because when i got a mail from Remy, in the
morning, i thought to make something for the project, so i made a nice
splash screen for it.



Cool. The attachement didn't make it through, though.

Remy

Re: [PATCH] Splash screen for Tomcat 4.0 Windows Installer

[hiten pandya]

hi remy,
was there a problem with the patch or anything,
shall i improve iit..

thanx in advance,
Hiten Pandya
--

From: "Remy Maucherat" <[EMAIL PROTECTED]>
Reply-To: [EMAIL PROTECTED] 
To: <[EMAIL PROTECTED]>
Subject: Re: [PATCH] Splash screen for Tomcat 4.0 Windows Installer 
Date: Sat, 14 Jul 2001 10:06:36 -0700 
MIME-Version: 1.0 
Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id MHotMailBD19C6CB002340042A0940D02A2904670; Sat, 14 Jul 2001 10:05:15 -0700 
Received: (qmail 69262 invoked by uid 500); 14 Jul 2001 17:05:23 - 
Received: (qmail 69250 invoked from network); 14 Jul 2001 17:05:21 - 
From tomcat-dev-return-24467-h_pandya5 Sat, 14 Jul 2001 10:05:39 -0700 
Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm 
Precedence: bulk 
list-help: 
list-unsubscribe: 
list-post: 
Delivered-To: mailing list [EMAIL PROTECTED] 
Message-ID: 00a901c10c87$57964a30$82deb018@c538761a 
References: <[EMAIL PROTECTED]>
X-Priority: 3 
X-MSMail-Priority: Normal 
X-Mailer: Microsoft Outlook Express 5.50.4522.1200 
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4522.1200 
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N 

hi everyone, 
hope everyone is fine and fit, 

I hope this patch gets accepted... 
its a splash screen for the jakarta-tomcat 4.0 nullsoft based installer. 
i made this splash screen because when i got a mail from Remy, in the 
morning, i thought to make something for the project, so i made a nice 
splash screen for it. 

 

Cool. The attachement didn't make it through, though. 

Remy 

Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.

cvs commit: jakarta-tomcat-4.0/resources - New directory

[remm]

remm01/07/14 20:23:55

  jakarta-tomcat-4.0/resources - New directory

Re: Alternative to NSI

[Remy Maucherat]

Quoting Daniel Ritchey [EMAIL PROTECTED]:

 Microsoft has its own installation mechanism built in to Win2000  WinXP
 and 
 offers a download to add it Win9x.  Its the same thing that the binary 
 release of Apache for windows is packaged in.
 
 Just thought I would throw that out there, I don't know if it has any 
 advantages over NSI.

Ok, but how do you build the MSI ?
I know InstallShield can generate that, but that costs (lots of) cash ...

There are a few advanced features missing in NSI, but more or less gets the job 
done. It is also very simple to use.

I had a tweaked version of the script, but unfortunately my main HD died on me 
a few moments ago. The tweaks weren't too complex so I should be able to put 
them back in quickly.
What would I do without IMAP (thanks Pier ;-)) and CVS ? (since of course I 
never back up anything) :-)

Remy

RE: Tomcat 4 installer - testers needed

[mettu . kumar]

Remy,

I tried the Installation both win2K and win98. They did work pretty well.

The only problem I noticed is that when JAVA_HOME is not set before installation some 
how start Tomcat Menu Item items Target is set to something like 
C:\%JAVA_HOME%\bin\java -cp 

This only happens if JAVA_HOME is not set before installtion though.

Other than that everything looks cool. 

Kumar.


-Original Message-
From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
Sent: Saturday, July 14, 2001 12:43 AM
To: [EMAIL PROTECTED]
Subject: Tomcat 4 installer - testers needed


Hi all,

I spent some time this afternoon trying Nullsoft Installer, and to see what
it could do, I wrote an installation script for Tomcat 4.0.

I'd like to get some feedback and testing on the generated installer. It
should run on Win9x and up, although I only tested it on Win2k.
(This binary is based on the current CVS tree)
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/jakarta-tomcat-4
.0-20010714.exe

Remy

RE: Tomcat 4 installer - testers needed

[Remy Maucherat]

Quoting [EMAIL PROTECTED]:

 Remy,
 
   I tried the Installation both win2K and win98. They did work pretty
 well.
 
 The only problem I noticed is that when JAVA_HOME is not set before
 installation some how start Tomcat Menu Item items Target is set to
 something like C:\%JAVA_HOME%\bin\java -cp 

(that's called : The Explorer tries to be Smart Syndrome ;-))

 This only happens if JAVA_HOME is not set before installtion though.
 
 Other than that everything looks cool. 

I don't know how we could get around that ...

Or we can assume that java.exe is in the user's path.
Jasper will need JAVA_HOME to run, though, to be able to use javac.

Remy