cvs commit: jakarta-tomcat-4.0/catalina build.xml

[remm]

remm01/07/15 23:57:18

  Modified:catalina build.xml
  Log:
  - Add a manifest file for bootstrap.jar.
  
  Revision  ChangesPath
  1.48  +1 -0  jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build.xml 2001/07/12 08:35:06 1.47
  +++ build.xml 2001/07/16 06:57:18 1.48
  @@ -160,6 +160,7 @@
   
   

cvs commit: jakarta-tomcat-4.0/catalina/etc bootstrap.MF

[remm]

remm01/07/15 23:57:09

  Added:   catalina/etc bootstrap.MF
  Log:
  - Add a manifest file for bootstrap.jar.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-4.0/catalina/etc/bootstrap.MF
  
  Index: bootstrap.MF
  ===
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap
  Specification-Title: Catalina
  Specification-Version: 1.0
  
  

cvs commit: jakarta-tomcat-4.0/catalina/etc - New directory

[remm]

remm01/07/15 23:56:48

  jakarta-tomcat-4.0/catalina/etc - New directory

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

[remm]

remm01/07/15 23:56:35

  Modified:.build.xml tomcat.nsi
  Log:
  - More tweaks.
  - Don't display the README.txt (which contains irrelevant information).
  
  Revision  ChangesPath
  1.27  +0 -1  jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml 2001/07/15 19:39:06 1.26
  +++ build.xml 2001/07/16 06:56:35 1.27
  @@ -170,7 +170,6 @@
 
   
   
  -
   
 
   
  
  
  
  1.7   +4 -10 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- tomcat.nsi2001/07/16 02:47:02 1.6
  +++ tomcat.nsi2001/07/16 06:56:35 1.7
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.6 2001/07/16 02:47:02 remm Exp $
  +; $Id: tomcat.nsi,v 1.7 2001/07/16 06:56:35 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -38,7 +38,6 @@
 SetOutPath $INSTDIR
 File tomcat.ico
 File LICENSE
  -  File README.txt
 File /r bin
 File /r common
 File /r jasper
  @@ -93,12 +92,12 @@
   
 CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk" \
"$2\bin\java.exe" \
  - '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar" 
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap start' \
  + '-jar -cp "$2\lib\tools.jar" -Dcatalina.home="$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" \
  - '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar" 
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap stop' \
  + '-Dcatalina.home="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
   
 SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0\Configuration"
  @@ -210,11 +209,7 @@
   
   Function .onInstSuccess
   
  -  MessageBox MB_YESNO|MB_ICONQUESTION \
  - "Setup has completed. View readme file now?" \
  - IDNO NoReadme
  -ExecShell open '$INSTDIR\README.txt'
  -  NoReadme:
  +  ExecShell open '$SMPROGRAMS\Jakarta Tomcat 4.0'
   
   FunctionEnd
   
  @@ -242,7 +237,6 @@
 RMDir /r "$SMPROGRAMS\Jakarta Tomcat 4.0"
 Delete "$INSTDIR\tomcat.ico"
 Delete "$INSTDIR\LICENSE"
  -  Delete "$INSTDIR\README.txt"
 RMDir /r "$INSTDIR\bin"
 RMDir /r "$INSTDIR\common"
 Delete "$INSTDIR\conf\*.dtd"
  
  
  

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

