DO NOT REPLY [Bug 30859] New: - index.jsp request not loading
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30859. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30859 index.jsp request not loading Summary: index.jsp request not loading Product: Tomcat 4 Version: 4.1.27 Platform: Sun OS/Version: Linux Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] hi I am getting the following error when i access any index.jsp . what do i miss here. any idea! Thanks in Advance Arun HTTP Status 500 - Internal Server Error type Exception report message Internal Server Error description The server encountered an internal error (Internal Server Error) that prevented it from fulfilling this request. exception javax.servlet.ServletException: org/apache/jsp/index_jsp (wrong name: index_jsp) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:249) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:247) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:256) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardContext.invoke(StandardContext.java:2416) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:180) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643) at org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve.java:171) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:172) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:577) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:641) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:174) at org.apache.catalina.core.StandardPipeline$StandardPipelineValveContext.invokeNext(StandardPipeline.java:643) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:480) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:995) at org.apache.ajp.tomcat4.Ajp13Processor.process(Ajp13Processor.java:466) at org.apache.ajp.tomcat4.Ajp13Processor.run(Ajp13Processor.java:585) at java.lang.Thread.run(Thread.java:536) root cause java.lang.NoClassDefFoundError: org/apache/jsp/index_jsp (wrong name: index_jsp) at java.lang.ClassLoader.defineClass0(Native Method) at java.lang.ClassLoader.defineClass(ClassLoader.java:502) at java.lang.ClassLoader.defineClass(ClassLoader.java:431) at org.apache.jasper.servlet.JasperLoader.loadClass(JasperLoader.java:215) at org.apache.jasper.servlet.JasperLoader.loadClass(JasperLoader.java:131) at org.apache.jasper.JspCompilationContext.load(JspCompilationContext.java:497) at org.apache.jasper.servlet.JspServletWrapper.getServlet(JspServletWrapper.java:150) at org.apache.jasper.compiler.Compiler.isOutDated(Compiler.java:440) at org.apache.jasper.compiler.Compiler.isOutDated(Compiler.java:390) at org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:471) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:190) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:295)
Mo_Obis/CIO/HHQ/HUD is out of the office.
I will be out of the office starting 08/18/2004 and will not return until 09/10/2004. I will respond to your message when I return June 8. Please contact Martha Cain on x8032 if you need assistance before then. TU, Mo
DO NOT REPLY [Bug 30869] New: - JAAS module name is not allowed in jaas.conf file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=30869.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=30869
JAAS module name is not allowed in jaas.conf file
Summary: JAAS module name is not allowed in jaas.conf file
Product: Tomcat 5
Version: 5.0.27
Platform: All
OS/Version: All
Status: NEW
Severity: Major
Priority: Other
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
When running with the JAASRealm, the container sets the JAAS application name to
be the container's name:
--- 8 --- JAASRealm.java --- 8 ---
public void setContainer(Container container) {
super.setContainer(container);
String name=container.getName();
if( appName==null ) {
appName=name;
log.info(Setting JAAS app name + appName);
}
}
--- 8 --- JAASRealm.java --- 8 ---
However, the container's name always starts with a /, which isn't an allowable
name in the JAAS specification:
--- 8 --- stdout --- 8 ---
...
INFO: Setting JAAS app name /MyApp
...
--- 8 --- stdout --- 8 ---
--- 8 --- jaas.conf --- 8 ---
/MyApp {
com.example.MyJAASLoginModule required;
};
--- 8 --- jaas.conf --- 8 ---
The Sun Security barfs at the '/' on leading MyApp, so it can't be speficied.
The default name 'Tomcat' doesn't work either, because the JAAS name has already
been set, and this cannot be set in the config file.
Instead, you have to use 'other' which is applicable to all apps in the application.
The fix would be to check whether there are any unprintable characters in the
application name, and if so, fix them. Of course, what constitutes an
unprintable character is up to Sun's Configuration parser, which probably isn't
that good.
A quick fix would be:
--- 8 --- JAASRealm.java.fix --- 8 ---
public void setContainer(Container container) {
super.setContainer(container);
String name=container.getName();
if( appName==null ) {
if (name.startsWith(/)) name.substring(1);
appName=name;
log.info(Setting JAAS app name + appName);
}
}
--- 8 --- JAASRealm.java.fix --- 8 ---
but in reality, you'd need to check for all other non-printable characters and
replace/delete them as appropriate, because a name may have other / characters
(e.g. /MyApp/Other).
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30869] - JAAS module name is not allowed in jaas.conf file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30869. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30869 JAAS module name is not allowed in jaas.conf file --- Additional Comments From [EMAIL PROTECTED] 2004-08-26 14:59 --- Of course, I meant 'name=name.substring(1)'. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30870] New: - Endless loop in Cookies.processCookies
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=30870.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=30870
Endless loop in Cookies.processCookies
Summary: Endless loop in Cookies.processCookies
Product: Tomcat 4
Version: 4.1.24
Platform: All
OS/Version: Other
Status: NEW
Severity: Critical
Priority: Other
Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
If cookieValue (indicated at ) is null the code will continue in an endless
loop. This has caused two of our servers to go to 99% cpu on the tomcat process.
public void processCookies( MimeHeaders headers ) {
if( headers==null )
return;// nothing to process
// process each cookie header
int pos=0;
while( pos=0 ) {
// Cookie2: version ? not needed
pos=headers.findHeader( Cookie, pos );
// no more cookie headers headers
if( pos0 ) break;
MessageBytes cookieValue=headers.getValue( pos );
if( cookieValue==null || cookieValue.isNull() ) continue;
// Uncomment to test the new parsing code
if( cookieValue.getType() == MessageBytes.T_BYTES ) {
if( dbg0 ) log( Parsing b[]: + cookieValue.toString());
ByteChunk bc=cookieValue.getByteChunk();
processCookieHeader( bc.getBytes(),
bc.getOffset(),
bc.getLength());
} else {
if( dbg0 ) log( Parsing S: + cookieValue.toString());
processCookieHeader( cookieValue.toString() );
}
pos++;// search from the next position
}
}
Should be something like:
if( cookieValue==null || cookieValue.isNull() ){
pos++;
continue;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30871] New: - Error when stop service in tomcat 5.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30871. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30871 Error when stop service in tomcat 5.0 Summary: Error when stop service in tomcat 5.0 Product: Tomcat 5 Version: 5.0.0 Platform: All OS/Version: Windows NT/2K Status: NEW Severity: Critical Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I have on class , call method for webservice, when stop service tomcat 5.0 , the method distroy this class not executed , this class implement the interface Servicelifecycle. In tomcat 4.1 dont' have this problem. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs setup.xml
idarwin 2004/08/26 09:25:35 Modified:webapps/docs setup.xml Log: Spelling and minor wording corrections Revision ChangesPath 1.9 +6 -6 jakarta-tomcat-catalina/webapps/docs/setup.xml Index: setup.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/setup.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- setup.xml 10 Aug 2004 09:33:33 - 1.8 +++ setup.xml 26 Aug 2004 16:25:34 - 1.9 @@ -33,8 +33,8 @@ installed as a Windows NT/2k/XP service no matter what setting is selected. Using the checkbox on the component page sets the service as auto -startup, so that Tomcat is automatically startup when Windows -starts. For optimal security, the service should be affected a +startup, so that Tomcat is automatically started when Windows +starts. For optimal security, the service should be run as a separate user, with reduced permissions (see the Windows Services administration tool and its documentation)./li listrongJava location/strong: The installer will use the registry @@ -59,8 +59,8 @@ /p pThe installer will create shortcuts allowing starting and configuring - Tomcat. It is important to note that Tomcat administration web - application can only be used when Tomcat is started./p + Tomcat. It is important to note that the Tomcat administration web + application can only be used when Tomcat is running./p /section @@ -108,8 +108,8 @@ /source pjsvc has other useful parameters, such as code-user/code which - causes to switch to another user after the daemon initialization is - complete. This allows, for example, running Tomcat as a non priviledged + causes it to switch to another user after the daemon initialization is + complete. This allows, for example, running Tomcat as a non privileged user while still being able to use privileged ports. codejsvc --help/code will return the full jsvc usage information. In particular, the code-debug/code option is useful - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30871] - Error when stop service in tomcat 5.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30871. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30871 Error when stop service in tomcat 5.0 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-08-26 16:27 --- You need to attach a test case if you want us to investigate. This feature works fine (and heavily tested in the Servlet TCKs).Re-open the bug once you have attached a test case. Thanks -- Jeanfrancois - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs deployer-howto.xml
idarwin 2004/08/26 09:34:06 Modified:webapps/docs deployer-howto.xml Log: Spelling and minor wording corrections Revision ChangesPath 1.6 +2 -2 jakarta-tomcat-catalina/webapps/docs/deployer-howto.xml Index: deployer-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/deployer-howto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- deployer-howto.xml30 Jul 2003 18:37:06 - 1.5 +++ deployer-howto.xml26 Aug 2004 16:34:06 - 1.6 @@ -29,7 +29,7 @@ section name=Introduction -pThe deployer, which as its name imply, allows deploying and undeploying web +pThe deployer, as its name implies, allows deploying and undeploying web applications to the Tomcat server, either statically (the application is setup before the server is started), or dynamically (in conjunction with the Tomcat Manager web application or manipulating already deployed applications). @@ -51,7 +51,7 @@ /p pContext descriptors allow defining all aspects and configuration parameters -of a Context, such as namign resources and session manager configuration. +of a Context, such as naming resources and session manager configuration. It should be noted that the docBase specified in the Context element can refer to either the .WAR or the directory which will be created when the .WAR is expanded or the .WAR itself./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30871] - Error when stop service in tomcat 5.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30871. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30871 Error when stop service in tomcat 5.0 --- Additional Comments From [EMAIL PROTECTED] 2004-08-26 16:53 --- Actually I think the user was claiming the Tomcat-proprietary lifecycle methods weren't firing, not the Servlet Spec ones. More information is needed. To the user: - Please discuss on the tomcat-user mailing list before filing an issue here. - If filing an issue, provide a reproducible test case. - In general, use standard portable interfaces (such as that of HttpServlet, which has its own init and destroy methods) rather than Tomcat-specific ones such as the Lifecycle. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/META-INF - New directory
remm2004/08/26 10:03:23 jakarta-tomcat-catalina/webapps/docs/META-INF - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/balancer/META-INF - New directory
remm2004/08/26 10:03:23 jakarta-tomcat-catalina/webapps/balancer/META-INF - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/META-INF context.xml
remm2004/08/26 10:03:35
Modified:.build.xml tomcat.nsi
resources/confinstall server_1.xml server_2.xml
resources jvm.ini
webapps/admin admin.xml
webapps/manager manager.xml
Added: webapps/balancer/META-INF context.xml
webapps/docs/META-INF context.xml
Removed: webapps/balancer balancer.xml
Log:
- Tweak webapps configurations.
- Update installer.
Revision ChangesPath
1.201 +0 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- build.xml 26 Aug 2004 00:21:10 - 1.200
+++ build.xml 26 Aug 2004 17:03:34 - 1.201
@@ -725,8 +725,6 @@
todir=${tomcat.build}/conf/Catalina/localhost /
copy file=${tomcat.build}/server/webapps/admin/admin.xml
todir=${tomcat.build}/conf/Catalina/localhost /
-copy file=${tomcat.build}/webapps/balancer/balancer.xml
- todir=${tomcat.build}/conf/Catalina/localhost /
/target
1.48 +46 -15jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- tomcat.nsi21 Aug 2004 15:31:53 - 1.47
+++ tomcat.nsi26 Aug 2004 17:03:34 - 1.48
@@ -76,9 +76,11 @@
LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet
container core.
LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start Tomcat
when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows
XP.
LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source
code.
-LangString DESC_SecTomcatDocs ${LANG_ENGLISH} Install the Tomcat documentation
bundle. This include documentation on the servlet container and its configuration
options, on the Jasper JSP page compiler, as well as on the native webserver
connectors.
LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for
Tomcat.
+LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat documentation
bundle. This include documentation on the servlet container and its configuration
options, on the Jasper JSP page compiler, as well as on the native webserver
connectors.
LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web
applications.
+LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web
application.
+LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web
applications (WebDAV, balancer, etc).
;Language
!insertmacro MUI_LANGUAGE English
@@ -113,17 +115,26 @@
SetOutPath $INSTDIR
File tomcat.ico
File LICENSE
- File /r bin
File /r common
- File /r conf
File /nonfatal /r shared
File /nonfatal /r logs
- File /r server
File /nonfatal /r work
File /nonfatal /r temp
+ SetOutPath $INSTDIR\bin
+ File bin\bootstrap.jar
+ File bin\commons-logging-api.jar
+ File bin\*.exe
+ SetOutPath $INSTDIR\conf
+ File conf\*.*
+ SetOutPath $INSTDIR\server
+ File /r server\lib
+ File /nonfatal /r server\classes
+ SetOutPath $INSTDIR\server\webapps
+ File /r server\webapps\manager
SetOutPath $INSTDIR\webapps
- File /r webapps\balancer
File /r webapps\ROOT
+ SetOutPath $INSTDIR\conf\Catalina\localhost
+ File conf\Catalina\localhost\manager.xml
IfSilent 0 +3
Call findJavaPath
@@ -182,14 +193,6 @@
SectionEnd
-Section Documentation SecTomcatDocs
-
- SectionIn 1 3
- SetOutPath $INSTDIR\webapps
- File /r webapps\tomcat-docs
-
-SectionEnd
-
SubSectionEnd
Section Start Menu Items SecMenu
@@ -234,14 +237,42 @@
SectionEnd
-Section Examples SecExamples
+Section Documentation SecDocs
SectionIn 1 3
+ SetOutPath $INSTDIR\webapps
+ File /r webapps\tomcat-docs
+
+SectionEnd
+
+Section Examples SecExamples
+
+ SectionIn 3
SetOverwrite on
SetOutPath $INSTDIR\webapps
File /r webapps\jsp-examples
File /r webapps\servlets-examples
+
+SectionEnd
+
+Section Administration SecAdmin
+
+ SectionIn 3
+
+ SetOutPath $INSTDIR\server\webapps
+ File /r server\webapps\admin
+ SetOutPath $INSTDIR\conf\Catalina\localhost
+ File conf\Catalina\localhost\admin.xml
+
+SectionEnd
+
+Section Webapps SecWebapps
+
+ SectionIn 3
+
+ SetOutPath $INSTDIR\webapps
+ File /r webapps\balancer
File /r webapps\webdav
SectionEnd
1.8 +4 -14
[VOTE] [5.5] Release plan votes
ballot I approve the release plan: [ ] Yes [ ] No /ballot ballot Tomcat 5.5 should use the following API set for the coding: [ ] J2SE 1.3 [ ] J2SE 1.4 [ ] J2SE 5.0 /ballot ballot Yoav Shapira will act as the release manager for this branch: [ ] Yes [ ] No /ballot Thanks :) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Delivery confirmation
Philip Talbot is away for the time being, if your message is urgent please contact: [EMAIL PROTECTED] for printing, or [EMAIL PROTECTED] for operational issues. Thank you. ** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
email archive virus threat
Is it just me or the recent digest email keep attaching with virus? If it not just me, can someone take a look why? Thanks. -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Delivery confirmation
Philip Talbot is away for the time being, if your message is urgent please contact: [EMAIL PROTECTED] for printing, or [EMAIL PROTECTED] for operational issues. Thank you. ** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] [5.5] Release plan votes
On Aug 26, 2004, at 1:13 PM, Remy Maucherat wrote: ballot Tomcat 5.5 should use the following API set for the coding: [ ] J2SE 1.3 [X] J2SE 1.4 [ ] J2SE 5.0 /ballot As a Tomcat user I'd appreciate it if Tomcat would support the second newest JVM release at the time a new minor version number series is started. -- Sandy McArthur He who dares not offend cannot be honest. - Thomas Paine smime.p7s Description: S/MIME cryptographic signature
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper Constants.java EmbededServletOptions.java JasperException.java JspC.java JspCompilationContext.java Options.java
markt 2004/08/26 11:25:53 Modified:jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch Constants.java EmbededServletOptions.java JasperException.java JspC.java JspCompilationContext.java Options.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.4.2.2 +13 -53 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- Constants.java22 Aug 2004 12:35:57 - 1.4.2.1 +++ Constants.java26 Aug 2004 18:25:52 - 1.4.2.2 @@ -1,57 +1,17 @@ /* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper; 1.8.2.7 +12 -57 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java Index: EmbededServletOptions.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -u -r1.8.2.6 -r1.8.2.7 --- EmbededServletOptions.java22 Aug 2004 12:35:57 - 1.8.2.6 +++ EmbededServletOptions.java26 Aug 2004 18:25:53 - 1.8.2.7 @@ -1,62
RE: [VOTE] [5.5] Release plan votes
ballot I approve the release plan: [X] Yes [ ] No /ballot ballot Tomcat 5.5 should use the following API set for the coding: [ ] J2SE 1.3 [X] J2SE 1.4 [ ] J2SE 5.0 /ballot ballot Yoav Shapira will act as the release manager for this branch: [X] Yes [ ] No /ballot Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30859] - index.jsp request not loading
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30859. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30859 index.jsp request not loading [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-08-26 18:47 --- Bugzilla is NOT a support forum. Please ask quesitons like this on the tomcat- user mailing list. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Cookies.java
markt 2004/08/26 12:06:39
Modified:util/java/org/apache/tomcat/util/http Cookies.java
Log:
Tab police (prior to looking at bug 30870)
Revision ChangesPath
1.8 +282 -274
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Cookies.java 9 Aug 2004 23:23:43 - 1.7
+++ Cookies.java 26 Aug 2004 19:06:39 - 1.8
@@ -50,7 +50,7 @@
* information from the provided headers.
*/
public Cookies(MimeHeaders headers) {
- this.headers=headers;
+this.headers=headers;
}
/**
@@ -80,12 +80,12 @@
* Recycle.
*/
public void recycle() {
- for( int i=0; i cookieCount; i++ ) {
- if( scookies[i]!=null )
- scookies[i].recycle();
- }
- cookieCount=0;
- unprocessed=true;
+for( int i=0; i cookieCount; i++ ) {
+if( scookies[i]!=null )
+scookies[i].recycle();
+}
+cookieCount=0;
+unprocessed=true;
}
/**
@@ -105,18 +105,18 @@
// Indexed access
public ServerCookie getCookie( int idx ) {
- if( unprocessed ) {
- getCookieCount(); // will also update the cookies
- }
- return scookies[idx];
+if( unprocessed ) {
+getCookieCount(); // will also update the cookies
+}
+return scookies[idx];
}
public int getCookieCount() {
- if( unprocessed ) {
- unprocessed=false;
- processCookies(headers);
- }
- return cookieCount;
+if( unprocessed ) {
+unprocessed=false;
+processCookies(headers);
+}
+return cookieCount;
}
// Adding cookies
@@ -126,19 +126,19 @@
* The caller can set the name/value and attributes for the cookie
*/
public ServerCookie addCookie() {
- if( cookieCount = scookies.length ) {
- ServerCookie scookiesTmp[]=new ServerCookie[2*cookieCount];
- System.arraycopy( scookies, 0, scookiesTmp, 0, cookieCount);
- scookies=scookiesTmp;
- }
-
- ServerCookie c = scookies[cookieCount];
- if( c==null ) {
- c= new ServerCookie();
- scookies[cookieCount]=c;
- }
- cookieCount++;
- return c;
+if( cookieCount = scookies.length ) {
+ServerCookie scookiesTmp[]=new ServerCookie[2*cookieCount];
+System.arraycopy( scookies, 0, scookiesTmp, 0, cookieCount);
+scookies=scookiesTmp;
+}
+
+ServerCookie c = scookies[cookieCount];
+if( c==null ) {
+c= new ServerCookie();
+scookies[cookieCount]=c;
+}
+cookieCount++;
+return c;
}
@@ -147,32 +147,32 @@
/** Add all Cookie found in the headers of a request.
*/
public void processCookies( MimeHeaders headers ) {
- if( headers==null )
- return;// nothing to process
- // process each cookie header
- int pos=0;
- while( pos=0 ) {
- // Cookie2: version ? not needed
- pos=headers.findHeader( Cookie, pos );
- // no more cookie headers headers
- if( pos0 ) break;
-
- MessageBytes cookieValue=headers.getValue( pos );
- if( cookieValue==null || cookieValue.isNull() ) continue;
-
- // Uncomment to test the new parsing code
- if( cookieValue.getType() == MessageBytes.T_BYTES ) {
- if( dbg0 ) log( Parsing b[]: + cookieValue.toString());
- ByteChunk bc=cookieValue.getByteChunk();
- processCookieHeader( bc.getBytes(),
- bc.getOffset(),
- bc.getLength());
- } else {
- if( dbg0 ) log( Parsing S: + cookieValue.toString());
- processCookieHeader( cookieValue.toString() );
- }
- pos++;// search from the next position
- }
+if( headers==null )
+return;// nothing to process
+// process each cookie header
+int pos=0;
+while( pos=0 ) {
+// Cookie2: version ? not needed
+pos=headers.findHeader( Cookie, pos );
+// no more cookie headers headers
+if( pos0 ) break;
+
+MessageBytes cookieValue=headers.getValue( pos );
+if(
DO NOT REPLY [Bug 30875] New: - Dynamic processing by Catalina of webapp's context.xml fails using ./bin/startup.sh
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30875. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30875 Dynamic processing by Catalina of webapp's context.xml fails using ./bin/startup.sh Summary: Dynamic processing by Catalina of webapp's context.xml fails using ./bin/startup.sh Product: Tomcat 5 Version: 5.0.27 Platform: Macintosh OS/Version: MacOS X Status: NEW Severity: Major Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] According to the documentation, the proper way to create application context is by including a file named context.xml in the META-INF directory of a webapp. It appears that Tomcat 5.0.27 only recognizes such a context file when the war is deployed using the Manager tool's DEPLOY feature. When DEPLOY is used, Catalina properly recognizes the context and dynamically creates $CATALINA_HOME/conf/Catalina/localhost/appname.xml If Tomcat is started with the same war file in the webapps dir, the context file is not found and a _directory_ is created at $CATALINA_HOME/conf/Catalina/localhost/appname.xml. This bug is _related_ but not identical to BUG #29688. Use Case to create bug -- 1. Stop Tomcat using $CATALINA_HOME/bin/shutdown.sh. 2. Make sure $CATALINA_HOME/conf/Catalina/localhost/webapp.xml is deleted. 3. Clear all references to the webapp $CATALINA_HOME/webapps by deleting the dir appname and the file appname.war 3. Clear all the logs in $CATALINA_HOME/logs 4. Place the webapp's WAR file in $CATALINA_HOME/webapps. The webapp war has the following basic structure: appname.war index.jsp /META-INF context.xml /WEB-INF web.xml /lib /classes 5. Start Tomcat by running $CATALINA_HOME/bin/startup.sh 6. Navigate to the application's URL Excerpt from /logs/catalina.out --- Aug 26, 2004 1:27:06 PM org.apache.catalina.startup.Catalina start INFO: Server startup in 11130 ms Aug 26, 2004 1:27:15 PM org.apache.catalina.core.StandardHostDeployer remove INFO: Removing web application at context path /srp Aug 26, 2004 1:27:15 PM org.apache.catalina.core.StandardHostDeployer install INFO: Processing Context configuration file URL file:/usr/local/jakarta-tomcat-5.0.27/conf/Catalina/ localhost/srp.xml Aug 26, 2004 1:27:15 PM org.apache.catalina.startup.HostConfig deployDescriptors SEVERE: Error deploying configuration descriptor srp.xml java.io.IOException: java.io.FileNotFoundException: /usr/local/jakarta-tomcat-5.0.27/conf/Catalina/ localhost/srp.xml (No such file or directory) at org.apache.catalina.core.StandardHostDeployer.install(StandardHostDeployer.java:494) at org.apache.catalina.core.StandardHost.install(StandardHost.java:863) at org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:482) at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:427) at org.apache.catalina.startup.HostConfig.check(HostConfig.java:1068) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:327) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.core.StandardHost.backgroundProcess(StandardHost.java:800) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase. java:1619) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase. java:1628) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java: 1608) at java.lang.Thread.run(Thread.java:552) context.xml from META-INF -- Context path=/srp docBase=srp debug=1 reloadable=true Resource name=jdbc/srp type=javax.sql.DataSource auth=Container/ ResourceParams name=jdbc/srp parameter namemaxWait/name value5000/value /parameter parameter namemaxActive/name value20/value /parameter parameter nameusername/name valuetest/value /parameter parameter namepassword/name valuetest/value /parameter parameter nameurl/name valuejdbc:microsoft:sqlserver://192.168.1.17:1433;databaseName=srp/value /parameter parameter namedriverClassName/name valuecom.microsoft.jdbc.sqlserver.SQLServerDriver/value /parameter parameter namemaxIdle/name value2/value /parameter /ResourceParams
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Cookies.java
markt 2004/08/26 12:31:03
Modified:util/java/org/apache/tomcat/util/http Cookies.java
Log:
Fix bug 30870. Remove potential for endless loop in cookie processing.
- Patch provided by Tony Perkins
Revision ChangesPath
1.9 +4 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Cookies.java 26 Aug 2004 19:06:39 - 1.8
+++ Cookies.java 26 Aug 2004 19:31:03 - 1.9
@@ -158,7 +158,10 @@
if( pos0 ) break;
MessageBytes cookieValue=headers.getValue( pos );
-if( cookieValue==null || cookieValue.isNull() ) continue;
+if( cookieValue==null || cookieValue.isNull() ) {
+pos++;
+continue;
+}
// Uncomment to test the new parsing code
if( cookieValue.getType() == MessageBytes.T_BYTES ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30870] - Endless loop in Cookies.processCookies
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30870. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30870 Endless loop in Cookies.processCookies [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-08-26 19:33 --- Fixed in CVS. Thanks for reporting. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
content-length long
By setContentLength taking an int instead of a long, even in jsr154, does this mean the only way to send back files longer than max_int is to chunk them? Spec folks, has there ever been dicussion of changing this related parameters to long? Keith - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: content-length long
Hi Keith, Keith Wannamaker wrote: By setContentLength taking an int instead of a long, even in jsr154, does this mean the only way to send back files longer than max_int is to chunk them? Spec folks, has there ever been dicussion of changing this related parameters to long? I'm not sure the spec folks read this mailling list (they should ;-)). You mat wan to send your email to: [EMAIL PROTECTED] I will forward your email to the spec leads. -- Jeanfrancois Keith - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant AbstractCatalinaTask.java DeployTask.java InstallTask.java ListTask.java ReloadTask.java RemoveTask.java ResourcesTask.java RolesTask.java StartTask.java StopTask.java UndeployTask.java
markt 2004/08/26 14:27:10 Modified:catalina/src/share/org/apache/catalina/ant AbstractCatalinaTask.java DeployTask.java InstallTask.java ListTask.java ReloadTask.java RemoveTask.java ResourcesTask.java RolesTask.java StartTask.java StopTask.java UndeployTask.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.3 +14 -59 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java Index: AbstractCatalinaTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/AbstractCatalinaTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractCatalinaTask.java 12 Feb 2002 22:14:01 - 1.2 +++ AbstractCatalinaTask.java 26 Aug 2004 21:27:10 - 1.3 @@ -1,62 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * + * Copyright 2002,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.3 +14 -59 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java Index: DeployTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DeployTask.java 26 Feb 2002 01:24:33 - 1.2 +++
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java BasicAuthenticator.java Constants.java DigestAuthenticator.java FormAuthenticator.java NonLoginAuthenticator.java SSLAuthenticator.java SavedRequest.java SingleSignOn.java SingleSignOnEntry.java
markt 2004/08/26 14:27:39 Modified:catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java BasicAuthenticator.java Constants.java DigestAuthenticator.java FormAuthenticator.java NonLoginAuthenticator.java SSLAuthenticator.java SavedRequest.java SingleSignOn.java SingleSignOnEntry.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.41 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java Index: AuthenticatorBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- AuthenticatorBase.java7 Jan 2004 23:38:13 - 1.40 +++ AuthenticatorBase.java26 Aug 2004 21:27:39 - 1.41 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * 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 - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999-2001,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.15 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java Index: BasicAuthenticator.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster ClusterMemberInfo.java ClusterReceiver.java ClusterSender.java ClusterSessionBase.java Constants.java MulticastReceiver.java MulticastSender.java ReplicationWrapper.java StandardCluster.java
markt 2004/08/26 14:28:18 Modified:catalina/src/share/org/apache/catalina/cluster ClusterMemberInfo.java ClusterReceiver.java ClusterSender.java ClusterSessionBase.java Constants.java MulticastReceiver.java MulticastSender.java ReplicationWrapper.java StandardCluster.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/ClusterMemberInfo.java Index: ClusterMemberInfo.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/ClusterMemberInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ClusterMemberInfo.java21 Dec 2001 21:15:44 - 1.4 +++ ClusterMemberInfo.java26 Aug 2004 21:28:18 - 1.5 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.cluster; 1.3 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java Index: ClusterReceiver.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http Constants.java DefaultHeaders.java HttpConnector.java HttpHeader.java HttpProcessor.java HttpRequestImpl.java HttpRequestLine.java HttpRequestStream.java HttpResponseImpl.java HttpResponseStream.java SocketInputStream.java
markt 2004/08/26 14:28:57 Modified:catalina/src/share/org/apache/catalina/connector/http Constants.java DefaultHeaders.java HttpConnector.java HttpHeader.java HttpProcessor.java HttpRequestImpl.java HttpRequestLine.java HttpRequestStream.java HttpResponseImpl.java HttpResponseStream.java SocketInputStream.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.8 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Constants.java18 Mar 2002 07:15:39 - 1.7 +++ Constants.java26 Aug 2004 21:28:57 - 1.8 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.4 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/DefaultHeaders.java Index: DefaultHeaders.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10 Constants.java HttpConnector.java HttpProcessor.java HttpRequestImpl.java HttpResponseImpl.java
markt 2004/08/26 14:29:23 Modified:catalina/src/share/org/apache/catalina/connector/http10 Constants.java HttpConnector.java HttpProcessor.java HttpRequestImpl.java HttpResponseImpl.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/Constants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Constants.java18 Mar 2002 07:15:40 - 1.4 +++ Constants.java26 Aug 2004 21:29:22 - 1.5 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.18 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java Index: HttpConnector.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- HttpConnector.java18 Mar 2002 07:15:40 - 1.17 +++
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationContext.java ApplicationContextFacade.java ApplicationDispatcher.java ApplicationFilterChain.java ApplicationFilterConfig.java ApplicationHttpRequest.java ApplicationHttpResponse.java ApplicationRequest.java ApplicationResponse.java Constants.java ContainerBase.java FastEngineMapper.java MappingRequest.java NamingContextListener.java
markt 2004/08/26 14:31:22 Modified:catalina/src/share/org/apache/catalina/core ApplicationContext.java ApplicationContextFacade.java ApplicationDispatcher.java ApplicationFilterChain.java ApplicationFilterConfig.java ApplicationHttpRequest.java ApplicationHttpResponse.java ApplicationRequest.java ApplicationResponse.java Constants.java ContainerBase.java FastEngineMapper.java MappingRequest.java NamingContextListener.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.45 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java Index: ApplicationContext.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ApplicationContext.java 30 Jun 2004 22:36:21 - 1.44 +++ ApplicationContext.java 26 Aug 2004 21:31:21 - 1.45 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.4 +14 -61
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader Constants.java Extension.java Reloader.java ResourceEntry.java StandardClassLoader.java WebappClassLoader.java WebappLoader.java
markt 2004/08/26 14:34:02 Modified:catalina/src/share/org/apache/catalina/loader Constants.java Extension.java Reloader.java ResourceEntry.java StandardClassLoader.java WebappClassLoader.java WebappLoader.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.4 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Constants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Constants.java22 Jul 2001 20:25:10 - 1.3 +++ Constants.java26 Aug 2004 21:34:02 - 1.4 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.5 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java Index: Extension.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/Extension.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Extension.java22 Jul 2001 20:25:10 - 1.4 +++ Extension.java26 Aug 2004 21:34:02 - 1.5
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/logger Constants.java FileLogger.java LoggerBase.java SystemErrLogger.java SystemOutLogger.java
markt 2004/08/26 14:34:38 Modified:catalina/src/share/org/apache/catalina/logger Constants.java FileLogger.java LoggerBase.java SystemErrLogger.java SystemOutLogger.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.3 +13 -56 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/logger/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/logger/Constants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Constants.java22 Jul 2001 20:25:11 - 1.2 +++ Constants.java26 Aug 2004 21:34:37 - 1.3 @@ -1,60 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.9 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/logger/FileLogger.java Index: FileLogger.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/logger/FileLogger.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- FileLogger.java 9 Jun 2002 02:19:43 - 1.8 +++ FileLogger.java 26 Aug 2004 21:34:37 - 1.9 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - *
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans ClassNameMBean.java ConnectorMBean.java ContextEnvironmentMBean.java ContextResourceLinkMBean.java ContextResourceMBean.java DefaultContextMBean.java GlobalResourcesLifecycleListener.java GroupMBean.java MBeanFactory.java
markt 2004/08/26 14:35:23 Modified:catalina/src/share/org/apache/catalina/mbeans ClassNameMBean.java ConnectorMBean.java ContextEnvironmentMBean.java ContextResourceLinkMBean.java ContextResourceMBean.java DefaultContextMBean.java GlobalResourcesLifecycleListener.java GroupMBean.java MBeanFactory.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ClassNameMBean.java Index: ClassNameMBean.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ClassNameMBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ClassNameMBean.java 24 Jan 2002 20:34:05 - 1.1 +++ ClassNameMBean.java 26 Aug 2004 21:35:22 - 1.2 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 2002,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.mbeans; 1.6 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java Index: ConnectorMBean.java === RCS file:
RE: [VOTE] [5.5] Release plan votes
ballot I approve the release plan: [X] Yes [ ] No /ballot ballot Tomcat 5.5 should use the following API set for the coding: [ ] J2SE 1.3 [X] J2SE 1.4 [ ] J2SE 5.0 /ballot ballot Yoav Shapira will act as the release manager for this branch: [X] Yes [ ] No /ballot --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.740 / Virus Database: 494 - Release Date: 8/16/2004 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java MemoryUserDatabaseMBean.java NamingResourcesMBean.java RoleMBean.java ServerLifecycleListener.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServerMBean.java StandardServiceMBean.java UserMBean.java
markt 2004/08/26 14:36:09 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java MemoryUserDatabaseMBean.java NamingResourcesMBean.java RoleMBean.java ServerLifecycleListener.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServerMBean.java StandardServiceMBean.java UserMBean.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.50 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- MBeanUtils.java 18 Feb 2003 23:40:27 - 1.49 +++ MBeanUtils.java 26 Aug 2004 21:36:08 - 1.50 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.mbeans; 1.5 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Index: MemoryUserDatabaseMBean.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net DefaultServerSocketFactory.java SSLServerSocketFactory.java ServerSocketFactory.java
markt 2004/08/26 14:36:35 Modified:catalina/src/share/org/apache/catalina/net DefaultServerSocketFactory.java SSLServerSocketFactory.java ServerSocketFactory.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.7 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java Index: DefaultServerSocketFactory.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DefaultServerSocketFactory.java 30 Nov 2001 23:00:45 - 1.6 +++ DefaultServerSocketFactory.java 26 Aug 2004 21:36:35 - 1.7 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.11 +13 -56 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java Index: SSLServerSocketFactory.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SSLServerSocketFactory.java 30 Nov 2001
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm Constants.java DataSourceRealm.java GenericPrincipal.java JAASCallbackHandler.java JAASMemoryLoginModule.java JAASRealm.java JDBCRealm.java JNDIRealm.java MemoryRealm.java MemoryRuleSet.java RealmBase.java UserDatabaseRealm.java
markt 2004/08/26 14:37:22 Modified:catalina/src/share/org/apache/catalina/realm Constants.java DataSourceRealm.java GenericPrincipal.java JAASCallbackHandler.java JAASMemoryLoginModule.java JAASRealm.java JDBCRealm.java JNDIRealm.java MemoryRealm.java MemoryRuleSet.java RealmBase.java UserDatabaseRealm.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.3 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/Constants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Constants.java22 Jul 2001 20:25:11 - 1.2 +++ Constants.java26 Aug 2004 21:37:21 - 1.3 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.3 +15 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java Index: DataSourceRealm.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v retrieving revision 1.2
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java Constants.java DefaultServlet.java HTMLManagerServlet.java InvokerHttpRequest.java InvokerServlet.java ManagerServlet.java WebdavServlet.java
markt 2004/08/26 14:38:14 Modified:catalina/src/share/org/apache/catalina/servlets CGIServlet.java Constants.java DefaultServlet.java HTMLManagerServlet.java InvokerHttpRequest.java InvokerServlet.java ManagerServlet.java WebdavServlet.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.27 +18 -63 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Index: CGIServlet.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- CGIServlet.java 17 Aug 2004 21:44:32 - 1.26 +++ CGIServlet.java 26 Aug 2004 21:38:13 - 1.27 @@ -1,62 +1,17 @@ /* - * CGIServlet.java $Header$ - * $Revision$, $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.4 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/Constants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Constants.java22 Jul 2001 20:25:11 - 1.3 +++ Constants.java26 Aug 2004 21:38:13
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session Constants.java DistributedManager.java FileStore.java JDBCStore.java ManagerBase.java PersistentManager.java PersistentManagerBase.java StandardManager.java StandardSession.java StandardSessionFacade.java StoreBase.java
markt 2004/08/26 14:39:08 Modified:catalina/src/share/org/apache/catalina/session Constants.java DistributedManager.java FileStore.java JDBCStore.java ManagerBase.java PersistentManager.java PersistentManagerBase.java StandardManager.java StandardSession.java StandardSessionFacade.java StoreBase.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.4 +13 -56 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/Constants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Constants.java22 Jul 2001 20:25:12 - 1.3 +++ Constants.java26 Aug 2004 21:39:08 - 1.4 @@ -1,60 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.6 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java Index: DistributedManager.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ExpressionParseTree.java ExpressionTokenizer.java ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConditionalState.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java
markt 2004/08/26 14:39:40 Modified:catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ExpressionParseTree.java ExpressionTokenizer.java ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConditionalState.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +14 -62 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java Index: ByteArrayServletOutputStream.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ByteArrayServletOutputStream.java 24 May 2002 04:38:58 - 1.1 +++ ByteArrayServletOutputStream.java 26 Aug 2004 21:39:40 - 1.2 @@ -1,65 +1,17 @@ /* - * ByteArrayServletOutputStream.java - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.ssi; 1.2 +13 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ExpressionParseTree.java Index: ExpressionParseTree.java
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java
markt 2004/08/26 14:40:03 Modified:catalina/src/share/org/apache/catalina/ssi SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.4 +14 -62 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java Index: SSIFlastmod.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SSIFlastmod.java 25 Nov 2002 10:15:42 - 1.3 +++ SSIFlastmod.java 26 Aug 2004 21:40:03 - 1.4 @@ -1,65 +1,17 @@ /* - * SSIFlastmod.java - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.ssi; 1.5 +14 -62 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java Index: SSIFsize.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java,v retrieving
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup HomesUserDatabase.java HostConfig.java HostRuleSet.java LifecycleListenerRule.java NamingRuleSet.java PasswdUserDatabase.java SecurityClassLoad.java TldRuleSet.java Tool.java UserConfig.java UserDatabase.java WebRuleSet.java
markt 2004/08/26 14:41:41 Modified:catalina/src/share/org/apache/catalina/startup HomesUserDatabase.java HostConfig.java HostRuleSet.java LifecycleListenerRule.java NamingRuleSet.java PasswdUserDatabase.java SecurityClassLoad.java TldRuleSet.java Tool.java UserConfig.java UserDatabase.java WebRuleSet.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.3 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HomesUserDatabase.java Index: HomesUserDatabase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HomesUserDatabase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HomesUserDatabase.java22 Jul 2001 20:25:13 - 1.2 +++ HomesUserDatabase.java26 Aug 2004 21:41:41 - 1.3 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.25 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java Index: HostConfig.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users AbstractGroup.java AbstractRole.java AbstractUser.java Constants.java MemoryGroup.java MemoryRole.java MemoryUser.java MemoryUserDatabase.java MemoryUserDatabaseFactory.java
markt 2004/08/26 14:42:05 Modified:catalina/src/share/org/apache/catalina/users AbstractGroup.java AbstractRole.java AbstractUser.java Constants.java MemoryGroup.java MemoryRole.java MemoryUser.java MemoryUserDatabase.java MemoryUserDatabaseFactory.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +14 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/AbstractGroup.java Index: AbstractGroup.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/AbstractGroup.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AbstractGroup.java10 Feb 2002 08:06:20 - 1.4 +++ AbstractGroup.java26 Aug 2004 21:42:04 - 1.5 @@ -1,63 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 2002,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.2 +14 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/AbstractRole.java Index: AbstractRole.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/AbstractRole.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util Base64.java CGIProcessEnvironment.java CharsetMapper.java CookieTools.java CustomObjectInputStream.java DOMWriter.java DateTool.java Enumerator.java FastDateFormat.java FastHttpDateFormat.java HexUtils.java IOTools.java InstanceSupport.java LifecycleSupport.java
markt 2004/08/26 14:42:41 Modified:catalina/src/share/org/apache/catalina/util Base64.java CGIProcessEnvironment.java CharsetMapper.java CookieTools.java CustomObjectInputStream.java DOMWriter.java DateTool.java Enumerator.java FastDateFormat.java FastHttpDateFormat.java HexUtils.java IOTools.java InstanceSupport.java LifecycleSupport.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/Base64.java Index: Base64.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/Base64.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Base64.java 4 Sep 2001 21:49:55 - 1.4 +++ Base64.java 26 Aug 2004 21:42:40 - 1.5 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.util; 1.4 +15 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java Index: CGIProcessEnvironment.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java CertificatesValve.java Constants.java ErrorDispatcherValve.java ErrorReportValve.java ExtendedAccessLogValve.java JDBCAccessLogValve.java RemoteAddrValve.java RemoteHostValve.java RequestDumperValve.java RequestFilterValve.java ValveBase.java
markt 2004/08/26 14:43:51 Modified:catalina/src/share/org/apache/catalina/valves AccessLogValve.java CertificatesValve.java Constants.java ErrorDispatcherValve.java ErrorReportValve.java ExtendedAccessLogValve.java JDBCAccessLogValve.java RemoteAddrValve.java RemoteHostValve.java RequestDumperValve.java RequestFilterValve.java ValveBase.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.18 +14 -57 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java Index: AccessLogValve.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- AccessLogValve.java 19 Jul 2003 13:17:46 - 1.17 +++ AccessLogValve.java 26 Aug 2004 21:43:51 - 1.18 @@ -1,60 +1,17 @@ /* - * - * - * 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 - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999-2001,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.11 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/CertificatesValve.java Index: CertificatesValve.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory BeanFactory.java Constants.java EjbFactory.java MailSessionFactory.java ResourceEnvFactory.java ResourceFactory.java ResourceLinkFactory.java SendMailFactory.java TransactionFactory.java TyrexFactory.java TyrexResourceFactory.java TyrexTransactionFactory.java
markt 2004/08/26 14:44:38 Modified:catalina/src/share/org/apache/naming/factory BeanFactory.java Constants.java EjbFactory.java MailSessionFactory.java ResourceEnvFactory.java ResourceFactory.java ResourceLinkFactory.java SendMailFactory.java TransactionFactory.java TyrexFactory.java TyrexResourceFactory.java TyrexTransactionFactory.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/BeanFactory.java Index: BeanFactory.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/BeanFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BeanFactory.java 2 Sep 2001 01:17:47 - 1.1 +++ BeanFactory.java 26 Aug 2004 21:44:37 - 1.2 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * 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 - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999-2001,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.naming.factory; 1.7 +13 -60 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java Index: Constants.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources BaseDirContextTestCase.java FileDirContextTestCase.java WARDirContextTestCase.java
markt 2004/08/26 14:46:56 Modified:catalina/src/test/org/apache/catalina/realm JNDIRealmTestCase.java catalina/src/test/org/apache/catalina/util CookieToolsTestCase.java URLTestCase.java catalina/src/test/org/apache/naming/resources BaseDirContextTestCase.java FileDirContextTestCase.java WARDirContextTestCase.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.3 +14 -60 jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java Index: JNDIRealmTestCase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JNDIRealmTestCase.java12 Dec 2003 21:31:56 - 1.2 +++ JNDIRealmTestCase.java26 Aug 2004 21:46:56 - 1.3 @@ -1,63 +1,17 @@ -/* - * $Header: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java - * $Revision$ - * $Date$ - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * +/* + * Copyright 2003,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.realm; 1.6 +14 -61
Re: [5.5] Release plan
Could someone please explain why this is 5.5 and not 5.1? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspLineMap.java JspLineMapItem.java JspParseEventListener.java
markt 2004/08/26 14:48:57 Modified:jasper/src/share/org/apache/jasper/compiler BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspLineMap.java JspLineMapItem.java JspParseEventListener.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanEndGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanEndGenerator.java.diff?r1=1.1r2=1.2 1.6 +13 -55 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanGenerator.java.diff?r1=1.5r2=1.6 1.4 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java.diff?r1=1.3r2=1.4 1.5 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java.diff?r1=1.4r2=1.5 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java.diff?r1=1.1r2=1.2 1.6 +13 -56 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java.diff?r1=1.5r2=1.6 1.3 +12 -54 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommentGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommentGenerator.java.diff?r1=1.2r2=1.3 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CompileException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CompileException.java.diff?r1=1.1r2=1.2 1.16 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java.diff?r1=1.15r2=1.16 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CoreElement.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CoreElement.java.diff?r1=1.1r2=1.2 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DeclarationGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DeclarationGenerator.java.diff?r1=1.1r2=1.2 1.10 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DelegatingListener.java.diff?r1=1.9r2=1.10 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DestroyMethodPhase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/DestroyMethodPhase.java.diff?r1=1.1r2=1.2 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/EscapeUnicodeWriter.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/EscapeUnicodeWriter.java.diff?r1=1.1r2=1.2 1.4 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler JspReader.java JspUtil.java KjcJavaCompiler.java Mangler.java MappedCharDataGenerator.java Mark.java PageDataImpl.java ParseEventListener.java ParseException.java Parser.java ParserController.java ParserXJspSax.java ParserXJspSaxHandler.java PluginGenerator.java ScriptletGenerator.java ServiceMethodPhase.java ServletWriter.java SetPropertyGenerator.java StaticInitializerPhase.java StoredCharDataGenerator.java SunJavaCompiler.java TagBeginGenerator.java TagCache.java TagEndGenerator.java TagGeneratorBase.java TagLibraries.java TagLibraryInfoImpl.java TldLocationsCache.java UninterpretedTagBeginGenerator.java UninterpretedTagEndGenerator.java XmlOutputter.java
markt 2004/08/26 14:49:35 Modified:jasper/src/share/org/apache/jasper/compiler JspReader.java JspUtil.java KjcJavaCompiler.java Mangler.java MappedCharDataGenerator.java Mark.java PageDataImpl.java ParseEventListener.java ParseException.java Parser.java ParserController.java ParserXJspSax.java ParserXJspSaxHandler.java PluginGenerator.java ScriptletGenerator.java ServiceMethodPhase.java ServletWriter.java SetPropertyGenerator.java StaticInitializerPhase.java StoredCharDataGenerator.java SunJavaCompiler.java TagBeginGenerator.java TagCache.java TagEndGenerator.java TagGeneratorBase.java TagLibraries.java TagLibraryInfoImpl.java TldLocationsCache.java UninterpretedTagBeginGenerator.java UninterpretedTagEndGenerator.java XmlOutputter.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.9 +13 -52 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspReader.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspReader.java.diff?r1=1.8r2=1.9 1.15 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspUtil.java.diff?r1=1.14r2=1.15 1.4 +13 -58 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java.diff?r1=1.3r2=1.4 1.3 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Mangler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Mangler.java.diff?r1=1.2r2=1.3 1.4 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java.diff?r1=1.3r2=1.4 1.4 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Mark.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Mark.java.diff?r1=1.3r2=1.4 1.2 +13 -58 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/PageDataImpl.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/PageDataImpl.java.diff?r1=1.1r2=1.2 1.9 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseEventListener.java.diff?r1=1.8r2=1.9 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParseException.java.diff?r1=1.1r2=1.2 1.18 +13 -52 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java.diff?r1=1.17r2=1.18 1.19 +13 -52 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java.diff?r1=1.18r2=1.19 1.4 +13 -52 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSax.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSax.java.diff?r1=1.3r2=1.4 1.17 +13 -52 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserXJspSaxHandler.java.diff?r1=1.16r2=1.17 1.6 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/PluginGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/PluginGenerator.java.diff?r1=1.5r2=1.6 1.3 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java.diff?r1=1.2r2=1.3 1.2 +12 -57
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/util FastDateFormat.java Queue.java SimplePool.java StringManager.java
markt 2004/08/26 14:50:20 Modified:jasper/src/share/org/apache/jasper CommandLineContext.java Constants.java EmbededServletOptions.java JasperException.java JspC.java JspCompilationContext.java JspEngineContext.java Options.java jasper/src/share/org/apache/jasper/core JasperException.java jasper/src/share/org/apache/jasper/logging DefaultLogger.java JasperLogger.java LogAware.java Logger.java jasper/src/share/org/apache/jasper/parser ParserUtils.java TreeNode.java jasper/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspException.java JspFactoryImpl.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java ServletResponseWrapperInclude.java jasper/src/share/org/apache/jasper/servlet JasperLoader.java JspCServletContext.java JspServlet.java ServletEngine.java TomcatServletEngine.java jasper/src/share/org/apache/jasper/util FastDateFormat.java Queue.java SimplePool.java StringManager.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.11 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java.diff?r1=1.10r2=1.11 1.15 +13 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java.diff?r1=1.14r2=1.15 1.9 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java.diff?r1=1.8r2=1.9 1.2 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JasperException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JasperException.java.diff?r1=1.1r2=1.2 1.16 +12 -57jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java.diff?r1=1.15r2=1.16 1.8 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java.diff?r1=1.7r2=1.8 1.11 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java.diff?r1=1.10r2=1.11 1.9 +12 -57 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java.diff?r1=1.8r2=1.9 1.2 +13 -56 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/core/JasperException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/core/JasperException.java.diff?r1=1.1r2=1.2 1.3 +12 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/DefaultLogger.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/DefaultLogger.java.diff?r1=1.2r2=1.3 1.5 +12 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/JasperLogger.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/JasperLogger.java.diff?r1=1.4r2=1.5 1.2 +12 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/LogAware.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/LogAware.java.diff?r1=1.1r2=1.2 1.4 +12 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/Logger.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/Logger.java.diff?r1=1.3r2=1.4 1.6 +14 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java.diff?r1=1.5r2=1.6 1.3 +14 -53 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/TreeNode.java
cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester Aggregate01.java Aggregate02.java Authentication01.java Authentication02.java Authentication03.java Authentication05.java CharArrayResponse.java CharArrayWriterUpperCase.java Context00.java Context01.java Context02.java ContextBean.java ContextListener01.java ContextListener02.java DatePropertyEditor.java Decoding01.java ErrorPage01.java ErrorPage02.java ErrorPage03.java ErrorPage04.java ErrorPage05.java ErrorPage06.java ErrorPage07.java FilterRequest01.java FilterRequest02.java FilterRequest02a.java FilterResponse01.java FilterResponse04.java FilterResponse04a.java Forward00.java Forward00a.java Forward00d.java
markt 2004/08/26 14:52:12 Modified:tester/src/tester/org/apache/tester Aggregate01.java Aggregate02.java Authentication01.java Authentication02.java Authentication03.java Authentication05.java CharArrayResponse.java CharArrayWriterUpperCase.java Context00.java Context01.java Context02.java ContextBean.java ContextListener01.java ContextListener02.java DatePropertyEditor.java Decoding01.java ErrorPage01.java ErrorPage02.java ErrorPage03.java ErrorPage04.java ErrorPage05.java ErrorPage06.java ErrorPage07.java FilterRequest01.java FilterRequest02.java FilterRequest02a.java FilterResponse01.java FilterResponse04.java FilterResponse04a.java Forward00.java Forward00a.java Forward00d.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Aggregate02.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication02.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication03.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication03.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication05.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Authentication05.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/CharArrayResponse.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/CharArrayResponse.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/CharArrayWriterUpperCase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/CharArrayWriterUpperCase.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context00.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context00.java.diff?r1=1.1r2=1.2 1.3 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context01.java.diff?r1=1.2r2=1.3 1.3 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Context02.java.diff?r1=1.2r2=1.3 1.3 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextBean.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextBean.java.diff?r1=1.2r2=1.3 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextListener01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextListener01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextListener02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ContextListener02.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/DatePropertyEditor.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/DatePropertyEditor.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Decoding01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Decoding01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage01.java
cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester Forward01.java Forward03.java Forward03a.java Forward04.java Forward04a.java Forward04b.java Forward05.java Forward05a.java Forward05b.java Forward06.java Forward06a.java Forward06b.java Forward07.java Forward07a.java Forward07b.java Forward08.java Forward08a.java Forward08b.java Forward09.java GetHeaders01.java GetInputStream01.java GetLocales01.java GetLocales02.java GetParameter01.java GetParameterMap00.java GetQueryString01.java Golden01.java Include00.java Include00a.java Include00d.java Include01.java Include02.java Include02a.java Include03.java Include03a.java
markt 2004/08/26 14:52:47 Modified:tester/src/tester/org/apache/tester Forward01.java Forward03.java Forward03a.java Forward04.java Forward04a.java Forward04b.java Forward05.java Forward05a.java Forward05b.java Forward06.java Forward06a.java Forward06b.java Forward07.java Forward07a.java Forward07b.java Forward08.java Forward08a.java Forward08b.java Forward09.java GetHeaders01.java GetInputStream01.java GetLocales01.java GetLocales02.java GetParameter01.java GetParameterMap00.java GetQueryString01.java Golden01.java Include00.java Include00a.java Include00d.java Include01.java Include02.java Include02a.java Include03.java Include03a.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward03.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward03.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward03a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward03a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward04b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward05b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward06b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward07b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward08.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward08.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward08a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward08a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Forward08b.java
cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester Include04.java Include04a.java Include04b.java Include06a.java Include07.java Include07a.java Include07b.java Include07c.java Include09.java Include10.java Include10a.java Jndi01.java Jndi02.java Lifecycle01.java Lifecycle02.java Lifecycle03.java Redirect01.java Redirect01a.java Reflection01.java Reset01.java Resources01.java Resources02.java Resources03.java Resources04.java Resources05.java Resources06.java ResponseWrap01.java ResponseWrap01a.java ResponseWrap01c.java Session01.java
markt 2004/08/26 14:53:41 Modified:tester/src/tester/org/apache/tester Include04.java Include04a.java Include04b.java Include06a.java Include07.java Include07a.java Include07b.java Include07c.java Include09.java Include10.java Include10a.java Jndi01.java Jndi02.java Lifecycle01.java Lifecycle02.java Lifecycle03.java Redirect01.java Redirect01a.java Reflection01.java Reset01.java Resources01.java Resources02.java Resources03.java Resources04.java Resources05.java Resources06.java ResponseWrap01.java ResponseWrap01a.java ResponseWrap01c.java Session01.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include04b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include06a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include06a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07a.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07b.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07b.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07c.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include07c.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include09.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include09.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include10.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include10.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include10a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Include10a.java.diff?r1=1.1r2=1.2 1.6 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi01.java.diff?r1=1.5r2=1.6 1.4 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java.diff?r1=1.3r2=1.4 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle02.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle03.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle03.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Redirect01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Redirect01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Redirect01a.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Redirect01a.java.diff?r1=1.1r2=1.2 1.2 +16 -57
cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/unshared UnsharedSessionBean.java
markt 2004/08/26 14:54:16 Modified:tester/src/tester/org/apache/tester Session02.java Session03.java Session04.java Session05.java Session06.java SessionBean.java SessionListener01.java SessionListener02.java SessionListener03.java SetBufferSize01.java SetLocale01.java StaticFilter.java StaticLogger.java TestClient.java TesterException.java TesterHttpServletRequestWrapper.java TesterHttpServletResponseWrapper.java TesterServletRequestWrapper.java TesterServletResponseWrapper.java UpperCaseFilter.java UpperCaseInputStream.java UpperCaseOutputStream.java UpperCaseReader.java UpperCaseRequest.java UpperCaseResponse.java UpperCaseWriter.java WrapperFilter.java Xerces01.java Xerces01Parser.java tester/src/tester/org/apache/tester/shared SharedSessionBean.java tester/src/tester/org/apache/tester/unpshared UnpSharedSessionBean.java tester/src/tester/org/apache/tester/unshared UnsharedSessionBean.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session02.java.diff?r1=1.1r2=1.2 1.5 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session03.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session03.java.diff?r1=1.4r2=1.5 1.4 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session04.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session04.java.diff?r1=1.3r2=1.4 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session05.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session05.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session06.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Session06.java.diff?r1=1.1r2=1.2 1.6 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionBean.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionBean.java.diff?r1=1.5r2=1.6 1.4 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener01.java.diff?r1=1.3r2=1.4 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener02.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener02.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener03.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SessionListener03.java.diff?r1=1.1r2=1.2 1.4 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetBufferSize01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetBufferSize01.java.diff?r1=1.3r2=1.4 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetLocale01.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/SetLocale01.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/StaticFilter.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/StaticFilter.java.diff?r1=1.1r2=1.2 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/StaticLogger.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/StaticLogger.java.diff?r1=1.1r2=1.2 1.10 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TestClient.java.diff?r1=1.9r2=1.10 1.2 +16 -57 jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TesterException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/TesterException.java.diff?r1=1.1r2=1.2 1.2 +16 -57
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server EditServerAction.java SaveServerAction.java ServerForm.java
markt 2004/08/26 14:58:50 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm AddRealmAction.java DeleteRealmAction.java DeleteRealmForm.java DeleteRealmsAction.java EditRealmAction.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java RealmForm.java RealmsForm.java SaveJDBCRealmAction.java SaveJNDIRealmAction.java SaveMemoryRealmAction.java SaveUserDatabaseRealmAction.java UserDatabaseRealmForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources BaseForm.java DataSourceForm.java DataSourcesForm.java DeleteDataSourcesAction.java DeleteEnvEntriesAction.java DeleteMailSessionsAction.java DeleteResourceLinksAction.java DeleteUserDatabasesAction.java EnvEntriesForm.java EnvEntryForm.java ListDataSourcesAction.java ListEnvEntriesAction.java ListMailSessionsAction.java ListResourceLinksAction.java ListUserDatabasesAction.java MailSessionForm.java MailSessionsForm.java ResourceLinkForm.java ResourceLinksForm.java ResourceUtils.java ResourcesTreeBuilder.java SaveDataSourceAction.java SaveEnvEntryAction.java SaveMailSessionAction.java SaveResourceLinkAction.java SaveUserDatabaseAction.java SetUpDataSourceAction.java SetUpEnvEntryAction.java SetUpMailSessionAction.java SetUpResourceLinkAction.java SetUpUserDatabaseAction.java UserDatabaseForm.java UserDatabasesForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server EditServerAction.java SaveServerAction.java ServerForm.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.9 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java.diff?r1=1.8r2=1.9 1.6 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java.diff?r1=1.5r2=1.6 1.3 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.java.diff?r1=1.2r2=1.3 1.3 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java.diff?r1=1.2r2=1.3 1.14 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java.diff?r1=1.13r2=1.14 1.8 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java.diff?r1=1.7r2=1.8 1.11 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java.diff?r1=1.10r2=1.11 1.7 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java.diff?r1=1.6r2=1.7 1.5 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java.diff?r1=1.4r2=1.5 1.3 +14 -59
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AccessLogValveForm.java AddValveAction.java DeleteValveAction.java DeleteValveForm.java DeleteValvesAction.java EditValveAction.java RemoteAddrValveForm.java RemoteHostValveForm.java RequestDumperValveForm.java SaveAccessLogValveAction.java SaveRemoteAddrValveAction.java SaveRemoteHostValveAction.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java SingleSignOnValveForm.java ValveForm.java ValveUtil.java ValvesForm.java
markt 2004/08/26 15:00:37 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ActionTag.java ActionsTag.java ApplicationLocales.java ApplicationServlet.java AttributeTag.java CommitChangesAction.java DataTag.java DumpRegistryAction.java DumpServerAction.java LabelTag.java LabelValueBean.java Lists.java LogOutAction.java RowTag.java SetLocaleAction.java SetLocaleForm.java SetUpTreeAction.java TableTag.java TomcatTreeBuilder.java TreeBuilder.java TreeControl.java TreeControlNode.java TreeControlTag.java TreeControlTestAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service AddServiceAction.java DeleteServiceAction.java DeleteServiceForm.java DeleteServicesAction.java EditServiceAction.java SaveServiceAction.java ServiceForm.java ServicesForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users BaseForm.java DeleteGroupsAction.java DeleteRolesAction.java DeleteUsersAction.java GroupForm.java GroupsForm.java ListGroupsAction.java ListRolesAction.java ListUsersAction.java RoleForm.java RolesForm.java SaveGroupAction.java SaveRoleAction.java SaveUserAction.java SetUpGroupAction.java SetUpRoleAction.java SetUpUserAction.java UserForm.java UserUtils.java UsersForm.java UsersTreeBuilder.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AccessLogValveForm.java AddValveAction.java DeleteValveAction.java DeleteValveForm.java DeleteValvesAction.java EditValveAction.java RemoteAddrValveForm.java RemoteHostValveForm.java RequestDumperValveForm.java SaveAccessLogValveAction.java SaveRemoteAddrValveAction.java SaveRemoteHostValveAction.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java SingleSignOnValveForm.java ValveForm.java ValveUtil.java ValvesForm.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java.diff?r1=1.4r2=1.5 1.6 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java.diff?r1=1.5r2=1.6 1.2 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.java.diff?r1=1.1r2=1.2 1.5 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java.diff?r1=1.4r2=1.5 1.3 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java.diff?r1=1.2r2=1.3 1.3 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java.diff?r1=1.2r2=1.3 1.2 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java.diff?r1=1.1r2=1.2 1.2 +14 -59 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java.diff?r1=1.1r2=1.2 1.3 +14 -59
cvs commit: jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/validators DebugValidator.java
markt 2004/08/26 15:03:27 Modified:webapps/examples/WEB-INF/classes CookieExample.java HelloWorldExample.java JndiServlet.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SendMailServlet.java SessionExample.java servletToJsp.java webapps/examples/WEB-INF/classes/listeners ContextListener.java SessionListener.java webapps/examples/WEB-INF/classes/num NumberGuessBean.java webapps/examples/WEB-INF/classes/sessions DummyCart.java webapps/examples/WEB-INF/classes/util HTMLFilter.java webapps/examples/WEB-INF/classes/validators DebugValidator.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.5 +16 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/CookieExample.java Index: CookieExample.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/CookieExample.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CookieExample.java20 Aug 2004 18:42:26 - 1.4 +++ CookieExample.java26 Aug 2004 22:03:27 - 1.5 @@ -1,3 +1,18 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* $Id$ * */ 1.4 +16 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/HelloWorldExample.java Index: HelloWorldExample.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/HelloWorldExample.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HelloWorldExample.java20 Aug 2004 18:42:26 - 1.3 +++ HelloWorldExample.java26 Aug 2004 22:03:27 - 1.4 @@ -1,3 +1,18 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* $Id$ * */ 1.4 +16 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/JndiServlet.java Index: JndiServlet.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/JndiServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JndiServlet.java 20 Aug 2004 18:42:26 - 1.3 +++ JndiServlet.java 26 Aug 2004 22:03:27 - 1.4 @@ -1,3 +1,18 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* $Id$ * */ 1.4 +16 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Index: RequestHeaderExample.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/RequestHeaderExample.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RequestHeaderExample.java 20 Aug 2004 18:42:26 - 1.3 +++
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/sample/src/mypackage Hello.java
markt 2004/08/26 15:04:42 Modified:webapps/examples/WEB-INF/jsp/applet Clock2.java webapps/examples/jsp/colors colrs.jsp webapps/tomcat-docs/appdev/sample/src/mypackage Hello.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.2 +13 -56 jakarta-tomcat-4.0/webapps/examples/WEB-INF/jsp/applet/Clock2.java Index: Clock2.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/jsp/applet/Clock2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Clock2.java 17 Aug 2000 00:58:02 - 1.1 +++ Clock2.java 26 Aug 2004 22:04:42 - 1.2 @@ -1,60 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *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 (http://www.apache.org/). - *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 Group. - * - * 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 - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import java.util.*; import java.awt.*; 1.2 +13 -56jakarta-tomcat-4.0/webapps/examples/jsp/colors/colrs.jsp Index: colrs.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/colors/colrs.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- colrs.jsp 17 Aug 2000 00:58:09 - 1.1 +++ colrs.jsp 26 Aug 2004 22:04:42 - 1.2 @@ -1,62 +1,19 @@ html !-- /* - * - * - * The Apache Software License, Version 1.1 - * -
cvs commit: jakarta-tomcat-4.0 LICENSE
markt 2004/08/26 15:06:34 Modified:.LICENSE Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.6 +202 -61 jakarta-tomcat-4.0/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-4.0/LICENSE,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- LICENSE 24 Dec 2003 19:50:52 - 1.5 +++ LICENSE 26 Aug 2004 22:06:34 - 1.6 @@ -1,61 +1,202 @@ -/* = * - * * - * The Apache Software License, Version 1.1 * - * * - * Copyright (c) 1999, 2000 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, * - *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 http://www.apache.org/. * - * * - *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 http://www.apache.org/. * - *
cvs commit: jakarta-tomcat-catalina/webapps/docs jndi-resources-howto.xml jndi-datasource-examples-howto.xml
remm2004/08/26 16:16:50 Modified:webapps/docs jndi-resources-howto.xml jndi-datasource-examples-howto.xml Log: - Update the JNDI docs after the removal of ResourceParams. Revision ChangesPath 1.7 +24 -91jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jndi-resources-howto.xml 21 Jul 2004 19:24:00 - 1.6 +++ jndi-resources-howto.xml 26 Aug 2004 23:16:50 - 1.7 @@ -30,18 +30,9 @@ pFor Tomcat 5, these entries in per-web-application codeInitialContext/code are configured in the -codestronglt;Contextgt;/strong/code or -codestronglt;DefaultContextgt;/strong/code -elements of the -a href=config/server.htmlcodestronglt;Servergt;/strong/code/a -element. - -The codestronglt;Contextgt;/strong/code element can be specified +codestronglt;Contextgt;/strong/code elements that can be specified in either code$CATALINA_HOME/conf/server.xml/code or, preferably, -the per-web-application context XML file. - -codestronglt;DefaultContextgt;/strong/code must be specified in -code$CATALINA_HOME/conf/server.xml/code. +the per-web-application context XML file (either codeMETA-INF/context.xml/code). /p pTomcat 5 maintains a separate namespace of global resources for the @@ -124,13 +115,6 @@ application (equivalent to the inclusion of a codelt;resource-refgt;/code element in the web application deployment descriptor)./li - -li -a href=config/context.html#Resource Parameterslt;ResourceParamsgt;/a - -Configure the Java class name of the resource factory implementation to be -used, as well as JavaBeans properties used to configure that resource -factory./li - lia href=config/context.html#Resource Linkslt;ResourceLinkgt;/a - Add a link to a resource defined in the global JNDI context. Use resource links to give a web application access to a resource defined in @@ -142,10 +126,7 @@ pAny number of these elements may be nested inside a a href=config/context.htmllt;Contextgt;/a element (to be associated -only with that particular web application) or inside a -a href=config/defaultcontext.htmllt;DefaultContextgt;/a element -(used to set the default configuration characteristics for automatically -deloyed applications)./p +only with that particular web application)./p pIn addition, the names and values of all codelt;env-entrygt;/code elements included in the web application deployment descriptor @@ -282,24 +263,14 @@ pTo configure Tomcat's resource factory, add an elements like this to the code$CATALINA_HOME/conf/server.xml/code file, nested inside the -codeContext/code element for this web application (or nested inside -a codeDefaultContext/code element for the surrounding -codelt;Hostgt;/code or codelt;Enginegt;/code element./p +codeContext/code element for this web application./p source lt;Context ...gt; ... lt;Resource name=bean/MyBeanFactory auth=Container -type=com.mycompany.MyBean/gt; - lt;ResourceParams name=bean/MyBeanFactorygt; -lt;parametergt; - lt;namegt;factorylt;/namegt; - lt;valuegt;org.apache.naming.factory.BeanFactorylt;/valuegt; -lt;/parametergt; -lt;parametergt; - lt;namegt;barlt;/namegt; - lt;valuegt;23lt;/valuegt; -lt;/parametergt; - lt;/ResourceParamsgt; +type=com.mycompany.MyBean +factory=org.apache.naming.factory.BeanFactory +bar=23/gt; ... lt;/Contextgt; /source @@ -397,20 +368,13 @@ pTo configure Tomcat's resource factory, add an elements like this to the code$CATALINA_HOME/conf/server.xml/code file, nested inside the -codeContext/code element for this web application (or nested inside -a codeDefaultContext/code element for the surrounding -codelt;Hostgt;/code or codelt;Enginegt;/code element./p +codeContext/code element for this web application./p source lt;Context ...gt; ... lt;Resource name=mail/Session auth=Container -type=javax.mail.Session/gt; - lt;ResourceParams name=mail/Sessiongt; -lt;parametergt; - lt;namegt;mail.smtp.hostlt;/namegt; - lt;valuegt;localhostlt;/valuegt; -lt;/parametergt; - lt;/ResourceParamsgt; +type=javax.mail.Session +mail.smtp.host=localhost/gt; ... lt;/Contextgt; /source @@ -538,40 +502,18 @@ pTo configure Tomcat's resource factory, add an elements like this to the code$CATALINA_HOME/conf/server.xml/code file, nested
Re: [VOTE] [5.5] Release plan votes
* New native connector for Apache 2, based on mod_proxy Is it true that it will be ready for 5.5? I thought the mod_proxy code would be independent of tomcat version. Otherwise ... Remy Maucherat wrote: ballot I approve the release plan: [X] Yes [ ] No /ballot ballot Tomcat 5.5 should use the following API set for the coding: [ ] J2SE 1.3 [X] J2SE 1.4 [ ] J2SE 5.0 /ballot ballot Yoav Shapira will act as the release manager for this branch: [X] Yes [ ] No /ballot - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 4690] - sessions not scoped according to spec section 7.3
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=4690. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=4690 sessions not scoped according to spec section 7.3 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] Status|RESOLVED|REOPENED Resolution|FIXED | --- Additional Comments From [EMAIL PROTECTED] 2004-08-27 02:36 --- While the new session is now being created and provided to the included resource, no cookie is being added to the response to allow the session to be retrieved when direct requests to the included context are recieved. (Pluto bug PLUTO-53 depends upon a fix to this issue: http://nagoya.apache.org/jira/browse/PLUTO-53) I have have attached a patch. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 4690] - sessions not scoped according to spec section 7.3
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=4690. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=4690 sessions not scoped according to spec section 7.3 --- Additional Comments From [EMAIL PROTECTED] 2004-08-27 02:38 --- Created an attachment (id=12542) Cross Context Patch - Add Cookie if able to - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] [5.5] Release plan votes
Remy Maucherat wrote: ballot I approve the release plan: [X] Yes [ ] No /ballot ballot Tomcat 5.5 should use the following API set for the coding: [X] J2SE 1.3 [ ] J2SE 1.4 [ ] J2SE 5.0 /ballot Actually - use target=1.3 - but the distribution should be 1.4 based (i.e. no Xerces ). I'm also ok with having a 1.5 distribution ( no xerces, no mx4j ) - but again, with target=1.3 and instructions for 1.3 and 1.4 users to download the missing jars. You can have target=1.3 with j2se without harm. ballot Yoav Shapira will act as the release manager for this branch: [X] Yes [ ] No /ballot Thanks :) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