[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
   
  
  
  

Re: Alternative to NSI

[Klaus Sonnenleiter]

I've worked with both Setup Factory and InstallShield in the past and I
liked Setup Factory a lot. But as far as I know, it is Windows only. Last
I heard, both InstallShield and Wise were planning Java versions of their
installers that were supposed to be cross-platform. Wouldn't that make
some sense for a product like Tomcat that is cross-platform itself?

Just my $.02

Klaus Sonnenleiter

At 10:13 AM 7/15/01 +0100, you wrote:

hi all,

talking about alternatives, there is a program called DemoSheild from
InstallShield which is free and can be used to make msi install
scripts.

There is another program called 'Setup Factory 5.0' which has some very
advanced features like regisrty editing, inf. file editing, setting
run-time env. variables and stuff,,

 

just saying, i have got the setup factory program, if u would like me to
make an example copy of it.

Thanx in advance,

Hiten Pandya

[EMAIL PROTECTED]


--
From: Remy Maucherat 
Reply-To: [EMAIL PROTECTED] 
To: [EMAIL PROTECTED] 
Subject: Re: Alternative to NSI 
Date: Sat, 14 Jul 2001 22:54:36 -0700 (PDT) 
MIME-Version: 1.0 
Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id
MHotMailBD1A7B2200CA4004311F40D02A290A770; Sat, 14 Jul 2001 22:54:42
-0700 
Received: (qmail 95669 invoked by uid 500); 15 Jul 2001 05:54:27 -

Received: (qmail 95657 invoked from network); 15 Jul 2001 05:54:27 -

 From tomcat-dev-return-24471-h_pandya5 Sat, 14 Jul 2001 22:56:07 -0700

Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm

Precedence: bulk 
list-help:  
list-unsubscribe: 
list-post: 
Delivered-To: mailing list [EMAIL PROTECTED] 
X-Authentication-Warning: kali.betaversion.org: nobody set sender to
[EMAIL PROTECTED] using -f 
Message-ID: <[EMAIL PROTECTED]> 
References: 
In-Reply-To: 
User-Agent: IMP/PHP IMAP webmail program 2.2.2 
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N 
Quoting Daniel Ritchey : 
> 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 


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

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/07/15 18:13:46

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added few more checks for security.
  
  Add the class path to the taskdefs, so it can be run standalone.
  
  Revision  ChangesPath
  1.34  +99 -5 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- test-tomcat.xml   2001/07/14 03:52:43 1.33
  +++ test-tomcat.xml   2001/07/16 01:13:45 1.34
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -25,38 +25,62 @@

   

  + 
  +  
  + 
  +   
  + 
   
 









  +   classpathRef="cp.g"
  +   classname="org.apache.tomcat.util.test.matchers.HttpStatusMatch" />


  +   classpathRef="cp.g"
  +   classname="org.apache.tomcat.util.test.matchers.ResponseMatchFile" />
  + 

   

   

  - 
  + 
   
   
 
  @@ -106,6 +130,16 @@
 
 
 
  +  
  +  
  +  Few romanian chars in UNICED
  +  
  + 
  +  
  +  
  +  
  +  
  +
 
 
 Simple GET with parameters
  @@ -458,6 +492,18 @@
   
   
   
  +  
  +  
  +  Get a session and then include a JSP.
  +  
  +  
  +  
  +  
  +  
  +
  +
  +
 
 
  @@ -1112,8 +1158,56 @@
returnCode="${http.protocol} 4" />
   
  
  +
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +   
   
  -   
  +   
 

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Main.java

[costin]

costin  01/07/15 18:09:08

  Modified:src/share/org/apache/tomcat/startup Main.java
  Log:
  Make sure the context class loader is set ( if 1.2 available )
  
  Revision  ChangesPath
  1.36  +3 -2  jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Main.java 2001/06/13 21:28:28 1.35
  +++ Main.java 2001/07/16 01:09:07 1.36
  @@ -1,4 +1,4 @@
  -/* $Id: Main.java,v 1.35 2001/06/13 21:28:28 mmanders Exp $
  +/* $Id: Main.java,v 1.36 2001/07/16 01:09:07 costin Exp $
* 
*
* The Apache Software License, Version 1.1
  @@ -109,7 +109,7 @@
@author Costin Manolache
@author Ignacio J. Ortega
@author Mel Martinez [EMAIL PROTECTED]
  - @version $Revision: 1.35 $ $Date: 2001/06/13 21:28:28 $
  + @version $Revision: 1.36 $ $Date: 2001/07/16 01:09:07 $
*/
   public class Main{
   
  @@ -274,6 +274,7 @@
   ClassLoader serverCl=
   jdk11Compat.newClassLoaderInstance(serverClassPath ,
   commonCl);
  + jdk11Compat.setContextClassLoader( serverCl );
   
// Create the webapps class loader 
   Vector appsJars = new Vector();
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/xml XmlMapper.java

[costin]

costin  01/07/15 17:20:58

  Modified:src/share/org/apache/tomcat/util/xml XmlMapper.java
  Log:
  Use the class loader set by the user when creating objects.
  
  Revision  ChangesPath
  1.34  +5 -3  
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
  
  Index: XmlMapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- XmlMapper.java2001/06/28 07:15:02 1.33
  +++ XmlMapper.java2001/07/16 00:20:57 1.34
  @@ -407,7 +407,8 @@
 obj=attributes.getValue("action");
 if( obj!=null) {
 try {
  -  Class c=Class.forName( obj );
  +  ClassLoader cl=getClassLoader();
  +  Class c=cl.loadClass( obj );
 Object o=c.newInstance();
 mapper.addRule( match, (XmlAction)o);
 } catch( Exception ex ) {
  @@ -675,6 +676,7 @@
   public void start( SaxContext ctx) throws Exception {
String tag=ctx.getCurrentElement();
String classN=className;
  + ClassLoader cl=ctx.getClassLoader();
   
if( attrib!=null) {
AttributeList attributes = ctx.getCurrentAttributes();
  @@ -685,7 +687,7 @@
if( pref!=null && classN.indexOf( "." ) <0 ) {
for( int i=0; i 0 )
  @@ -695,7 +697,7 @@
}
}
if( c==null ) {
  - c=Class.forName( classN );
  + c=cl.loadClass( classN );
}
Object o=c.newInstance();
ctx.pushObject(o);
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/hooks Hooks.java

[costin]

costin  01/07/15 17:20:26

  Modified:src/share/org/apache/tomcat/util/hooks Hooks.java
  Log:
  Added the missing methods ( resetCache and addHook )
  
  Revision  ChangesPath
  1.6   +10 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/hooks/Hooks.java
  
  Index: Hooks.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/hooks/Hooks.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Hooks.java2001/06/28 07:26:08 1.5
  +++ Hooks.java2001/07/16 00:20:25 1.6
  @@ -113,6 +113,11 @@
   public Vector getHooksVector( int type ) {
return hooksV[type];
   }
  +
  +public void resetCache() {
  + for( int i=0; i

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers SimpleMapper1.java

[costin]

costin  01/07/15 17:19:46

  Modified:src/share/org/apache/tomcat/modules/mappers
SimpleMapper1.java
  Log:
  Allow case insensitive matching.
  
  This is another big security addition - we already had huge problems with that.
  Note that this fix is done at the lowest level - the mapper - instead of
  requiring each individual servlet/module to do many checks.
  
  It is of course easy to turn this off or on.
  
  Revision  ChangesPath
  1.6   +42 -11
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java
  
  Index: SimpleMapper1.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SimpleMapper1.java2001/07/02 19:37:54 1.5
  +++ SimpleMapper1.java2001/07/16 00:19:46 1.6
  @@ -62,10 +62,9 @@
   import org.apache.tomcat.core.*;
   import org.apache.tomcat.util.buf.MessageBytes;
   import org.apache.tomcat.util.io.FileUtil;
  -//import org.apache.tomcat.util.PrefixMapper;
   import org.apache.tomcat.util.collections.*;
   import java.util.*;
  -
  +import java.io.*;
   /**
*  This class will set up the data structures used by a simple patern matching
*  alghoritm and use it to extract the path components from the request URI.
  @@ -100,8 +99,11 @@
   // Property for the PrefixMapper - cache the mapping results
   boolean mapCacheEnabled=false;
   
  +
   public SimpleMapper1() {
map=new PrefixMapper();
  + ignoreCase= (File.separatorChar  == '\\');
  + map.setIgnoreCase( ignoreCase );
   }
   
   /*  Support functions  */
  @@ -113,6 +115,17 @@
map.setMapCache( v );
   }
   
  +//  Ingore case 
  +boolean ignoreCase=false;
  +
  +/** Use case insensitive match, for windows and
  + similar platforms
  +*/
  +public void setIgnoreCase( boolean b ) {
  + ignoreCase=b;
  + map.setIgnoreCase( b );
  +}
  +
   /*  Initialization  */
   
   /** Set the context manager. To keep it simple we don't support
  @@ -209,7 +222,10 @@
defC.setNote( ctExtMapNote, eM );
}
// add it to the Container local maps
  - eM.put( path.substring( 1 ), ct );
  + if( ignoreCase )
  + eM.put( path.substring( 1 ).toLowerCase() , ct );
  + else
  + eM.put( path.substring( 1 ), ct );
if(debug>0)
log( "SM: extension map " + ctxP + "/" +
 path + " " + ct + " " );
  @@ -359,6 +375,7 @@
if( extM==null ) return null;
   
// Find the container associated with that extension
  + if( ignoreCase ) extension=extension.toLowerCase();
Container container= (Container)extM.get(extension);
   
if (container == null)
  @@ -460,7 +477,7 @@
   // mappers ( extending this one for example ) using 1.2 collections
   // TreeMap mapCache;
   boolean mapCacheEnabled=false;
  -
  +boolean ignoreCase=false;
   
   public PrefixMapper() {
prefixMappedServlets=new SimpleHashtable();
  @@ -472,6 +489,10 @@
mapCacheEnabled=v;
   }
   
  +public void setIgnoreCase( boolean b ) {
  + ignoreCase=b;
  +}
  +
   /** Remove all mappings matching path
*/
   public void removeAllMappings( String host, Context ctx ) {
  @@ -523,17 +544,24 @@
   /**
*/
   public void addMapping( String host, String path, Object target ) {
  - if( host == null )
  - prefixMappedServlets.put( path, target);
  - else {
  + if( host == null ) {
  + if( ignoreCase )
  + prefixMappedServlets.put( path.toLowerCase(), target);
  + else
  + prefixMappedServlets.put( path, target);
  + } else {
host=host.toLowerCase();
PrefixMapper vmap=(PrefixMapper)vhostMaps.get( host );
if( vmap == null ) {
vmap=new PrefixMapper();
  - vhostMaps.put( host, vmap );
  + vmap.setIgnoreCase( ignoreCase );
  + vhostMaps.put( host, vmap );
vmap.setMapCache( mapCacheEnabled );
}
  - vmap.addMapping( path, target );
  + if( ignoreCase ) 
  + vmap.addMapping( path.toLowerCase(), target );
  + else
  + vmap.addMapping( path, target );
}
   }
   
  @@ -549,7 +577,10 @@
vmap=new PrefixMapper();
vhostMaps.put( host, vmap );
}
  - vmap.addExactMapping( path, target );
  + if( ignoreCase ) 
  + vmap.addExactMapping( path.toLowerCase(), target );

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java

[costin]

costin  01/07/15 17:12:04

  Modified:src/share/org/apache/tomcat/modules/mappers
DecodeInterceptor.java
  Log:
  Major security addition - DecodeInterceptor is now able to "normalize"
  a URI, using the same (well tested ) alghoritm that apache does.
  
  This will remove all unsafe path components at the earliest stage,
  making sure all components benefit from this ( not only StaticInterceptor
  via FileUtils ).
  
  We deal with //, /./, /../, /.., /.
  
  Note that this behavior can be disabled, if you think following
  ad-literam the servlet spec is better than security. The servlet spec
  requires the user to get the "original" URI - which this fix obviously disables.
  
  On the other side, not doing the normalization opens _huge_ security problems,
  and _all_ servlets that are using paths ( a default servlet, etc) will
  have to know how to secure the path. Since the container still has problems,
  it's very unlikely most user code will be able to do so.
  
  In particular the security matching is greatly affected.
  
  Revision  ChangesPath
  1.4   +136 -0
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
  
  Index: DecodeInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DecodeInterceptor.java2001/06/16 22:05:05 1.3
  +++ DecodeInterceptor.java2001/07/16 00:12:03 1.4
  @@ -81,6 +81,7 @@
   private int encodingInfoNote;
   private int sessionEncodingNote;
   
  +private boolean safe=true;
   
   public DecodeInterceptor() {
   }
  @@ -103,6 +104,14 @@
charsetAttribute=s;
charsetURIAttribute=";" + charsetAttribute + "=";
   }
  +
  +/** Decode interceptor can normalize unsafe urls, by eliminating
  + dangerous things like /../, // , etc - all of them are known
  + as very dangerous for security.
  +*/
  +public void setSafe( boolean b ) {
  + safe=b;
  +}
   
   /*  Initialization  */
   
  @@ -116,6 +125,123 @@
   }
   /*  Request mapping  */
   
  +
  +// Based on Apache's path normalization code
  +private void normalizePath(MessageBytes pathMB ) {
  + if( debug> 0 ) log( "Normalize " + pathMB.toString());
  + if( pathMB.getType() != MessageBytes.T_BYTES ) return;
  + 
  + ByteChunk bc=pathMB.getByteChunk();
  +
  + int start=bc.getStart();
  + int end=bc.getEnd();
  + byte buff[]=bc.getBytes();
  + int i=0;
  + int j=0;
  + 
  + // remove //
  + for( i=start, j=start; i 0 ) {
  + log( "Eliminate // " + pathMB.toString() + " " + start + " " + end );
  + }
  + }
  + 
  + // remove /./
  + for( i=start, j=start; i 0 ) {
  + log( "Eliminate /./ " + pathMB.toString());
  + }
  + }
  + 
  + // remove  /. at the end
  + j=end;
  + if( end==start+1 && buff[start]== '.' )
  + end--;
  + else if( end > start+1 && buff[ end-1 ] == '.' &&
  +  buff[end-2]=='/' ) {
  + end=end-2;
  + }
  + if( end!=j ) {
  + bc.setEnd( end );
  + pathMB.resetStringValue();
  + if( debug > 0 ) {
  + log( "Eliminate ending /. " + pathMB.toString());
  + }
  + }
  +
  + // remove /../
  + for( i=start, j=start; i0 && buff[j]!='/' ) {
  + j--;
  + }
  + } else {
  + buff[j++]=buff[i];
  + }
  + }
  + if( i!=j ) {
  + buff[j++]=buff[end-2];
  + buff[j++]=buff[end-1];
  + end=j;
  + bc.setEnd( end );
  + pathMB.resetStringValue();
  + if( debug > 0 ) {
  + log( "Eliminate /../ " + pathMB.toString());
  + }
  + }
  +
  +
  + // remove trailing xx/..
  + j=end;
  + if( end>start + 3 &&
  + buff[end-1]=='.' &&
  + buff[end-2]=='.' &&
  + buff[end-3]=='/' ) {
  + end-=4;
  + while( end>0 &&  buff[end]!='/' )
  + end--; 
  + }
  + if( end!=j ) {
  + bc.setEnd( end );
  + pathMB.resetStringValue();
  + if( debug > 0 ) {
  + log( "Eliminate ending /.. " + pathMB.toString());
  + }
  + }
  + 
  +}
  +
   public int postReadRequest( Request req ) {
MessageBytes pathMB = req.requestURI();
// copy the request 
  @@ -123,6 +249,16 @@
if( pathMB.isNull())
throw new RuntimeException("ASSERT: null path in request URI");
   
  + if( safe &&
  + ( pathMB.indexOf("//") >= 0 ||
  + 

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ServerXmlReader.java

[costin]

costin  01/07/15 17:05:04

  Modified:src/share/org/apache/tomcat/modules/config
ServerXmlReader.java
  Log:
  Extra check in trusted apps. Since the app is trusted, it has full access
  to the internals - it could add new modules during a servlet init, but
  we want this to happen sooner, as modules might use the earlier callbacks.
  
  Revision  ChangesPath
  1.11  +38 -1 
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
  
  Index: ServerXmlReader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ServerXmlReader.java  2001/07/13 06:22:15 1.10
  +++ ServerXmlReader.java  2001/07/16 00:05:04 1.11
  @@ -120,6 +120,7 @@
   BaseInterceptor module)
throws TomcatException
   {
  + //  checkHooks(cm, ctx, module);
if( this != module ) return;
setupHookFinder();
XmlMapper xh=new XmlMapper();
  @@ -159,6 +160,42 @@
   }
   }
   
  +//  trusted apps 
  +
  +public void contextInit(  Context ctx )
  + throws TomcatException
  +{
  + if( ! ctx.isTrusted() ) return;
  +
  + // PathSetter is the first module in the chain, we shuld have
  + // a valid path by now 
  + String dir=ctx.getAbsolutePath();
  +
  + File f=new File(dir);
  + File modules=new File( f, "WEB-INF" + File.separator +
  +"interceptors.xml" );
  + if( modules.exists() ) {
  + ctx.log( "Loading modules from webapp " + modules );
  + } else {
  + if( debug > 0 )
  + ctx.log( "Can't find " + modules );
  + return;
  + }
  +
  + XmlMapper xh=new XmlMapper();
  + xh.setClassLoader( ctx.getClassLoader());
  + xh.setDebug( debug );
  + xh.addRule( "ContextManager", xh.setProperties() );
  + setPropertiesRules( cm, xh );
  + setTagRules( xh );
  + addDefaultTags(cm, xh);
  + addTagRules( cm, xh );
  + setBackward( xh );
  +
  + cm.setNote( "configFile", modules.getAbsolutePath());
  + loadConfigFile(xh,modules,cm);
  +}
  +
   //  Xml reading details 
   
   public static void loadConfigFile(XmlMapper xh, File f, ContextManager cm)
  @@ -304,7 +341,7 @@
FileOutputStream pos=new FileOutputStream( f );
mods.save( pos, "Auto-generated cache file");
} catch(IOException ex ) {
  - log("Error saving modules ", ex );
  + //log("Error saving modules ", ex );
}
   }
   
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config LoaderInterceptor11.java

[costin]

costin  01/07/15 17:02:32

  Modified:src/share/org/apache/tomcat/modules/config
LoaderInterceptor11.java
  Log:
  Set the class loader in addContext, there's no need to wait until
  contextInit.
  
  Revision  ChangesPath
  1.14  +0 -9  
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
  
  Index: LoaderInterceptor11.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LoaderInterceptor11.java  2001/06/28 07:28:51 1.13
  +++ LoaderInterceptor11.java  2001/07/16 00:02:32 1.14
  @@ -145,15 +145,6 @@
} catch( MalformedURLException ex ) {
}
}
  -}
  -
  -/** Construct a class loader to be used with the context
  - */
  -public void contextInit( Context context)
  - throws TomcatException
  -{
  - if( debug>0 ) log( "Init context " + context.getPath());
  -ContextManager cm = context.getContextManager();
   
ClassLoader loader=constructLoader( context );
context.setClassLoader( loader );
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config AutoWebApp.java

[costin]

costin  01/07/15 17:01:43

  Modified:src/share/org/apache/tomcat/modules/config AutoWebApp.java
  Log:
  AutoWebApp ( the one that adds apps from a dir ) can now set the trusted
  flag and a profile on all apps loaded from that particular dir.
  
  Revision  ChangesPath
  1.6   +26 -1 
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java
  
  Index: AutoWebApp.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AutoWebApp.java   2001/06/20 05:55:06 1.5
  +++ AutoWebApp.java   2001/07/16 00:01:42 1.6
  @@ -86,7 +86,9 @@
   String defaultHost=null; 
   boolean flat=true;
   boolean ignoreDot=true;
  -
  +String profile=null;
  +boolean trusted=false;
  +
   // encoding scheme - XXX review, customize, implement
   char hostSeparator='@'; // if support for vhost configuration is enabled
   // instead of one-dir-per-host, this char will separate the host part.
  @@ -132,6 +134,24 @@
   public void setFlat( boolean b ) {
flat=b;
   }
  +
  +/** Set the "profile" attribute on each context. This
  + can be used by a profile module to configure the
  + context with special settings.
  +*/
  +public void setProfile( String s ) {
  + profile=s;
  +}
  +
  +/** Set the trusted attribute to all apps. This is
  + used for "internal" apps, to reduce the number 
  + of manual configurations. It works by creating
  + a special directory and using  to
  + add all the apps inside with a trusted attribute.
  +*/
  +public void setTrusted( boolean b ) {
  + trusted=b;
  +}
   
   // Implementation 
   
  @@ -240,6 +260,11 @@
ctx.setDocBase( dir.getAbsolutePath());
}
   
  + if( trusted ) 
  + ctx.setTrusted( true );
  + if( profile!=null )
  + ctx.setProperty( "profile", profile );
  + 
if( debug > 0 )
log("automatic add " + host + ":" + ctx.toString() + " " +
path);
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ApacheConfig.java

[costin]

costin  01/07/15 17:00:42

  Modified:src/share/org/apache/tomcat/modules/config ApacheConfig.java
  Log:
  Remove the ending / from Alias ( it's not used in the default config,
  only when you want static files served by apache )
  
  Revision  ChangesPath
  1.17  +3 -3  
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
  
  Index: ApacheConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApacheConfig.java 2001/07/13 06:13:56 1.16
  +++ ApacheConfig.java 2001/07/16 00:00:41 1.17
  @@ -1,4 +1,4 @@
  -/* $Id: ApacheConfig.java,v 1.16 2001/07/13 06:13:56 costin Exp $
  +/* $Id: ApacheConfig.java,v 1.17 2001/07/16 00:00:41 costin Exp $
* 
*
* The Apache Software License, Version 1.1
  @@ -125,7 +125,7 @@
   
   @author Costin Manolache
   @author Mel Martinez
  - @version $Revision: 1.16 $ $Date: 2001/07/13 06:13:56 $
  + @version $Revision: 1.17 $ $Date: 2001/07/16 00:00:41 $
*/
   public class ApacheConfig  extends BaseInterceptor { 
   
  @@ -718,7 +718,7 @@
String npath=("".equals(ctxPath)) ? "/" : ctxPath;
// Static files will be served by Apache
mod_jk.println(indent + "# Static files "); 
  - mod_jk.println(indent + "Alias " + npath + " \"" + docBase + "\"/");
  + mod_jk.println(indent + "Alias " + npath + " \"" + docBase + "\"");
mod_jk.println();
mod_jk.println(indent + "");
mod_jk.println(indent + "Options Indexes FollowSymLinks");
  
  
  

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa AccessInterceptor.java

[costin]

costin  01/07/15 16:58:32

  Modified:src/share/org/apache/tomcat/modules/aaa
AccessInterceptor.java
  Log:
  AccessInterceptor will now use case-insensitive match for windows. Better
  safe :-)
  
  The main reason is that FileUtil ( which is used right now to do the checks )
  is fine as long as someone is calling it - we do call it in StaticInterceptor,
  but what if the user defines a servlet to handle static files ?
  ( there are many other cases where this will help )
  
  Revision  ChangesPath
  1.12  +40 -7 
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java
  
  Index: AccessInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AccessInterceptor.java2001/05/21 04:22:32 1.11
  +++ AccessInterceptor.java2001/07/15 23:58:32 1.12
  @@ -60,7 +60,7 @@
   package org.apache.tomcat.modules.aaa;
   
   import org.apache.tomcat.core.*;
  -import org.apache.tomcat.util.buf.MessageBytes;
  +import org.apache.tomcat.util.buf.*;
   import org.apache.tomcat.util.io.FileUtil;
   import org.apache.tomcat.util.http.*;
   import java.util.*;
  @@ -93,8 +93,19 @@
   int reqTransportNote;
   
   public AccessInterceptor() {
  + ignoreCase= (File.separatorChar  == '\\');
   }
   
  +//  Ingore case 
  +boolean ignoreCase=false;
  +
  +/** Use case insensitive match, for windows and
  + similar platforms
  +*/
  +public void setIgnoreCase( boolean b ) {
  + ignoreCase=b;
  +}
  +
   /*  Initialization  */
   
   /** Set the context manager. To keep it simple we don't support
  @@ -258,6 +269,12 @@
if( ctxSec==null || ctxSec.patterns==0 ) return 0; // fast exit
   
String reqURI = req.requestURI().toString();
  +
  + /* We don't need this if we normalize the path
  +if( reqURI.indexOf( "//" ) >= 0 )
  +return 403;
  + */
  + 
String path=reqURI.substring( ctxPathLen);
String method=req.method().toString();

  @@ -337,7 +354,7 @@
if( ctMethods != null && ctMethods.length > 0 ) {
boolean ok=false;
for( int i=0; i< ctMethods.length; i++ ) {
  - if( method.equals( ctMethods[i] ) ) {
  + if( method.equalsIgnoreCase( ctMethods[i] ) ) {
ok=true;
break;
}
  @@ -361,15 +378,31 @@
// if more can be matched in the path, include matching the '/'
if( path.length() > matchLen )
matchLen++;
  - for( int i=0; i< matchLen ; i++ ) {
  - if( path.charAt( i ) != ctPath.charAt( i ))
  - return false;
  + if( ignoreCase ) {
  + for( int i=0; i< matchLen ; i++ ) {
  + if( Ascii.toLower(path.charAt( i )) !=
  + Ascii.toLower(ctPath.charAt( i )))
  + return false;
  + }
  + } else {
  + for( int i=0; i< matchLen ; i++ ) {
  + if( path.charAt( i ) != ctPath.charAt( i ))
  + return false;
  + }
}
return true;
case Container.EXTENSION_MAP:
  - return ctPath.substring( 1 ).equals(FileUtil.getExtension( path ));
  + if( ignoreCase )
  + return ctPath.substring( 1 ).
  + equalsIgnoreCase(FileUtil.getExtension( path ));
  + else
  + return ctPath.substring( 1 ).
  + equals(FileUtil.getExtension( path ));
case Container.PATH_MAP:
  - return path.equals( ctPath );
  + if( ignoreCase )
  + return path.equalsIgnoreCase( ctPath );
  + else
  + return path.equals( ctPath );
}
return false;
   }
  
  
  

cvs commit: jakarta-tomcat/src/etc modules.xml server.xml

[costin]

costin  01/07/15 16:55:07

  Modified:src/etc  modules.xml server.xml
  Log:
  - added the "internal" dir for trusted apps and modules
  
  - Added a (commented-out) ApacheConfig module
  
  - removed jasper34 ( it'll be added as an add-on, it'll not be part of the
  release since it's not ready )
  
  Revision  ChangesPath
  1.7   +0 -49 jakarta-tomcat/src/etc/modules.xml
  
  Index: modules.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/modules.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- modules.xml   2001/06/09 00:15:50 1.6
  +++ modules.xml   2001/07/15 23:55:06 1.7
  @@ -499,55 +499,6 @@
   
   
   
  -
  -
  -Not yet
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -Not yet
  -
  -
  -
  -
  -
   
   
   Not yet
  
  
  
  1.82  +9 -1  jakarta-tomcat/src/etc/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- server.xml2001/06/25 08:04:35 1.81
  +++ server.xml2001/07/15 23:55:06 1.82
  @@ -26,6 +26,11 @@
   
   
   
  +
  +
  +
  +
   
   
  @@ -148,7 +153,10 @@
   

   
  -
  +
   
 
   
  
  
  

cvs commit: jakarta-tomcat build.xml

[costin]

costin  01/07/15 16:53:11

  Modified:.build.xml
  Log:
  Updated the jaxp to 1.1 ( I checked in the binaries, like all other project
  do - I'm not sure the commit mail went through ).
  
  - add the internal/ dir for easier configuration of trusted apps and modules
  
  - remove jasper34 from the default build - since we are close to beta, as
  previously discussed. jasper34 will be usable as an add-on module, when
  ready.
  
  Revision  ChangesPath
  1.142 +4 -7  jakarta-tomcat/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- build.xml 2001/07/13 02:42:06 1.141
  +++ build.xml 2001/07/15 23:53:10 1.142
  @@ -55,7 +55,8 @@
 
 
 
  -  
  +  
  +  
 
 
 
  @@ -160,6 +161,7 @@
   
   
   
  +
   
   
   
  @@ -512,12 +514,7 @@
   
 
   
  -  
  -
  -  
  -
  -  
  +  
 
   
 
  
  
  

cvs commit: jakarta-tomcat/bin xalan.jar crimson.jar jaxp.jar

[costin]

costin  01/07/15 16:35:00

  Added:   bin  xalan.jar crimson.jar jaxp.jar
  Log:
  Added jaxp1.1 binaries - it seems we are the last jakarta to do so :-)
  
  As previously discussed and aproved on tomcat-dev, tomcat3.3 will use jaxp1.1,
  since 1.0 has been replaced with 1.1 ( the current spec ).
  
  We use Xalan-2.1.0 and Crimson-1.1.1 by default, you can override this
  by setting jaxp.home to a different directory.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat/bin/xalan.jar
  
<>
  
  
  1.1  jakarta-tomcat/bin/crimson.jar
  
<>
  
  
  1.1  jakarta-tomcat/bin/jaxp.jar
  
<>
  
  

RE: Tomcat 4 installer - testers needed

[Remy Maucherat]

Quoting [EMAIL PROTECTED]:

> Remy,
> 
>   Probably we shoudln't be appending c:\ to JAVA_HOME if JAVA_HOME is not
> set(So that it works fine after JAVA_HOME is properly set).

If you look at the script, you'll notice that there's no c:\ in the link. It's 
just the windows explorer which gets smart and figures out I forgot the drive 
letter.

I'll try to figure out a workaround.
I think there's a command I can use to retrieve the value of an env variable, 
and see if it's blank (in which case, I can display a message and quit).

Remy
(reinstalling his OS on his new HD)

RE: Tomcat 4 installer - testers needed

[mettu . kumar]

Remy,

Probably we shoudln't be appending c:\ to JAVA_HOME if JAVA_HOME is not set(So 
that it works fine after JAVA_HOME is properly set).

Kumar.


-Original Message-
From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
Sent: Saturday, July 14, 2001 11:24 PM
To: [EMAIL PROTECTED]
Subject: RE: Tomcat 4 installer - testers needed


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

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request AccessInterceptor.java

[costin]

costin  01/07/15 16:09:31

  Modified:src/etc  Tag: tomcat_32 server.xml
   src/share/org/apache/tomcat/request Tag: tomcat_32
AccessInterceptor.java
  Log:
  Remove the xml:debug ( it creates problems when xerces is used )
  
  Added extra check for "//" in URLs. A better fix will be made in 3.3
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.29.2.11 +3 -2  jakarta-tomcat/src/etc/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
  retrieving revision 1.29.2.10
  retrieving revision 1.29.2.11
  diff -u -r1.29.2.10 -r1.29.2.11
  --- server.xml2000/11/18 02:01:01 1.29.2.10
  +++ server.xml2001/07/15 23:09:31 1.29.2.11
  @@ -1,9 +1,10 @@
   
   
   
  -
  +
  +
   

Re: [DOC] TOC - thoughts

[Craig R. McClanahan]

On Sat, 14 Jul 2001, Adam Fowler wrote:

> [snip]
> Is this documentation going to be used on the jakarta-tomcat site? If so who 
> can commit the documents?

As a Tomcat developer, I believe that docs about a particular version of a
software package should be shipped with that package (*and*, browsable on
the Tomcat web site).  And, it's more convenient (and likelier to be
accurate and up-to-date) if the documents themselves are part of that
project.

That doesn't say anything about whether it is *your* particular documents
or not (that's a matter of proposing them and seeing if they get
accepted).  It also does not preclude external efforts to document Tomcat
either.

> Also, TomcatBook are using the GNU FDL so if 
> apache's license is more restrictive that could be a problem

If you want to start a gigantic flame war, keep talking about GNU
vs. Apache licenses :-).  But it's not really relevant -- documentation
that is actually checked in to an Apache CVS repository must have an
Apache license (and copyright).

External projects can, of course, distribute their own documents under
whatever license they wish.

> (why 
> documentation is covered by apache's software license I don't know!)
> 

Because documentation is software, just like code is.

Because we want to grant the same rights to use the documentation as we
grant to use the code.

And, because we want the same protections on the documentation as we want
on the code.

Craig

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

[remm]

remm01/07/15 12:39:07

  Modified:.build.xml tomcat.nsi
  Log:
  - Use the new resources.
  - Warn about JAVA_HOME before starting the installation.
  
  Revision  ChangesPath
  1.26  +6 -4  jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml 2001/07/15 07:49:08 1.25
  +++ build.xml 2001/07/15 19:39:06 1.26
  @@ -166,11 +166,13 @@
 
   
   
  -
  -
  -
  +
  +  
  +
  +
  +
   
  -  
  +  
   
 
   
  
  
  
  1.5   +17 -5 jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tomcat.nsi2001/07/15 07:43:27 1.4
  +++ tomcat.nsi2001/07/15 19:39:06 1.5
  @@ -1,5 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  +; $Id: tomcat.nsi,v 1.5 2001/07/15 19:39:06 remm Exp $
   
   Name "jakarta-tomcat-4.0"
   Caption "Jakarta Tomcat 4.0"
  @@ -10,10 +11,14 @@
   
   BGGradient 00 80 FF
   InstallColors FF8080 00
  -Icon tomcat.ico
   
  +Icon main.ico
  +UninstallIcon uninst.ico 
  +EnabledBitmap tickyes.bmp 
  +DisabledBitmap tickno.bmp
  +
   LicenseText "You must read the following license before installing:"
  -LicenseData LICENSE
  +LicenseData INSTALLLICENSE
   ComponentText "This will install the Jakarta Tomcat 4.0 servlet container on your 
computer:"
   InstType Normal
   InstType Minimum
  @@ -183,11 +188,18 @@
   
   SectionEnd
   
  +Function .onInit
  +
  +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:
  +
  +FunctionEnd
  +
   Function .onInstSuccess
   
  -MessageBox MB_OK|MB_ICONEXCLAMATION \
  -  "If not done already, you need to set the JAVA_HOME environment\
  - variable and have it point to your JDK installation directory."
 MessageBox MB_YESNO|MB_ICONQUESTION \
"Setup has completed. View readme file now?" \
IDNO NoReadme
  
  
  

cvs commit: jakarta-tomcat-4.0/resources INSTALLLICENSE main.ico tickno.bmp tickyes.bmp uninst.ico

[remm]

remm01/07/15 12:17:32

  Added:   resources INSTALLLICENSE main.ico tickno.bmp tickyes.bmp
uninst.ico
  Log:
  - Add additional icons and resources.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-4.0/resources/INSTALLLICENSE
  
  Index: INSTALLLICENSE
  ===
  ==
   
 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:  
   
  1. Redistributions of source code  must retain the above copyright notice
 notice, this list of conditions and the following disclaimer. 
   
  2. Redistributions  in binary  form  must  reproduce the  above copyright
 notice,  this list of conditions  and the following  disclaimer in the
 documentation and/or other materials provided with the distribution.  
   
  3. The end-user documentation  included with the redistribution,  if any,
 must include the following acknowlegement:
   
"This product includes  software developed  by the Apache  Software
 Foundation ." 
   
 Alternately, this acknowlegement may appear in the software itself, if
 and wherever such third-party acknowlegements normally appear.
   
  4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software
 Foundation"  must not be used  to endorse or promote  products derived
 from this  software without  prior  written  permission.  For  written
 permission, please contact <[EMAIL PROTECTED]>.   
   
  5. Products derived from this software may not be called "Apache" nor may
 "Apache" appear in their names without prior written permission of the
 Apache Software Foundation.   
   
  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 
  OR IMPLIED WARRANTIES INCLUDING, BUT NOT LIMITED TO,  
  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
  FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT 
  SHALL THE APACHE  SOFTWARE  FOUNDATION OR  ITS 
  CONTRIBUTORS  BE LIABLE  FOR ANY DIRECT,  INDIRECT,   
  INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL
  DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT 
  OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE,  DATA,  
  OR PROFITS;  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND  
  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT,
  STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR 
  OTHERWISE) ARISING IN ANY  WAY  OUT OF  THE  USE OF  THIS  
  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 .  
   
  ==
  
  
  
  1.1  jakarta-tomcat-4.0/resources/main.ico
  
<>
  
  
  1.1  jakarta-tomcat-4.0/resources/tickno.bmp
  
<>
  
  
  1.1  jakarta-tomcat-4.0/resources/tickyes.bmp
  
<>
  
  
  1.1  jakarta-tomcat-4.0/resources/uninst.ico
  
<>
  
  

Re: Tomcat 4 installer - testers needed

[Remy Maucherat]

> > 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.
> > 
> 
> kind of an unrelated question, but ... is there a jar file or something
> that can be distributed with tomcat that contains the compiler stuff so
> that only the jre is needed, not the jdk?  i think i've heard you cannot
> distribute tools.jar (where i think the compiler is).

Yes, we indeed cannot redistribute tools.jar (g).

Remy

Re: Tomcat 4 installer - testers needed

[kevin seguin]

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

kind of an unrelated question, but ... is there a jar file or something
that can be distributed with tomcat that contains the compiler stuff so
that only the jre is needed, not the jdk?  i think i've heard you cannot
distribute tools.jar (where i think the compiler is).

-kevin.

RE: Alternative to NSI

[Rob S.]

There's a free~ish version of Wise I think... isn't that what Apache(httpd)
uses?

Either way Remy, I tried the install last nite (NSI) and it worked fine.
Looks pretty cool too =)

- r

> -Original Message-
> From: Remy Maucherat [mailto:[EMAIL PROTECTED]]
> Sent: Sunday, July 15, 2001 1:55 AM
> To: [EMAIL PROTECTED]
> Subject: Re: Alternative to NSI
>
>
> 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: Alternative to NSI

[hiten pandya]

hi all,
talking about alternatives, there is a program called DemoSheild from InstallShield which is free and can be used to make msi install scripts.
There is another program called 'Setup Factory 5.0' which has some very advanced features like regisrty editing, inf. file editing, setting run-time env. variables and stuff,,
 
just saying, i have got the setup factory program, if u would like me to make an example copy of it.
Thanx in advance,
Hiten Pandya
[EMAIL PROTECTED]
--

From: Remy Maucherat <[EMAIL PROTECTED]>
Reply-To: [EMAIL PROTECTED] 
To: [EMAIL PROTECTED] 
Subject: Re: Alternative to NSI 
Date: Sat, 14 Jul 2001 22:54:36 -0700 (PDT) 
MIME-Version: 1.0 
Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id MHotMailBD1A7B2200CA4004311F40D02A290A770; Sat, 14 Jul 2001 22:54:42 -0700 
Received: (qmail 95669 invoked by uid 500); 15 Jul 2001 05:54:27 - 
Received: (qmail 95657 invoked from network); 15 Jul 2001 05:54:27 - 
From tomcat-dev-return-24471-h_pandya5 Sat, 14 Jul 2001 22:56:07 -0700 
Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm 
Precedence: bulk 
list-help: 
list-unsubscribe: 
list-post: 
Delivered-To: mailing list [EMAIL PROTECTED] 
X-Authentication-Warning: kali.betaversion.org: nobody set sender to [EMAIL PROTECTED] using -f 
Message-ID: <[EMAIL PROTECTED]> 
References: <[EMAIL PROTECTED]>
In-Reply-To: <[EMAIL PROTECTED]>
User-Agent: IMP/PHP IMAP webmail program 2.2.2 
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N 

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 
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.

RE: Tomcat 4 installer - testers needed

[hiten pandya]

hello Remy,
i have an idea for that problem of urs; if one can open the autoexec.bat or startup.bat(tomcat startup script), then we can directly insert the environment variables at run-time.  
how bout that?
thanx in advance
Hiten Pandya(15)
[EMAIL PROTECTED] 

From: Remy Maucherat <[EMAIL PROTECTED]>
Reply-To: [EMAIL PROTECTED] 
To: [EMAIL PROTECTED] 
Subject: RE: Tomcat 4 installer - testers needed 
Date: Sat, 14 Jul 2001 23:23:46 -0700 (PDT) 
MIME-Version: 1.0 
Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id MHotMailBD1A81FF0011400438DD40D02A2905DD0; Sat, 14 Jul 2001 23:24:00 -0700 
Received: (qmail 8132 invoked by uid 500); 15 Jul 2001 06:23:42 - 
Received: (qmail 8120 invoked from network); 15 Jul 2001 06:23:41 - 
From tomcat-dev-return-24473-h_pandya5 Sat, 14 Jul 2001 23:24:05 -0700 
Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm 
Precedence: bulk 
list-help: 
list-unsubscribe: 
list-post: 
Delivered-To: mailing list [EMAIL PROTECTED] 
X-Authentication-Warning: kali.betaversion.org: nobody set sender to [EMAIL PROTECTED] using -f 
Message-ID: <[EMAIL PROTECTED]> 
References: <[EMAIL PROTECTED]> 
In-Reply-To: <[EMAIL PROTECTED]> 
User-Agent: IMP/PHP IMAP webmail program 2.2.2 
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N 

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 
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.

Re: [DOC] Vote on oustanding doc issues?

[Adam Fowler]

Ah-ha! the culprit!!! 8o)

Adam.

On Friday 13 July 2001 03:36, you wrote:
> Adam Fowler at [EMAIL PROTECTED] wrote:
> > *being random* The RPM of tc4 worked great on Mandrake 8.0 beta 3.
> >
> > Incidentally, the tc4 docs suck. I had to read deeply into the config
> > files to find out how to get it working with apache. This is fine for a
> > seasoned admin, but the general web community wouldn't have a clue (By
> > that I refer to the quantity of mails in tomcat-user!) 8o)
> >
> > We could do with better tc4 docs.
>
> If you're talking about how to set up tomcat with apache, that's my fault
> :)
>
> Pier

Re: Tomcat 4 installer - testers needed

[Stephane Bailliez]

- Original Message -
From: "Remy Maucherat" <[EMAIL PROTECTED]>

> 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's a breeze to install on Win2K.

Congratulation for taking the time to do it Remy, I'm sure that many people
will appreciate this install.

There's somewhat a cosmetic problem for the ASF license display but that's
really no big deal.

Cheers,

Stephane.

Re: [DOC] TOC - thoughts

[Adam Fowler]

Hi

Everyone on the TomcatBook project (Hitchhiker's guide to tomcat 8o) ) are 
using DocBook too.

ATM we are only producing an appendix for tomcat 4 (Well, I am) but I would 
like to see it evolve into a separate Document.

The reason it is only an appendix ATM is that 4.0 hasn't been deployed widely 
like 3.2.x yet. So my job is detailing all of the differences in 
configuration and deployment.

There is a list of authors for TomcatBook at
http://sourceforge.net/docman/?group_id=26042

As I say, I'm the only Tomcat 4 guy ATM.

I'd be glad to work with you on this and share thoughts etc. If you'd like.

Is this documentation going to be used on the jakarta-tomcat site? If so who 
can commit the documents? Also, TomcatBook are using the GNU FDL so if 
apache's license is more restrictive that could be a problem (why 
documentation is covered by apache's software license I don't know!)

I know Alex on the tomcat-dev list is also doing documentation. My advice is 
to also go and join tomcatbook at groups.yahoo.com/group/tcbook as this is a 
good place to ask questions about such things.

Do you know of a good editor for DocBook? I know AbiWord should do it.

I also have the task of converting our projects docs to html for our site 
(http://tomcatbook.sourceforge.net) and am using jboss. I'm having issue with 
converting someon's build.bat file to a nice build.sh file though. Any help 
is much appreciated.

I have a mandrake 8.0 machine here with tc 4 installed and am currently 
working on getting it communicating with apache 1.3.x then once that is 
working i'll switch to 2.0 and get info on that.

Drop me a line with your thoughts either on tomcat-dev or at [EMAIL PROTECTED]

Regards,
Adam.

 
Adam Fowler 
Help Desk Live Project 
Information Services 
University of Wales, Aberystwyth 
Web guy+author on the TomcatBook Project 
http://tomcatbook.sourceforge.net 
e-mail: [EMAIL PROTECTED] 
 


On Friday 13 July 2001 21:49, you wrote:
> hello adam,
>
> i am planning to use docbook,
> and i will post my first *.tar.gz file containing the tomcat documentation
> next week on [EMAIL PROTECTED] mailing list.
>
> i am currently working on making the following...
>
> - Preface
> - Authors
> (I need some info and help on this, such as who to put inc. me)
>
> - Admin Guide.
>
> Once the admin guide is done, i will start to work on the developer's
> guide, cause the admin guide is kinda more important.
>
> To just clear things off, i am working on the Tomcat 4.0 documentation,
> while other might be working on the Tomcat 3.2/.3 documentation,
>
> the reason is, that tomcat4 is going to be the next major release; so its
> better if i and a couple of others start preparing tomcat4 documentation.
> The following are the specifications of the document.
>
> 1)It is a manual, that it contains three books (part I,II,III
> respectively). The three are admin guide, dev. guide and application
> developer's guide.
>
> 2)I am making it with DocBook XML 4.1.2. I am producing two layouts at the
> moment, which are: .PDF and .HTML, including .txt as well.
>
> 3)Some people told me that to work with Anakia DTD but i have been working
> with DocBook for roun bout three years, and i am quite used to it; so if
> anyone would like to convert it to different formats, i will pass the
> Documentation source to them, so they can keep the anakia version. as well
> as i am producing an .xhtml transformation as well, so it will be easier
> for people using anakia to convert it.
>
> 4)I am very confused about how to arrange the authors and collaborators
> list because i dont want anyone who has contributed to be left out in any
> manney, nor would they like it. so i need some help on that as well.
>
> 5)Can i change the docbook stylesheet to accept my own coloring
> information?.
>
> Thanx in advance.
>
> Hiten Pandya (15)
> [EMAIL PROTECTED]
>
> Open to suggestions as always...
>
> ---
> From: Adam Fowler <[EMAIL PROTECTED]>
> Reply-To: [EMAIL PROTECTED]
> To: [EMAIL PROTECTED]
> Subject: Re: [DOC] TOC - thoughts
> Date: Wed, 11 Jul 2001 17:38:58 +
> MIME-Version: 1.0
> Received: from [64.208.42.41] by hotmail.com (3.2) with ESMTP id
> MHotMailBD17B73600734004319E40D02A29087A0; Thu, 12 Jul 2001 20:34:14 -0700
> Received: (qmail 15256 invoked by uid 500); 13 Jul 2001 03:12:01 -
> Received: (qmail 10554 invoked from network); 11 Jul 2001 16:39:06 -
> From tomcat-dev-return-24412-h_pandya5 Thu, 12 Jul 2001 20:34:56 -0700
> Mailing-List: contact [EMAIL PROTECTED]; run by ezmlm
> Precedence: bulk
> list-help: 
> list-unsubscribe: 
> list-post: 
> Delivered-To: mailing list [EMAIL PROTECTED]
> Delivered-To: moderator for [EMAIL PROTECTED]
> X-Mailer: KMail [version 1.2]
> References: <[EMAIL PROTECTED]>
> <[EMAIL PROTECTED]> <[EMAIL PROTECTED]>
> In-Reply-To: <[EMAIL PROTECTED]>
> Message

Re: [DOC] TOC - thoughts

[Adam Fowler]

Yup that's correct.

It does work OK with 8.0 +

Thanks for the fix - I'll put it on my site.

Adam.

 
Adam Fowler 
Help Desk Live Project 
Information Services 
University of Wales, Aberystwyth 
Web guy+author on the TomcatBook Project 
http://tomcatbook.sourceforge.net 
e-mail: [EMAIL PROTECTED] 
 

On Friday 13 July 2001 08:24, you wrote:
> >Putting little notes about things like the JDK 1.3.1 linux
> >issue are VERY
> >useful. I hate it when M$ have docs that don't mention things
> >such as "none
> >of your data is encrypted, by the way"
>
> JDK 1.3.1 problems with recent glibc could be fixed by adding :
>
> export LD_ASSUME_KERNEL=2.2.5
>
> IBM JDK 1.3 works perfectly under Redhat 7.1 (may be also MDK 8.0)

-- 

Re: Jasper and parsed tree

[Pier P. Fumagalli]

Jon Stevens at [EMAIL PROTECTED] wrote:

> on 7/13/01 1:49 PM, "Glenn Nielsen" <[EMAIL PROTECTED]> wrote:
> 
>> To me this seems a bit off topic for the list.  This list is for Tomcat
>> development.  Tomcat implements the Servlet and JSP specifications.  The
>> below has nothing to do with Tomcat development IMHO.
>> 
>> Regards,
>> 
>> Glenn
> 
> Yea, we told him that about a month ago, but it didn't stick.
> 
> Brad likes to advertise his stuff on other people's lists just so that he
> can get someone interested in what he is doing. :-(

Should I remove him from the "bypass moderation" pile ??? :)

Pier

Re: What if your message doesn't make to this list...

[Pier P. Fumagalli]

Jon Stevens at [EMAIL PROTECTED] wrote:

> on 7/13/01 12:57 PM, "Christopher Cain" <[EMAIL PROTECTED]> wrote:
> 
>> 
>> "Pier P. Fumagalli" wrote:
>>> 
>>> I got pretty upset with a couple of guys whose messages along the lines of
>>> "fix my servlet", and who asked me WHY I rejected those posts...
>> [snip]
>> 
>> I have a quick question, more out of idle curiosity than anything else.
>> I assume that only posts from non-subscribers are being moderated, yes?
> 
> Correct.
> 
> If Pier had to moderate every single email to the list, that would be messy.
> :-)

Nope... Not correct... All posts are moderated until I don't explicitly
define that messages from a specified email address can bypass it...

After I approve a message from someone after 2/3 times, I usually add them
to the "bypass moderation" pile, but it doesn't happen automatically when
you subscribe...

Pier

Re: What if your message doesn't make to this list...

[Pier P. Fumagalli]

Jon Stevens at [EMAIL PROTECTED] wrote:

> on 7/13/01 8:57 AM, "Pier P. Fumagalli" <[EMAIL PROTECTED]> wrote:
> 
>> I got pretty upset with a couple of guys whose messages along the lines of
>> "fix my servlet", and who asked me WHY I rejected those posts...
>> 
>> Now, let me explain... This mailing list is related to the CODE in Tomcat,
>> and its development and I will reject ANY post related to configuration
>> issues/servlet writing hints and so on, as they are OFF-TOPIC here...
>> 
>> If you have a problem related to Tomcat, and you're not absolutely sure that
>> it is, indeed, a bug in Tomcat, use the USERS mailing list.
>> 
>> If you have a problem related to generic servlet composition, help on
>> writing servlets and JSPs, go off to some other mailing list (such as the
>> servlet interest mailing list at java.sun.com).
>> 
>> And complaining doesn't help - at all.
>> 
>>   Pier
> 
> The funny thing is that those boneheads didn't bother to read:
> 
> 
> 
> Pier, when I get moderation requests for messages, I now just auto include
> the following string (using the applescripts you gave me):
> 
> "Please post from the account that you subscribed with."
> 
> In most cases, I don't see the person re-post. This is because people are
> lazy and don't want to subscribe to a mailing list to ask their question.
> Fuck em.

I'm talking about real boneheads who subscribe and then post things like
"Please, fix my servlet since it doesn't work"... And after few months, I
got pretty tired :)

Fuck em.

Re: [DOC] TOC - thoughts

[Pier P. Fumagalli]

Christopher Cain at [EMAIL PROTECTED] wrote:
> 
> IMNSHO, that kernel flag workaround is a joke. I almost fell out of my
> chair with laughter when I first read that proposed "solution" on the
> Sun forums. "Hey, our JDK makes some faulty assumptions about memory
> allocation and threading ... the solution is to direct Java to use the
> antiquated threading libraries indefinitely." LOL ... excellent
> "solution." Better still, it is STILL not fixed AFAIK (I d/led the
> latest release a few weeks ago). Even better than that, the hokey flag
> trick did not even WORK when I tried it the first week that all went
> down (dunno if it does now).
> 
> The IBM JDK originally had the same problem, but was fixed literally
> within one week of Redhat 7.1 release. From what I've heard, it works on
> all distros without problem. Mad props to IBM for the extrememly quick
> fix, and for supporting its developers the right way. IBM rocks for Java
> support. (Jikes is an absolute Godsend.)

I believe that, instead of blaming Sun for not putting out a workaround to
that bug, probably the one to blame is RedHat for putting out such a buggy
OS. I had to work around some issues with that OS myself writing the Service
code, and definitely, I wouldn't trust that "thing" not even to drive my
coffee pot, but, of course, that's me. Get a decent and "real" OS, don't
fight with those issues (Solaris 8 on x86 is far better, IMVHO, and it's
downloadable for free... S...)

Pier

Re: cvs commit: jakarta-tomcat-connectors/webapp Makedefs.inMakefile.in configure.in

[Pier P. Fumagalli]

Jon Stevens at [EMAIL PROTECTED] wrote:

> on 7/12/01 7:06 PM, "[EMAIL PROTECTED]" <[EMAIL PROTECTED]> wrote:
> 
>> pier01/07/12 19:06:33
>> 
>> Modified:webapp   Makedefs.in Makefile.in configure.in
>> Log:
>> Modified build procedure (now building also Java files).
>> 
> 
> Pier,
> 
> You should have the Makefile just call Ant in order to build the Java code.
> Much less messy over the long term.

The java code in the Jakarta-Tomcat-Connectors CVS is considered to be a
"work in progress". Once a release is made, and the code is considered
stable, it'll be moved over to the "jakarta-tomcat-4.0" repository, where
ANT already builds it... I want to keep jtc as a development CVS tree, and
jt4 as a stable tree (more or less how they do it in freebsd)

Pier

cvs commit: jakarta-tomcat-connectors/webapp Makefile.in README.txt configure.in

[pier]

pier01/07/15 01:44:50

  Modified:webapp   Makefile.in README.txt configure.in
  Log:
  Fixes in build process (and documented).
  
  Revision  ChangesPath
  1.11  +4 -8  jakarta-tomcat-connectors/webapp/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in   2001/07/13 02:27:47 1.10
  +++ Makefile.in   2001/07/15 08:44:49 1.11
  @@ -56,21 +56,17 @@
   # = #
   
   # @author  Pier Fumagalli 
  -# @version $Id: Makefile.in,v 1.10 2001/07/13 02:27:47 pier Exp $
  +# @version $Id: Makefile.in,v 1.11 2001/07/15 08:44:49 pier Exp $
   
   include @SRCDIR@/Makedefs
   
   LOCALDIRS = @TGTDIRS@ @TARGET@
   APRDIR = @APRDIR@
   
  -CFGS = config.cache \
  +CFGS = @CONFIGFILES@ \
  + config.cache \
config.log \
  - config.status \
  - Makedefs \
  - Makefile \
  - lib/Makefile \
  - apache-1.3/Makefile \
  - java/Makefile
  + config.status
   
   all: apr_all local_all
   
  
  
  
  1.7   +1 -1  jakarta-tomcat-connectors/webapp/README.txt
  
  Index: README.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/README.txt,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- README.txt2001/07/13 02:05:43 1.6
  +++ README.txt2001/07/15 08:44:49 1.7
  @@ -42,7 +42,7 @@
   want to use them instead of checking them out from CVS, you can
   specify where these can be found.
   
  ---with-java=DIR
  +--with-jdk=DIR
   If the JAVA_HOME environment variable has not been set, you will
   need to specify this option on the command line for the configure
   script in order to compile the Java portion of WebApp.
  
  
  
  1.17  +14 -4 jakarta-tomcat-connectors/webapp/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure.in  2001/07/13 02:51:36 1.16
  +++ configure.in  2001/07/15 08:44:49 1.17
  @@ -58,7 +58,7 @@
   dnl --
   dnl Author Pier Fumagalli 
   dnl Author Jon S. Stevens 
  -dnl Version $Id: configure.in,v 1.16 2001/07/13 02:51:36 pier Exp $
  +dnl Version $Id: configure.in,v 1.17 2001/07/15 08:44:49 pier Exp $
   dnl --
   
   dnl --
  @@ -137,10 +137,13 @@
 [
   AC_MSG_RESULT([enabling debug output])
   CFLAGS="$CFLAGS -DDEBUG"
  +DEBUG="true"
 ],[
   AC_MSG_RESULT([disabling debug output])
  +DEBUG="false"
 ]
   )
  +AC_SUBST(DEBUG)
   
   dnl -
   dnl Check JAVA environment
  @@ -291,10 +294,17 @@
   dnl Defining variables used by Make
   dnl --
   CFLAGS="-Wall ${CFLAGS}"
  -CPPFLAGS="-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}"
  -TGTDIRS="${SRCDIR}/java ${SRCDIR}/lib"
   AC_SUBST(CFLAGS)
  +
  +CPPFLAGS="-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}"
   AC_SUBST(CPPFLAGS)
  +
  +TGTDIRS="${SRCDIR}/java ${SRCDIR}/lib"
   AC_SUBST(TGTDIRS)
  +
  +CONFIGFILES="./Makedefs ./Makefile ./lib/Makefile ./java/Makefile"
  +CONFIGFILES="$CONFIGFILES ./java/Constants.java ${makefile}"
  +AC_SUBST(CONFIGFILES)
  +
  +AC_OUTPUT(${CONFIGFILES})
   
  -AC_OUTPUT(./Makedefs ./Makefile ./lib/Makefile ./java/Makefile ${makefile})
  
  
  

cvs commit: jakarta-tomcat-connectors/webapp/include wa.h

[pier]

pier01/07/15 01:44:11

  Modified:webapp/include wa.h
  Log:
  Boolean is an enumeration now.
  
  Revision  ChangesPath
  1.10  +5 -2  jakarta-tomcat-connectors/webapp/include/wa.h
  
  Index: wa.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- wa.h  2001/06/07 09:40:27 1.9
  +++ wa.h  2001/07/15 08:44:11 1.10
  @@ -57,7 +57,7 @@
   
   /**
* @author  Pier Fumagalli 
  - * @version $Id: wa.h,v 1.9 2001/06/07 09:40:27 jfclere Exp $
  + * @version $Id: wa.h,v 1.10 2001/07/15 08:44:11 pier Exp $
*/
   #ifndef _WA_H_
   #define _WA_H_
  @@ -83,7 +83,10 @@
   #include 
   
   /* WebApp Library type definitions. */
  -typedef int wa_boolean;
  +typedef enum {
  +wa_false,
  +wa_true,
  +} wa_boolean;
   
   typedef struct wa_chain wa_chain;
   
  
  
  

cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c

[pier]

pier01/07/15 01:43:43

  Modified:webapp/apache-1.3 mod_webapp.c
  Log:
  Properly declared true/false.
  
  Revision  ChangesPath
  1.19  +4 -4  jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
  
  Index: mod_webapp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_webapp.c  2001/07/13 01:12:44 1.18
  +++ mod_webapp.c  2001/07/15 08:43:43 1.19
  @@ -57,7 +57,7 @@
   
   /**
* @author  Pier Fumagalli 
  - * @version $Id: mod_webapp.c,v 1.18 2001/07/13 01:12:44 pier Exp $
  + * @version $Id: mod_webapp.c,v 1.19 2001/07/15 08:43:43 pier Exp $
*/
   
   #include 
  @@ -76,7 +76,7 @@
   /* Module declaration */
   module MODULE_VAR_EXPORT webapp_module;
   /* Wether the WebApp Library has been initialized or not */
  -static wa_boolean wam_initialized=FALSE;
  +static wa_boolean wam_initialized=wa_false;
   /* The list of configured connections */
   static wa_chain *wam_connections=NULL;
   /* The main server using for logging error not related to requests */
  @@ -97,7 +97,7 @@
   static void wam_shutdown(void *nil) {
   if (!wam_initialized) return;
   wa_shutdown();
  -wam_initialized=FALSE;
  +wam_initialized=wa_false;
   }
   
   /* Initialize the module and the WebApp Library */
  @@ -107,7 +107,7 @@
   if(wam_initialized) return(NULL);
   if ((ret=wa_init())!=NULL) return(ret);
   ap_register_cleanup(p,NULL,wam_shutdown,NULL);
  -wam_initialized=TRUE;
  +wam_initialized=wa_true;
   return(NULL);
   }
   
  
  
  

cvs commit: jakarta-tomcat-connectors/webapp/java Constants.java.in Constants.java

[pier]

pier01/07/15 01:42:36

  Added:   webapp/java Constants.java.in
  Removed: webapp/java Constants.java
  Log:
  Now --enable-debug processes also the Java side.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/webapp/java/Constants.java.in
  
  Index: Constants.java.in
  ===
  /* = *
   *   *
   * The Apache Software License,  Version 1.1 *
   *   *
   *  Copyright (c) 1999-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:   *
   *   *
   * 1. Redistributions of source code  must retain the above copyright notice *
   *notice, this list of conditions and the following disclaimer.  *
   *   *
   * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
   *notice,  this list of conditions  and the following  disclaimer in the *
   *documentation and/or other materials provided with the distribution.   *
   *   *
   * 3. The end-user documentation  included with the redistribution,  if any, *
   *must include the following acknowlegement: *
   *   *
   *   "This product includes  software developed  by the Apache  Software *
   *Foundation ."  *
   *   *
   *Alternately, this acknowlegement may appear in the software itself, if *
   *and wherever such third-party acknowlegements normally appear. *
   *   *
   * 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software *
   *Foundation"  must not be used  to endorse or promote  products derived *
   *from this  software without  prior  written  permission.  For  written *
   *permission, please contact <[EMAIL PROTECTED]>.*
   *   *
   * 5. Products derived from this software may not be called "Apache" nor may *
   *"Apache" appear in their names without prior written permission of the *
   *Apache Software Foundation.*
   *   *
   * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
   * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
   * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
   * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
   * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
   * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
   * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
   * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
   * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
   * ANY  WAY  OUT OF  THE  USE OF  THIS  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 .   *
   *   *
   * = */
  package org.apache.catalina.connector.warp;
  
  public class Constants {

cvs commit: jakarta-tomcat-connectors/webapp/java .cvsignore WarpConfigurationHandler.java WarpConnection.java WarpPacket.java

[pier]

pier01/07/15 01:40:59

  Modified:webapp/java .cvsignore WarpConfigurationHandler.java
WarpConnection.java WarpPacket.java
  Log:
  Modified WARP/0.9 protocol.
  
  Revision  ChangesPath
  1.3   +1 -0  jakarta-tomcat-connectors/webapp/java/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore2001/07/13 02:33:23 1.2
  +++ .cvsignore2001/07/15 08:40:58 1.3
  @@ -1,4 +1,5 @@
   .DS_Store
  +Constants.java
   Makefile
   org
   warp.jar
  
  
  
  1.5   +10 -0 
jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java
  
  Index: WarpConfigurationHandler.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WarpConfigurationHandler.java 2001/07/13 03:05:22 1.4
  +++ WarpConfigurationHandler.java 2001/07/15 08:40:58 1.5
  @@ -78,6 +78,16 @@
   packet.writeUnsignedShort(Constants.VERS_MINOR);
   packet.writeInteger(-1);
   connection.send(packet);
  +
  +connection.recv(packet);
  +String appl=packet.readString();
  +String host=packet.readString();
  +int port=packet.readUnsignedShort();
  +String path=packet.readString();
  +
  +if (Constants.DEBUG)
  +connection.getConnector().debug(this,"Deploying application \""+appl+
  +"\" under \"http://"+host+":"+port+path);
   
   return(true);
   //while (true) {
  
  
  
  1.13  +35 -4 jakarta-tomcat-connectors/webapp/java/WarpConnection.java
  
  Index: WarpConnection.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConnection.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WarpConnection.java   2001/07/13 03:05:23 1.12
  +++ WarpConnection.java   2001/07/15 08:40:58 1.13
  @@ -201,10 +201,11 @@
*/
   public void send(WarpPacket packet)
   throws IOException {
  -if (Constants.DEBUG)
  -this.getConnector().debug(this,"Sending packet TYPE="+
  -  packet.getType()+" LENGTH="+
  -  packet.size);
  +if (Constants.DEBUG) {
  +this.getConnector().debug(this,">> TYPE="+packet.getType()+
  +   " LENGTH="+packet.size);
  +this.getConnector().debug(this,">> "+packet.dump());
  +}
   
   this.output.write(packet.getType()&0x0ff);
   this.output.write((packet.size>>8)&0x0ff);
  @@ -217,5 +218,35 @@
   /**
* Receive a WARP packet over this connection.
*/
  +public void recv(WarpPacket packet)
  +throws IOException {
  +int t=this.input.read();
  +int l1=this.input.read();
  +int l2=this.input.read();
   
  +if ((t|l1|l2)==-1)
  +throw new IOException("Premature packet header end");
  +
  +packet.reset();
  +packet.setType(t&0x0ff);
  +packet.size=(( l1 & 0x0ff ) << 8) | ( l2 & 0x0ff );
  +
  +if (packet.size>0) {
  +int off=0;
  +int ret=0;
  +while (true) {
  +ret=this.input.read(packet.buffer,off,packet.size-off);
  +if (ret==-1) 
  +throw new IOException("Premature packet payload end");
  +off+=ret;
  +if(off==packet.size) break;
  +}
  +}
  +
  +if (Constants.DEBUG) {
  +this.getConnector().debug(this,"<< TYPE="+packet.getType()+
  +   " LENGTH="+packet.size);
  +this.getConnector().debug(this,"<< "+packet.dump());
  +}
  +}
   }
  
  
  
  1.11  +20 -1 jakarta-tomcat-connectors/webapp/java/WarpPacket.java
  
  Index: WarpPacket.java
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpPacket.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WarpPacket.java   2001/07/13 03:05:25 1.10
  +++ WarpPacket.java   2001/07/15 08:40:58 1.11
  @@ -218,9 +218,28 @@
   public String readString() {
   int length=this.readUnsignedShort();
   try {
  -return(new String(this.buffer,this.pointer,length,"UTF-8"));
  +String ret=new String(this.buffer,this.pointer,length,"UTF-8");
  + 

cvs commit: jakarta-tomcat-connectors/webapp/lib pr_warp.c wa_request.c

[pier]

pier01/07/15 01:39:58

  Modified:webapp/lib pr_warp.c wa_request.c
  Log:
  Modified WARP provider to avoid storing WARP HOST IDs (redundant) and new
  configuration scheme.
  
  Revision  ChangesPath
  1.6   +332 -73   jakarta-tomcat-connectors/webapp/lib/pr_warp.c
  
  Index: pr_warp.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pr_warp.c 2001/07/13 02:19:44 1.5
  +++ pr_warp.c 2001/07/15 08:39:58 1.6
  @@ -37,8 +37,7 @@
*   *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
  - * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
  - * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
  +2 * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
* DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
* DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
  @@ -55,7 +54,7 @@
*   *
* = */
   
  -/* @version $Id: pr_warp.c,v 1.5 2001/07/13 02:19:44 pier Exp $ */
  +/* @version $Id: pr_warp.c,v 1.6 2001/07/15 08:39:58 pier Exp $ */
   #include 
   
   /* * */
  @@ -63,83 +62,350 @@
   /* * */
   
   /* The WARP connection configuration structure */
  -typedef struct warp_cconfig {
  +typedef struct warp_config {
   apr_sockaddr_t *addr;
   apr_socket_t *sock;
  -wa_boolean disc;
  -} warp_cconfig;
  +int serv;
  +} warp_config;
   
  -/* The WARP application configuration structure */
  -typedef struct warp_aconfig {
  -int host;
  -int appl;
  -wa_boolean depl;
  -} warp_aconfig;
  +/* The WARP packet structure */
  +typedef struct warp_packet {
  +apr_pool_t *pool;
  +int type;
  +int size;
  +int curr;
  +char buff[65536];
  +} warp_packet;
  +
  +/* WARP definitions */
  +#define VERS_MAJOR 0
  +#define VERS_MINOR 9
  +
  +#define TYPE_INVALID -1
  +#define TYPE_ERROR   0x00
  +#define TYPE_FATAL   0xff
  +
  +#define TYPE_CONF_WELCOME 0x01
  +#define TYPE_CONF_DEPLOY  0x02
  +#define TYPE_CONF_APPLIC  0x03
  +#define TYPE_CONF_DONE0x04
   
  +
   /* The list of all configured connections */
   static wa_chain *warp_connections=NULL;
  +/* The list of all deployed connections */
  +static wa_chain *warp_applications=NULL;
   /* This provider */
   wa_provider wa_provider_warp;
   
   /* * */
  +/* PACKET FUNCTIONS  */
  +/* * */
  +static void p_reset(warp_packet *pack) {
  +pack->type=TYPE_INVALID;
  +pack->type=TYPE_INVALID;
  +pack->size=0;
  +pack->curr=0;
  +pack->buff[0]='\0';
  +}
  +
  +static warp_packet *p_create(apr_pool_t *pool) {
  +warp_packet *pack=NULL;
  +
  +if (pool==NULL) return(NULL);
  +pack=(warp_packet *)apr_palloc(pool,sizeof(warp_packet));
  +pack->pool=pool;
  +p_reset(pack);
  +return(pack);
  +}
  +
  +static wa_boolean p_read_ushort(warp_packet *pack, int *x) {
  +int k=0;
  +
  +if ((pack->curr+2)>=pack->size) return(wa_false);
  +k=(pack->buff[pack->curr++]&0x0ff)<<8;
  +k=k|(pack->buff[pack->curr++]&0x0ff);
  +*x=k;
  +return(wa_true);
  +}
  +
  +static wa_boolean p_read_int(warp_packet *pack, int *x) {
  +int k=0;
  +
  +if ((pack->curr+2)>=pack->size) return(wa_false);
  +k=(pack->buff[pack->curr++]&0x0ff)<<24;
  +k=k|((pack->buff[pack->curr++]&0x0ff)<<16);
  +k=k|((pack->buff[pack->curr++]&0x0ff)<<8);
  +k=k|(pack->buff[pack->curr++]&0x0ff);
  +*x=k;
  +return(wa_true);
  +}
  +
  +static wa_boolean p_read_string(warp_packet *pack, char **x) {
  +int len=0;
  +
  +if (p_read_ushort(pack,&len)==wa_false) {
  +*x=NULL;
  +return(wa_false);
  +}
  +if ((pack->curr+len)>=pack->size) {
  +*x=NULL;
  +return(wa_false);
  +}
  +
  +*x=(char *)apr_palloc(pack->pool,(len+1)*sizeof(char));
  +if (*x==NULL) return(wa_false);
  +
  +apr_cpystrn(*x,&pack->buff[pack->curr],len);
  +pack->curr+=len;
  +return(wa_true);
  +}
  +
  +static wa_boolean p_write_ushort(warp_packet *pack, 

cvs commit: jakarta-tomcat-connectors/webapp/support apjava.m4

[pier]

pier01/07/15 01:38:50

  Modified:webapp/support apjava.m4
  Log:
  Now --with-java is --with-jdk (more explanatory)
  
  Revision  ChangesPath
  1.2   +4 -4  jakarta-tomcat-connectors/webapp/support/apjava.m4
  
  Index: apjava.m4
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/apjava.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apjava.m4 2001/07/13 02:05:11 1.1
  +++ apjava.m4 2001/07/15 08:38:49 1.2
  @@ -57,7 +57,7 @@
   
   dnl -
   dnl Author  Pier Fumagalli 
  -dnl Version $Id: apjava.m4,v 1.1 2001/07/13 02:05:11 pier Exp $
  +dnl Version $Id: apjava.m4,v 1.2 2001/07/15 08:38:49 pier Exp $
   dnl -
   
   AC_DEFUN([AP_PROG_JAVAC_WORKS],[
  @@ -91,8 +91,8 @@
   ])
   
   AC_DEFUN([AP_JAVA],[
  -  AC_ARG_WITH(java,
  -  [  --with-java=DIR Specify the location of your JDK installation],
  +  AC_ARG_WITH(jdk,
  +  [  --with-jdk=DIR Specify the location of your JDK installation],
 [
   AC_MSG_CHECKING([JAVA_HOME])
   if test -d "$withval"
  @@ -107,6 +107,6 @@
 ])
 if test x"$JAVA_HOME" = x
 then
  -AC_MSG_ERROR([Java Home not defined. Rerun with --with-java=[...] parameter])
  +AC_MSG_ERROR([Java Home not defined. Rerun with --with-jdk=[...] parameter])
 fi
   ])
  
  
  

cvs commit: jakarta-tomcat-4.0/resources tomcat.ico

[remm]

remm01/07/15 00:51:50

  Added:   resources tomcat.ico
  Log:
  - A few resources were moved around.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-4.0/resources/tomcat.ico
  
<>
  
  

cvs commit: jakarta-tomcat-4.0/catalina/src/conf server-noexamples.xml.config

[remm]

remm01/07/15 00:51:26

  Added:   catalina/src/conf server-noexamples.xml.config
  Log:
  - Add new configuration used for the examples-less installation.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config
  
  Index: server-noexamples.xml.config
  ===
  
  
  
  
  
  
  
  

  


  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  


  


  

  

  

  

  

  

  


  
  
  
  
  
  
  
  
  
  
  
  
  
  
  

  
  
  

  

  
  


  
  
  
  
  
  


  


  
  
  

  
  
  
  
  

cvs commit: jakarta-tomcat-4.0 tomcat.ico

[remm]

remm01/07/15 00:49:17

  Removed: .tomcat.ico
  Log:
  - A few resources were moved around.

cvs commit: jakarta-tomcat-4.0 build.xml

[remm]

remm01/07/15 00:49:09

  Modified:.build.xml
  Log:
  - A few resources were moved around.
  
  Revision  ChangesPath
  1.25  +1 -1  jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml 2001/07/13 23:15:28 1.24
  +++ build.xml 2001/07/15 07:49:08 1.25
  @@ -166,7 +166,7 @@
 
   
   
  -
  +
   
   
   
  
  
  

cvs commit: jakarta-tomcat-4.0 tomcat.nsi

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