cvs commit: jakarta-tomcat-catalina/webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp valves.jsp
billbarker2004/10/17 23:37:57 Modified:webapps/admin/WEB-INF struts-config.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin CommitChangesAction.java DumpRegistryAction.java DumpServerAction.java LogOutAction.java SetLocaleAction.java SetUpTreeAction.java TomcatTreeBuilder.java TreeControlTag.java TreeControlTestAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java DeleteConnectorAction.java DeleteConnectorsAction.java EditConnectorAction.java SaveConnectorAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context AddContextAction.java DeleteContextAction.java DeleteContextsAction.java EditContextAction.java SaveContextAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host AddAliasAction.java AddHostAction.java DeleteAliasAction.java DeleteAliasesAction.java DeleteHostAction.java DeleteHostsAction.java EditHostAction.java SaveAliasAction.java SaveHostAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm AddRealmAction.java DeleteRealmAction.java DeleteRealmsAction.java EditRealmAction.java SaveDataSourceRealmAction.java SaveJDBCRealmAction.java SaveJNDIRealmAction.java SaveMemoryRealmAction.java SaveUserDatabaseRealmAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources DeleteDataSourcesAction.java DeleteEnvEntriesAction.java DeleteMailSessionsAction.java DeleteResourceLinksAction.java DeleteUserDatabasesAction.java ListDataSourcesAction.java ListEnvEntriesAction.java ListMailSessionsAction.java ListResourceLinksAction.java ListUserDatabasesAction.java ResourcesTreeBuilder.java SaveDataSourceAction.java SaveEnvEntryAction.java SaveMailSessionAction.java SaveResourceLinkAction.java SaveUserDatabaseAction.java SetUpDataSourceAction.java SetUpEnvEntryAction.java SetUpMailSessionAction.java SetUpResourceLinkAction.java SetUpUserDatabaseAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server EditServerAction.java SaveServerAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service AddServiceAction.java DeleteServiceAction.java DeleteServicesAction.java EditServiceAction.java SaveServiceAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users DeleteGroupsAction.java DeleteRolesAction.java DeleteUsersAction.java GroupForm.java ListGroupsAction.java ListRolesAction.java ListUsersAction.java SaveGroupAction.java SaveRoleAction.java SaveUserAction.java SetUpGroupAction.java SetUpRoleAction.java SetUpUserAction.java UserForm.java UsersTreeBuilder.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AddValveAction.java DeleteValveAction.java DeleteValvesAction.java EditValveAction.java SaveAccessLogValveAction.java SaveRemoteAddrValveAction.java SaveRemoteHostValveAction.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java ValveUtil.java webapps/admin/connector connector.jsp connectors.jsp webapps/admin/context context.jsp contexts.jsp webapps/admin/host host.jsp hosts.jsp webapps/admin/realm dataSourceRealm.jsp jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp realms.jsp userDatabaseRealm.jsp webapps/admin/resources dataSource.jsp dataSources.jspf envEntries.jspf envEntry.jsp listDataSources.jspf
cvs commit: jakarta-tomcat-5 build.properties.default
billbarker2004/10/17 23:45:00
Modified:.build.properties.default
Log:
Update to struts-1.2.4
Revision ChangesPath
1.138 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- build.properties.default 5 Oct 2004 14:01:52 - 1.137
+++ build.properties.default 18 Oct 2004 06:45:00 - 1.138
@@ -205,11 +205,11 @@
nsis.loc=${base-sf.loc}/nsis/nsis20.exe
-# - Struts, version 1.1 or later -
-struts.home=${base.path}/jakarta-struts-1.1
+# - Struts, version 1.2.4 or later -
+struts.home=${base.path}/jakarta-struts-1.2.4
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
-struts.loc=${base-jakarta.loc}/struts/binaries/jakarta-struts-1.1.tar.gz
+struts.loc=${base-jakarta.loc}/../struts/binaries/jakarta-struts-1.2.4.tar.gz
# --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/etc modules.xml server.xml
billbarker2004/02/16 22:28:57 Modified:src/etc modules.xml server.xml Log: Add back CoyoteConnector as an alias. Make the CoyoteConnector the default Connector. Revision ChangesPath 1.17 +1 -5 jakarta-tomcat/src/etc/modules.xml Index: modules.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/modules.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modules.xml 3 Oct 2003 08:31:08 - 1.16 +++ modules.xml 17 Feb 2004 06:28:57 - 1.17 @@ -21,11 +21,7 @@ - + 1.102 +11 -13jakarta-tomcat/src/etc/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- server.xml1 Oct 2003 09:49:58 - 1.101 +++ server.xml17 Feb 2004 06:28:57 - 1.102 @@ -178,7 +178,7 @@ --> - + - @@ -246,6 +245,7 @@ --> + - + - - + - -->
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common HandlerRequest.java
billbarker2004/02/18 19:44:00 Modified:jk/java/org/apache/jk/common HandlerRequest.java Log: Fix JMX Request registration. And, yes I did test it this time :). Reported By: Jess Holle [EMAIL PROTECTED] Revision ChangesPath 1.33 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- HandlerRequest.java 27 Jan 2004 11:49:35 - 1.32 +++ HandlerRequest.java 19 Feb 2004 03:44:00 - 1.33 @@ -504,7 +504,7 @@ RequestInfo rp=req.getRequestProcessor(); rp.setGlobalProcessor(global); ObjectName roname = new ObjectName(getDomain() + - "type=RequestProcessor,name=JkRequest" +count++); + ":type=RequestProcessor,name=JkRequest" +count++); ep.setNote(JMXRequestNote, roname); Registry.getRegistry().registerComponent( rp, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/native/mod_jk/nt_service jk_nt_service.c nt_service.dsp
billbarker2004/02/18 21:48:18 Removed: src/native/mod_jk OBSOLETE.txt README src/native/mod_jk/apache1.3 Makefile.freebsd Makefile.linux Makefile.nw README.hpux README.solaris build-hpux-cc.sh build-hpux.sh build-solaris.sh build-unix.sh install-unix.sh mod_jk.c mod_jk.dsp src/native/mod_jk/common jk_ajp12_worker.c jk_ajp12_worker.h jk_ajp13.c jk_ajp13.h jk_ajp13_worker.c jk_ajp13_worker.h jk_connect.c jk_connect.h jk_global.h jk_jni_worker.c jk_jni_worker.h jk_lb_worker.c jk_lb_worker.h jk_logger.h jk_map.c jk_map.h jk_msg_buff.c jk_msg_buff.h jk_mt.h jk_nwmain.c jk_pool.c jk_pool.h jk_service.h jk_sockbuf.c jk_sockbuf.h jk_uri_worker_map.c jk_uri_worker_map.h jk_util.c jk_util.h jk_version.h jk_worker.c jk_worker.h jk_worker_list.h src/native/mod_jk/iis isapi.def isapi.dsp isapi.dsw jk_isapi_plugin.c src/native/mod_jk/jni Makefile.nw Makefile.solaris jk_jnicb.c jk_jnicb.exp jk_jnicb.h jni_connect.dsp jni_connect.dsw src/native/mod_jk/netscape Makefile.nw Makefile.solaris jk_nsapi_plugin.c nsapi.dsp nsapi.dsw src/native/mod_jk/nt_service jk_nt_service.c nt_service.dsp Log: Removing mod_jk 1.1. If anyone wants it, they can always get it from the TC 3.3.1 distro. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat NOTICE LICENSE
billbarker2004/02/22 13:14:29 Modified:.LICENSE Added: .NOTICE Log: Upgrading to the Apache v2.0 License. Revision ChangesPath 1.2 +203 -60 jakarta-tomcat/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat/LICENSE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE 9 Oct 1999 00:19:57 - 1.1 +++ LICENSE 22 Feb 2004 21:14:29 - 1.2 @@ -1,63 +1,206 @@ -/* - * $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/>. - * - */ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration file
cvs commit: jakarta-tomcat/src/admin/WEB-INF/classes/tadm AntProperty.java AntServletLogger.java AntTEI.java AntTag.java AntTarget.java ContextAdmin.java GTestTEI.java GTestTag.java ModuleAdmin.java ModuleAdminTEI.java ThreadAdmin.java TomcatAdmin.java TomcatAdminTEI.java TomcatIterate.java TomcatIterateTEI.java
billbarker2004/02/22 13:31:51 Modified:src/admin/WEB-INF/classes/tadm AntProperty.java AntServletLogger.java AntTEI.java AntTag.java AntTarget.java ContextAdmin.java GTestTEI.java GTestTag.java ModuleAdmin.java ModuleAdminTEI.java ThreadAdmin.java TomcatAdmin.java TomcatAdminTEI.java TomcatIterate.java TomcatIterateTEI.java Log: Licencing under Apache Licence v2.0 Revision ChangesPath 1.5 +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntProperty.java Index: AntProperty.java === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntProperty.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AntProperty.java 29 Sep 2003 07:39:49 - 1.4 +++ AntProperty.java 22 Feb 2004 21:31:50 - 1.5 @@ -1,3 +1,19 @@ +/* + * Copyright 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 tadm; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; 1.4 +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntServletLogger.java Index: AntServletLogger.java === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntServletLogger.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AntServletLogger.java 29 Sep 2003 07:39:49 - 1.3 +++ AntServletLogger.java 22 Feb 2004 21:31:51 - 1.4 @@ -1,3 +1,19 @@ +/* + * Copyright 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 tadm; import java.io.IOException; import java.io.PrintStream; 1.3 +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTEI.java Index: AntTEI.java === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTEI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntTEI.java 29 Sep 2003 07:39:49 - 1.2 +++ AntTEI.java 22 Feb 2004 21:31:51 - 1.3 @@ -1,3 +1,19 @@ +/* + * Copyright 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 tadm; import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; 1.7 +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java Index: AntTag.java === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AntTag.java 29 Sep 2003 07:39:49 - 1.6 +++ AntTag.java 22 Feb 2004 21:31:51 - 1.7 @@ -1,3 +1,19 @@ +/* + * Copyright 2001-2004 The Apache Software Foundation + * + *
cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts run-test.bat run-test.sh watchdog-jsp.xml watchdog-servlet.xml
billbarker2004/02/22 13:38:58 Modified:src/admin/WEB-INF/scripts run-test.bat run-test.sh watchdog-jsp.xml watchdog-servlet.xml Log: Licencing with Apache Licence v2.0. Revision ChangesPath 1.4 +15 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.bat Index: run-test.bat === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- run-test.bat 22 Sep 2001 02:54:43 - 1.3 +++ run-test.bat 22 Feb 2004 21:38:58 - 1.4 @@ -1,3 +1,18 @@ +rem +rem Copyright 2001-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem @echo off rem Batch file to run the tomcat sanity test suite 1.5 +14 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.sh Index: run-test.sh === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- run-test.sh 22 Sep 2001 02:54:43 - 1.4 +++ run-test.sh 22 Feb 2004 21:38:58 - 1.5 @@ -1,5 +1,19 @@ #!/bin/sh # +# Copyright 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. +# # Shell script to run the tomcat sanity test suite 1.4 +16 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml Index: watchdog-jsp.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- watchdog-jsp.xml 20 Feb 2004 03:55:03 - 1.3 +++ watchdog-jsp.xml 22 Feb 2004 21:38:58 - 1.4 @@ -1,3 +1,19 @@ + + 1.8 +16 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml Index: watchdog-servlet.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- watchdog-servlet.xml 20 Feb 2004 03:55:03 - 1.7 +++ watchdog-servlet.xml 22 Feb 2004 21:38:58 - 1.8 @@ -1,3 +1,19 @@ + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/WEB-INF admin.tld ant.tld web.xml
billbarker2004/02/22 13:42:26 Modified:src/admin/WEB-INF admin.tld ant.tld web.xml Log: Licencing with Apache License v2.0. Revision ChangesPath 1.11 +16 -0 jakarta-tomcat/src/admin/WEB-INF/admin.tld Index: admin.tld === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- admin.tld 4 Apr 2003 06:33:20 - 1.10 +++ admin.tld 22 Feb 2004 21:42:26 - 1.11 @@ -1,4 +1,20 @@ + + http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";> 1.3 +16 -0 jakarta-tomcat/src/admin/WEB-INF/ant.tld Index: ant.tld === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/ant.tld,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ant.tld 1 Feb 2001 04:43:48 - 1.2 +++ ant.tld 22 Feb 2004 21:42:26 - 1.3 @@ -1,4 +1,20 @@ + + http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";> 1.8 +16 -0 jakarta-tomcat/src/admin/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/web.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- web.xml 1 Feb 2001 04:43:48 - 1.7 +++ web.xml 22 Feb 2004 21:42:26 - 1.8 @@ -1,4 +1,20 @@ + + http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/contextAdmin adminError.jsp contextAdd.jsp contextAdmin.html contextAdmin.jsp contextList.jsp contextRemove.jsp contextRestart.jsp contextsRestart.jsp ctxDetail.jsp moduleList.jsp restart.jsp sessionExpire.jsp sessionState.jsp threadList.jsp
billbarker2004/02/22 13:53:28 Modified:src/admin/contextAdmin adminError.jsp contextAdd.jsp contextAdmin.html contextAdmin.jsp contextList.jsp contextRemove.jsp contextRestart.jsp contextsRestart.jsp ctxDetail.jsp moduleList.jsp restart.jsp sessionExpire.jsp sessionState.jsp threadList.jsp Log: Updating to Apache License v2.0. Revision ChangesPath 1.2 +13 -2 jakarta-tomcat/src/admin/contextAdmin/adminError.jsp Index: adminError.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/adminError.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- adminError.jsp22 Sep 2001 23:55:47 - 1.1 +++ adminError.jsp22 Feb 2004 21:53:28 - 1.2 @@ -2,8 +2,19 @@ <%@ page isErrorPage="true" %> 1.3 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdd.jsp Index: contextAdd.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdd.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- contextAdd.jsp4 Apr 2003 06:33:20 - 1.2 +++ contextAdd.jsp22 Feb 2004 21:53:28 - 1.3 @@ -3,8 +3,19 @@ prefix="adm" %> 1.5 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html Index: contextAdmin.html === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- contextAdmin.html 4 Apr 2003 06:33:20 - 1.4 +++ contextAdmin.html 22 Feb 2004 21:53:28 - 1.5 @@ -1,7 +1,18 @@ 1.3 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp Index: contextAdmin.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- contextAdmin.jsp 27 Dec 2000 21:41:31 - 1.2 +++ contextAdmin.jsp 22 Feb 2004 21:53:28 - 1.3 @@ -1,7 +1,18 @@ 1.5 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextList.jsp Index: contextList.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextList.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- contextList.jsp 4 Apr 2003 06:33:20 - 1.4 +++ contextList.jsp 22 Feb 2004 21:53:28 - 1.5 @@ -4,8 +4,19 @@ prefix="adm" %> 1.3 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextRemove.jsp Index: contextRemove.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextRemove.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- contextRemove.jsp 4 Apr 2003 06:33:20 - 1.2 +++ contextRemove.jsp 22 Feb 2004 21:53:28 - 1.3 @@ -3,8 +3,19 @@ prefix="adm" %> 1.2 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextRestart.jsp Index: contextRestart.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextRestart.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- contextRestart.jsp4 Apr 2003 06:35:18 - 1.1 +++ contextRestart.jsp22 Feb 2004 21:53:28 - 1.2 @@ -5,8 +5,19 @@ prefix="adm" %> 1.2 +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextsRestart.jsp Index: contextsRestart.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextsRestart.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- contextsRestart.jsp 4 Apr 2003 06:35:18 - 1.1 +++ contextsRestart.jsp 22 Feb 2004 21:53:28 - 1.2 @@ -3,8 +3,19 @@ <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; prefix="adm" %> 1.6 +15 -0 jakarta-tomcat/src/admin/contextAdmin/ctxDetail.jsp Index: ctxDetail.jsp ==
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp watchdog-servlet.jsp
billbarker2004/02/22 13:58:41 Modified:src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp watchdog-servlet.jsp Log: Updating to Apache License v2.0. Revision ChangesPath 1.9 +15 -0 jakarta-tomcat/src/admin/test/sanity-form.jsp Index: sanity-form.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/sanity-form.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sanity-form.jsp 20 Feb 2004 03:55:03 - 1.8 +++ sanity-form.jsp 22 Feb 2004 21:58:41 - 1.9 @@ -1,3 +1,18 @@ + <%! void listOptions(String[] opts, String sel, JspWriter out) 1.20 +18 -1 jakarta-tomcat/src/admin/test/test.jsp Index: test.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- test.jsp 31 Dec 2001 21:46:16 - 1.19 +++ test.jsp 22 Feb 2004 21:58:41 - 1.20 @@ -1,4 +1,21 @@ -Tomcat Self-Test + + +Tomcat Self-Test + Tomcat Self-test <%@ page import="java.util.*" %> 1.5 +15 -0 jakarta-tomcat/src/admin/test/watchdog-jsp.jsp Index: watchdog-jsp.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-jsp.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- watchdog-jsp.jsp 17 Jul 2001 13:40:52 - 1.4 +++ watchdog-jsp.jsp 22 Feb 2004 21:58:41 - 1.5 @@ -1,3 +1,18 @@ + Tomcat Self-test <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; 1.3 +15 -0 jakarta-tomcat/src/admin/test/watchdog-servlet.jsp Index: watchdog-servlet.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-servlet.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- watchdog-servlet.jsp 1 Feb 2001 04:43:48 - 1.2 +++ watchdog-servlet.jsp 22 Feb 2004 21:58:41 - 1.3 @@ -1,3 +1,18 @@ + Tomcat Self-test <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin index.html
billbarker2004/02/22 14:01:42 Modified:src/admin index.html Log: Update to Apache License v2.0. Revision ChangesPath 1.7 +13 -2 jakarta-tomcat/src/admin/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/admin/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.html18 Apr 2002 13:57:59 - 1.6 +++ index.html22 Feb 2004 22:01:42 - 1.7 @@ -1,7 +1,18 @@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/cal Entries.java Entry.java JspCalendar.java TableBean.java
billbarker2004/02/22 14:34:42 Modified:src/examples/WEB-INF/classes/cal Entries.java Entry.java JspCalendar.java TableBean.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entries.java Index: Entries.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entries.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Entries.java 29 Sep 2003 07:39:50 - 1.3 +++ Entries.java 22 Feb 2004 22:34:42 - 1.4 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Software Foundation * - * 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] - * - */ + * 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 cal; import java.util.Hashtable; 1.3 +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entry.java Index: Entry.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Entry.java8 Feb 2000 18:25:29 - 1.2 +++ Entry.java22 Feb 2004 22:34:42 - 1.3 @@ -1,61 +1,18 @@ -/* - * ==
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/checkbox CheckTest.java
billbarker2004/02/22 14:41:11
Modified:src/examples/WEB-INF/classes/checkbox CheckTest.java
Log:
Updating to the Apache License v2.0.
Revision ChangesPath
1.3 +14 -57
jakarta-tomcat/src/examples/WEB-INF/classes/checkbox/CheckTest.java
Index: CheckTest.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/checkbox/CheckTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckTest.java8 Feb 2000 18:25:30 - 1.2
+++ CheckTest.java22 Feb 2004 22:41:11 - 1.3
@@ -1,61 +1,18 @@
-/*
- *
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
*
- * 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]
- *
- */
+ * 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 checkbox;
public class CheckTest {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/colors ColorGameBean.java
billbarker2004/02/22 14:42:25 Modified:src/examples/WEB-INF/classes/colors ColorGameBean.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -57 jakarta-tomcat/src/examples/WEB-INF/classes/colors/ColorGameBean.java Index: ColorGameBean.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/colors/ColorGameBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ColorGameBean.java29 Sep 2003 07:39:50 - 1.3 +++ ColorGameBean.java22 Feb 2004 22:42:24 - 1.4 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Software Foundation * - * 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] - * - */ + * 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 colors; import javax.servlet.http.HttpServletRequest; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/dates JspCalendar.java
billbarker2004/02/22 14:44:19 Modified:src/examples/WEB-INF/classes/dates JspCalendar.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -57 jakarta-tomcat/src/examples/WEB-INF/classes/dates/JspCalendar.java Index: JspCalendar.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/dates/JspCalendar.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspCalendar.java 29 Sep 2003 07:39:48 - 1.3 +++ JspCalendar.java 22 Feb 2004 22:44:19 - 1.4 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Software Foundation * - * 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] - * - */ + * 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 dates; import java.util.Calendar; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/error Smart.java
billbarker2004/02/22 14:45:37 Modified:src/examples/WEB-INF/classes/error Smart.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/error/Smart.java Index: Smart.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/error/Smart.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Smart.java29 Sep 2003 07:39:49 - 1.3 +++ Smart.java22 Feb 2004 22:45:37 - 1.4 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Software Foundation * - * 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] - * - */ + * 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 error; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/examples ExampleTagBase.java FooTag.java FooTagExtraInfo.java LogTag.java ShowSource.java
billbarker2004/02/22 14:47:50 Modified:src/examples/WEB-INF/classes/examples ExampleTagBase.java FooTag.java FooTagExtraInfo.java LogTag.java ShowSource.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/ExampleTagBase.java Index: ExampleTagBase.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/ExampleTagBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExampleTagBase.java 29 Sep 2003 07:39:48 - 1.2 +++ ExampleTagBase.java 22 Feb 2004 22:47:50 - 1.3 @@ -1,3 +1,18 @@ +/* + * 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 examples; import javax.servlet.jsp.JspException; 1.4 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTag.java Index: FooTag.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FooTag.java 29 Sep 2003 07:39:48 - 1.3 +++ FooTag.java 22 Feb 2004 22:47:50 - 1.4 @@ -1,3 +1,18 @@ +/* + * 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 examples; import java.io.IOException; 1.3 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTagExtraInfo.java Index: FooTagExtraInfo.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTagExtraInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FooTagExtraInfo.java 29 Sep 2003 07:39:48 - 1.2 +++ FooTagExtraInfo.java 22 Feb 2004 22:47:50 - 1.3 @@ -1,3 +1,18 @@ +/* + * 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 examples; import javax.servlet.jsp.tagext.TagData; 1.4 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/LogTag.java Index: LogTag.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/LogTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LogTag.java 29 Sep 2003 07:39:48 - 1.3 +++ LogTag.java 22 Feb 2004 22:47:50 - 1.4 @@ -1,3 +1,18 @@ +/* + * 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 app
cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/util HTMLFilter.java
billbarker2004/02/22 14:57:59 Modified:src/examples/WEB-INF/classes CookieExample.java CookieExample1.java Hello.java HelloW.java HelloWorldExample.java LocalStrings.properties LocalStrings_en.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java SnoopServlet.java servletToJsp.java src/examples/WEB-INF/classes/num NumberGuessBean.java src/examples/WEB-INF/classes/sessions DummyCart.java src/examples/WEB-INF/classes/util HTMLFilter.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +16 -1 jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample.java Index: CookieExample.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CookieExample.java29 Sep 2003 07:39:48 - 1.3 +++ CookieExample.java22 Feb 2004 22:57:59 - 1.4 @@ -1,6 +1,21 @@ /* $Id$ * */ +/* + * 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.io.IOException; import java.io.PrintWriter; 1.5 +16 -1 jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample1.java Index: CookieExample1.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample1.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CookieExample1.java 29 Sep 2003 07:39:48 - 1.4 +++ CookieExample1.java 22 Feb 2004 22:57:59 - 1.5 @@ -1,6 +1,21 @@ /* $Id$ * */ +/* + * 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.io.IOException; import java.io.PrintWriter; 1.4 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java Index: Hello.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Hello.java29 Sep 2003 07:39:48 - 1.3 +++ Hello.java22 Feb 2004 22:57:59 - 1.4 @@ -1,3 +1,18 @@ +/* + * 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.io.IOException; import javax.servlet.ServletConfig; 1.4 +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/HelloW.java Index: HelloW.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/
cvs commit: jakarta-tomcat/src/examples/WEB-INF/jsp/applet Clock2.java
billbarker2004/02/22 15:02:14 Modified:src/examples/WEB-INF web.xml src/examples/WEB-INF/jsp example-taglib.tld src/examples/WEB-INF/jsp/applet Clock2.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.15 +15 -0 jakarta-tomcat/src/examples/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- web.xml 25 Aug 2001 16:12:46 - 1.14 +++ web.xml 22 Feb 2004 23:02:14 - 1.15 @@ -1,4 +1,19 @@ + + http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";> 1.3 +14 -57jakarta-tomcat/src/examples/WEB-INF/jsp/applet/Clock2.java Index: Clock2.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/jsp/applet/Clock2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Clock2.java 8 Feb 2000 18:25:31 - 1.2 +++ Clock2.java 22 Feb 2004 23:02:14 - 1.3 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Software Foundation * - * 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] - * - */ + * 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.*;
cvs commit: jakarta-tomcat/src/examples/jsp/cal Entries.txt Entry.txt JspCalendar.txt TableBean.txt cal1.jsp cal1.txt cal2.txt calendar.html login.html
billbarker2004/02/22 15:08:11 Modified:src/examples/jsp/cal Entries.txt Entry.txt JspCalendar.txt TableBean.txt cal1.jsp cal1.txt cal2.txt calendar.html login.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +15 -3 jakarta-tomcat/src/examples/jsp/cal/Entries.txt Index: Entries.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/Entries.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Entries.txt 20 Oct 1999 20:39:17 - 1.2 +++ Entries.txt 22 Feb 2004 23:08:11 - 1.3 @@ -1,7 +1,19 @@ -/* - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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 cal; 1.3 +15 -3 jakarta-tomcat/src/examples/jsp/cal/Entry.txt Index: Entry.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/Entry.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Entry.txt 20 Oct 1999 20:39:17 - 1.2 +++ Entry.txt 22 Feb 2004 23:08:11 - 1.3 @@ -1,7 +1,19 @@ -/* - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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 cal; 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/cal/JspCalendar.txt Index: JspCalendar.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/JspCalendar.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JspCalendar.txt 20 Oct 1999 20:39:17 - 1.2 +++ JspCalendar.txt 22 Feb 2004 23:08:11 - 1.3 @@ -1,6 +1,17 @@ -/* - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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 cal; 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/cal/TableBean.txt Index: TableBean.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/TableBean.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TableBean.txt 20 Oct 1999 20:39:17 - 1.2 +++ TableBean.txt 22 Feb 2004 23:08:11 - 1.3 @@ -1,6 +1,17 @@ -/* - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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
cvs commit: jakarta-tomcat/src/examples/jsp/checkbox CheckTest.html check.html checkresult.jsp checkresult.txt cresult.html
billbarker2004/02/22 15:10:53 Modified:src/examples/jsp/checkbox CheckTest.html check.html checkresult.jsp checkresult.txt cresult.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/CheckTest.html Index: CheckTest.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/CheckTest.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CheckTest.html20 Oct 1999 20:39:51 - 1.2 +++ CheckTest.html22 Feb 2004 23:10:52 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/check.html Index: check.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/check.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check.html20 Oct 1999 20:39:52 - 1.2 +++ check.html22 Feb 2004 23:10:52 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/checkresult.jsp Index: checkresult.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/checkresult.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkresult.jsp 16 Feb 2003 23:14:00 - 1.3 +++ checkresult.jsp 22 Feb 2004 23:10:52 - 1.4 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/checkresult.txt Index: checkresult.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/checkresult.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkresult.txt 20 Oct 1999 20:39:52 - 1.2 +++ checkresult.txt 22 Feb 2004 23:10:52 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/cresult.html Index: cresult.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/cresult.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cresult.html 10 Mar 2001 03:00:54 - 1.3 +++ cresult.html 22 Feb 2004 23:10:52 - 1.4 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/colors ColorGameBean.html clr.html colors.html colors.txt colrs.jsp
billbarker2004/02/22 15:13:32 Modified:src/examples/jsp/colors ColorGameBean.html clr.html colors.html colors.txt colrs.jsp Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html Index: ColorGameBean.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ColorGameBean.html20 Oct 1999 23:17:14 - 1.2 +++ ColorGameBean.html22 Feb 2004 23:13:32 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/colors/clr.html Index: clr.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/clr.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clr.html 10 Mar 2001 03:00:54 - 1.3 +++ clr.html 22 Feb 2004 23:13:32 - 1.4 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.html Index: colors.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- colors.html 20 Oct 1999 23:17:18 - 1.2 +++ colors.html 22 Feb 2004 23:13:32 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.txt Index: colors.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- colors.txt20 Oct 1999 23:17:19 - 1.2 +++ colors.txt22 Feb 2004 23:13:32 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -59jakarta-tomcat/src/examples/jsp/colors/colrs.jsp Index: colrs.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colrs.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- colrs.jsp 8 Feb 2000 18:25:32 - 1.2 +++ colrs.jsp 22 Feb 2004 23:13:32 - 1.3 @@ -1,63 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/dates date.html date.jsp date.txt
billbarker2004/02/22 15:15:41 Modified:src/examples/jsp/dates date.html date.jsp date.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.html Index: date.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- date.html 10 Mar 2001 03:00:54 - 1.3 +++ date.html 22 Feb 2004 23:15:41 - 1.4 @@ -1,7 +1,18 @@ - 1.5 +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.jsp Index: date.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- date.jsp 12 Jan 2000 07:11:14 - 1.4 +++ date.jsp 22 Feb 2004 23:15:41 - 1.5 @@ -1,7 +1,18 @@ - <%@ page session="false"%> 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.txt Index: date.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- date.txt 12 Jan 2000 07:11:14 - 1.3 +++ date.txt 22 Feb 2004 23:15:41 - 1.4 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/error er.html err.jsp err.txt error.html errorpge.jsp
billbarker2004/02/22 15:17:55 Modified:src/examples/jsp/error er.html err.jsp err.txt error.html errorpge.jsp Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/error/er.html Index: er.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/er.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- er.html 10 Mar 2001 03:00:55 - 1.3 +++ er.html 22 Feb 2004 23:17:55 - 1.4 @@ -1,7 +1,18 @@ - 1.3 +15 -3 jakarta-tomcat/src/examples/jsp/error/err.jsp Index: err.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/err.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- err.jsp 20 Oct 1999 23:18:13 - 1.2 +++ err.jsp 22 Feb 2004 23:17:55 - 1.3 @@ -1,8 +1,20 @@ - + <%@ page errorPage="errorpge.jsp" %> 1.3 +15 -3 jakarta-tomcat/src/examples/jsp/error/err.txt Index: err.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/err.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- err.txt 20 Oct 1999 23:18:13 - 1.2 +++ err.txt 22 Feb 2004 23:17:55 - 1.3 @@ -1,8 +1,20 @@ - + <%@ page errorPage="errorpge.jsp" %> 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/error/error.html Index: error.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/error.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- error.html20 Oct 1999 23:18:14 - 1.2 +++ error.html22 Feb 2004 23:17:55 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/error/errorpge.jsp Index: errorpge.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/errorpge.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- errorpge.jsp 20 Oct 1999 23:18:14 - 1.2 +++ errorpge.jsp 22 Feb 2004 23:17:55 - 1.3 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/forward forward.jsp forward.txt fwd.html one.jsp two.html
billbarker2004/02/22 15:20:28 Modified:src/examples/jsp/forward forward.jsp forward.txt fwd.html one.jsp two.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/forward/forward.jsp Index: forward.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/forward.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- forward.jsp 20 Oct 1999 23:18:35 - 1.2 +++ forward.jsp 22 Feb 2004 23:20:28 - 1.3 @@ -1,7 +1,18 @@ - <% 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/forward/forward.txt Index: forward.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/forward.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- forward.txt 20 Oct 1999 23:18:37 - 1.2 +++ forward.txt 22 Feb 2004 23:20:28 - 1.3 @@ -1,7 +1,18 @@ - <% 1.4 +15 -3 jakarta-tomcat/src/examples/jsp/forward/fwd.html Index: fwd.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/fwd.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwd.html 10 Mar 2001 03:00:55 - 1.3 +++ fwd.html 22 Feb 2004 23:20:28 - 1.4 @@ -1,8 +1,20 @@ - + Untitled Document 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/forward/one.jsp Index: one.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/one.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- one.jsp 20 Oct 1999 23:18:39 - 1.2 +++ one.jsp 22 Feb 2004 23:20:28 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +15 -3 jakarta-tomcat/src/examples/jsp/forward/two.html Index: two.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/two.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- two.html 14 Jan 2004 08:39:14 - 1.3 +++ two.html 22 Feb 2004 23:20:28 - 1.4 @@ -1,8 +1,20 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/include foo.jsp inc.html include.jsp include.txt
billbarker2004/02/22 15:22:51 Modified:src/examples/jsp/include foo.jsp inc.html include.jsp include.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/include/foo.jsp Index: foo.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/foo.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- foo.jsp 20 Oct 1999 23:19:01 - 1.2 +++ foo.jsp 22 Feb 2004 23:22:51 - 1.3 @@ -1,6 +1,17 @@ - 1.4 +15 -3 jakarta-tomcat/src/examples/jsp/include/inc.html Index: inc.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/inc.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- inc.html 10 Mar 2001 03:00:55 - 1.3 +++ inc.html 22 Feb 2004 23:22:51 - 1.4 @@ -1,8 +1,20 @@ - + Untitled Document 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/include/include.jsp Index: include.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/include.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- include.jsp 20 Oct 1999 23:19:02 - 1.2 +++ include.jsp 22 Feb 2004 23:22:51 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/include/include.txt Index: include.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/include.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- include.txt 20 Oct 1999 23:19:02 - 1.2 +++ include.txt 22 Feb 2004 23:22:51 - 1.3 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/jsptoserv hello.jsp jsptoservlet.jsp jts.html jts.txt stj.txt
billbarker2004/02/22 15:26:25 Modified:src/examples/jsp/jsptoserv hello.jsp jsptoservlet.jsp jts.html jts.txt stj.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/hello.jsp Index: hello.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/hello.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hello.jsp 20 Oct 1999 23:19:26 - 1.2 +++ hello.jsp 22 Feb 2004 23:26:25 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jsptoservlet.jsp Index: jsptoservlet.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jsptoservlet.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jsptoservlet.jsp 20 Oct 1999 23:19:26 - 1.2 +++ jsptoservlet.jsp 22 Feb 2004 23:26:25 - 1.3 @@ -1,7 +1,18 @@ - 1.5 +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jts.html Index: jts.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jts.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jts.html 11 Mar 2001 21:32:14 - 1.4 +++ jts.html 22 Feb 2004 23:26:25 - 1.5 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jts.txt Index: jts.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jts.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jts.txt 20 Oct 1999 23:19:27 - 1.2 +++ jts.txt 22 Feb 2004 23:26:25 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +15 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/stj.txt Index: stj.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/stj.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stj.txt 20 Oct 1999 23:19:28 - 1.2 +++ stj.txt 22 Feb 2004 23:26:25 - 1.3 @@ -1,7 +1,19 @@ -/** - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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 javax.servlet.*; import javax.servlet.http.*; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/num numguess.html numguess.jsp numguess.txt
billbarker2004/02/22 15:28:47 Modified:src/examples/jsp/num numguess.html numguess.jsp numguess.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.5 +15 -3 jakarta-tomcat/src/examples/jsp/num/numguess.html Index: numguess.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/num/numguess.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- numguess.html 31 May 2000 20:29:10 - 1.4 +++ numguess.html 22 Feb 2004 23:28:47 - 1.5 @@ -1,8 +1,20 @@ +
cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java
billbarker2004/02/22 15:32:15 Modified:src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt src/examples/jsp/plugin/applet Clock2.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.html Index: plugin.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plugin.html 10 Mar 2001 03:00:55 - 1.3 +++ plugin.html 22 Feb 2004 23:32:15 - 1.4 @@ -1,7 +1,18 @@ - Untitled Document 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp Index: plugin.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plugin.jsp20 Oct 1999 23:19:50 - 1.2 +++ plugin.jsp22 Feb 2004 23:32:15 - 1.3 @@ -1,7 +1,18 @@ - Plugin example 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.txt Index: plugin.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plugin.txt20 Oct 1999 23:19:51 - 1.2 +++ plugin.txt22 Feb 2004 23:32:15 - 1.3 @@ -1,7 +1,18 @@ - Plugin example 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java Index: Clock2.java === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Clock2.java 20 Oct 1999 23:19:53 - 1.2 +++ Clock2.java 22 Feb 2004 23:32:15 - 1.3 @@ -1,6 +1,17 @@ -/* - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. +/* + * 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.*; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/security/protected index.jsp
billbarker2004/02/22 15:35:45 Modified:src/examples/jsp/security error.txt index.jsp index.txt login.txt policy.jsp security.html src/examples/jsp/security/login error.jsp login.jsp src/examples/jsp/security/protected index.jsp Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +15 -0 jakarta-tomcat/src/examples/jsp/security/error.txt Index: error.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/error.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- error.txt 9 Oct 2000 02:38:14 - 1.2 +++ error.txt 22 Feb 2004 23:35:45 - 1.3 @@ -1,4 +1,19 @@ + Login Error 1.2 +14 -3 jakarta-tomcat/src/examples/jsp/security/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/index.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.jsp 9 Mar 2001 22:54:06 - 1.1 +++ index.jsp 22 Feb 2004 23:35:45 - 1.2 @@ -1,7 +1,18 @@ - 1.3 +15 -0 jakarta-tomcat/src/examples/jsp/security/index.txt Index: index.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/index.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.txt 9 Oct 2000 02:38:14 - 1.2 +++ index.txt 22 Feb 2004 23:35:45 - 1.3 @@ -1,4 +1,19 @@ + Protected Area Page 1.3 +15 -0 jakarta-tomcat/src/examples/jsp/security/login.txt Index: login.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- login.txt 9 Oct 2000 02:38:14 - 1.2 +++ login.txt 22 Feb 2004 23:35:45 - 1.3 @@ -1,4 +1,19 @@ + Login page for examples 1.2 +15 -0 jakarta-tomcat/src/examples/jsp/security/policy.jsp Index: policy.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/policy.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy.jsp30 Aug 2000 05:39:28 - 1.1 +++ policy.jsp22 Feb 2004 23:35:45 - 1.2 @@ -1,3 +1,18 @@ + Security test Attempting to create /tmp/sectest 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/security/security.html Index: security.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/security.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- security.html 10 Mar 2001 03:00:56 - 1.3 +++ security.html 22 Feb 2004 23:35:45 - 1.4 @@ -1,7 +1,18 @@ - 1.2 +15 -0 jakarta-tomcat/src/examples/jsp/security/login/error.jsp Index: error.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login/error.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- error.jsp 31 Mar 2000 20:59:46 - 1.1 +++ error.jsp 22 Feb 2004 23:35:45 - 1.2 @@ -1,4 +1,19 @@ + Login Error 1.4 +15 -0 jakarta-tomcat/src/examples/jsp/security/login/login.jsp Index: login.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login/login.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- login.jsp 9 Mar 2001 22:54:06 - 1.3 +++ login.jsp 22 Feb 2004 23:35:45 - 1.4 @@ -1,4 +1,19 @@ + Login page for examples 1.4 +15 -0 jakarta-tomcat/src/examples/jsp/security/protected/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/protected/index.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.jsp 6 Apr 2000 17:49:22 - 1.3 +++ index.jsp 22 Feb 2004 23:35:45 - 1.4 @@ -1,4 +1,19 @@ + Protected Area Page - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/sessions DummyCart.html carts.html carts.jsp carts.txt crt.html
billbarker2004/02/22 15:38:05 Modified:src/examples/jsp/sessions DummyCart.html carts.html carts.jsp carts.txt crt.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/sessions/DummyCart.html Index: DummyCart.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/DummyCart.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DummyCart.html20 Oct 1999 23:20:10 - 1.2 +++ DummyCart.html22 Feb 2004 23:38:05 - 1.3 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.html Index: carts.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- carts.html20 Oct 1999 23:20:10 - 1.2 +++ carts.html22 Feb 2004 23:38:05 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.jsp Index: carts.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- carts.jsp 16 Feb 2003 23:14:00 - 1.3 +++ carts.jsp 22 Feb 2004 23:38:05 - 1.4 @@ -1,7 +1,18 @@ - 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.txt Index: carts.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- carts.txt 20 Oct 1999 23:20:11 - 1.2 +++ carts.txt 22 Feb 2004 23:38:05 - 1.3 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/sessions/crt.html Index: crt.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/crt.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- crt.html 10 Mar 2001 03:00:54 - 1.3 +++ crt.html 22 Feb 2004 23:38:05 - 1.4 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/simpletag foo.html foo.jsp foo.txt
billbarker2004/02/22 15:39:36 Modified:src/examples/jsp/simpletag foo.html foo.jsp foo.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.html Index: foo.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- foo.html 10 Mar 2001 03:00:55 - 1.3 +++ foo.html 22 Feb 2004 23:39:36 - 1.4 @@ -1,7 +1,18 @@ - Untitled Document 1.7 +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.jsp Index: foo.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- foo.jsp 20 Oct 1999 23:29:49 - 1.6 +++ foo.jsp 22 Feb 2004 23:39:36 - 1.7 @@ -1,7 +1,18 @@ - <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %> 1.3 +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.txt Index: foo.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- foo.txt 8 Nov 1999 03:13:26 - 1.2 +++ foo.txt 22 Feb 2004 23:39:36 - 1.3 @@ -1,7 +1,18 @@ - <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/jsp/snp snoop.html snoop.jsp snoop.txt
billbarker2004/02/22 15:44:17 Modified:src/examples/jsp index.html source.jsp src/examples/jsp/snp snoop.html snoop.jsp snoop.txt Log: Updating to the Apache License v2.0. Revision ChangesPath 1.6 +14 -3 jakarta-tomcat/src/examples/jsp/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.html9 Mar 2001 22:54:06 - 1.5 +++ index.html22 Feb 2004 23:44:17 - 1.6 @@ -5,9 +5,20 @@ JSP Examples - 1.2 +15 -0 jakarta-tomcat/src/examples/jsp/source.jsp Index: source.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/source.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- source.jsp19 Nov 1999 01:30:16 - 1.1 +++ source.jsp22 Feb 2004 23:44:17 - 1.2 @@ -1,3 +1,18 @@ +<%-- +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. +--%> <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %> 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.html Index: snoop.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- snoop.html10 Mar 2001 03:00:56 - 1.3 +++ snoop.html22 Feb 2004 23:44:17 - 1.4 @@ -1,7 +1,18 @@ - 1.6 +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.jsp Index: snoop.jsp === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snoop.jsp 16 Feb 2003 23:14:01 - 1.5 +++ snoop.jsp 22 Feb 2004 23:44:17 - 1.6 @@ -1,7 +1,18 @@ - 1.4 +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.txt Index: snoop.txt === RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- snoop.txt 22 Dec 1999 11:53:42 - 1.3 +++ snoop.txt 22 Feb 2004 23:44:17 - 1.4 @@ -1,7 +1,18 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/examples/servlets cookies.html helloworld.html index.html reqheaders.html reqinfo.html reqparams.html sessions.html
billbarker2004/02/22 15:46:31 Modified:src/examples/servlets cookies.html helloworld.html index.html reqheaders.html reqinfo.html reqparams.html sessions.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.4 +15 -0 jakarta-tomcat/src/examples/servlets/cookies.html Index: cookies.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/cookies.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cookies.html 10 Dec 1999 20:30:46 - 1.3 +++ cookies.html 22 Feb 2004 23:46:31 - 1.4 @@ -1,4 +1,19 @@ + Untitled Document 1.3 +15 -0 jakarta-tomcat/src/examples/servlets/helloworld.html Index: helloworld.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/helloworld.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- helloworld.html 10 Dec 1999 02:31:29 - 1.2 +++ helloworld.html 22 Feb 2004 23:46:31 - 1.3 @@ -1,4 +1,19 @@ + Untitled Document 1.3 +15 -0 jakarta-tomcat/src/examples/servlets/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html8 Nov 1999 03:13:36 - 1.2 +++ index.html22 Feb 2004 23:46:31 - 1.3 @@ -1,5 +1,20 @@ + 1.4 +15 -0 jakarta-tomcat/src/examples/servlets/reqheaders.html Index: reqheaders.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqheaders.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- reqheaders.html 10 Dec 1999 20:30:46 - 1.3 +++ reqheaders.html 22 Feb 2004 23:46:31 - 1.4 @@ -1,4 +1,19 @@ + Untitled Document 1.4 +15 -0 jakarta-tomcat/src/examples/servlets/reqinfo.html Index: reqinfo.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqinfo.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- reqinfo.html 10 Dec 1999 20:30:46 - 1.3 +++ reqinfo.html 22 Feb 2004 23:46:31 - 1.4 @@ -1,4 +1,19 @@ + Untitled Document 1.4 +15 -0 jakarta-tomcat/src/examples/servlets/reqparams.html Index: reqparams.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqparams.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- reqparams.html10 Dec 1999 20:30:46 - 1.3 +++ reqparams.html22 Feb 2004 23:46:31 - 1.4 @@ -1,4 +1,19 @@ + Untitled Document 1.4 +15 -0 jakarta-tomcat/src/examples/servlets/sessions.html Index: sessions.html === RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/sessions.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sessions.html 10 Dec 1999 20:30:46 - 1.3 +++ sessions.html 22 Feb 2004 23:46:31 - 1.4 @@ -1,4 +1,19 @@ + Untitled Document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.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 TagPoolGenerator.java TagPoolManagerGenerator.java
billbarker2004/02/22 18:45:13 Modified:src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.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 TagPoolGenerator.java TagPoolManagerGenerator.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.8 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java.diff?r1=1.7&r2=1.8 1.2 +13 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java.diff?r1=1.1&r2=1.2 1.11 +17 -56 jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java.diff?r1=1.10&r2=1.11 1.3 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java.diff?r1=1.2&r2=1.3 1.7 +13 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java.diff?r1=1.6&r2=1.7 1.2 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java.diff?r1=1.1&r2=1.2 1.4 +13 -55 jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassName.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassName.java.diff?r1=1.3&r2=1.4 1.9 +12 -51 jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java.diff?r1=1.8&r2=1.9 1.3 +13 -55 jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java.diff?r1=1.2&r2=1.3 1.2 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/CompileException.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CompileException.java.diff?r1=1.1&r2=1.2 1.26 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java.diff?r1=1.25&r2=1.26 1.2 +14 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/CoreElement.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CoreElement.java.diff?r1=1.1&r2=1.2 1.2 +13 -54 jakarta-tomcat/src/share/org/apache/jasper/compiler/DeclarationGenerator.java http://cvs.apache.org/viewcvs/jak
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html
billbarker2004/02/22 19:23:13 Modified:src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.13 +12 -52 jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java Index: BodyContentImpl.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BodyContentImpl.java 22 Sep 2003 09:17:47 - 1.12 +++ BodyContentImpl.java 23 Feb 2004 03:23:12 - 1.13 @@ -1,57 +1,17 @@ /* - * The Apache Software License, Version 1.1 + * Copyright 1999-2004 The Apache Software Foundation * - * 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/>. - * - */ + * 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 + */ package org.apache.jasper.runtime; 1.7 +12 -52 jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java Index: HttpJspBase.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- HttpJspBase.java 22 Sep 2003 09:17:47 - 1.6 +++ HttpJspBase.java 23 Feb 2
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java
billbarker2004/02/22 19:28:28 Modified:src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java Log: Update to the Apache License v2.0. Revision ChangesPath 1.5 +12 -54 jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java Index: JasperLoader.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JasperLoader.java 22 Sep 2003 09:17:46 - 1.4 +++ JasperLoader.java 23 Feb 2004 03:28:28 - 1.5 @@ -1,59 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 + * Copyright 1999-2004 The Apache Software Foundation * - * 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/>. - * - */ + * 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 + */ package org.apache.jasper.servlet; 1.5 +12 -54 jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java Index: JasperLoader12.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JasperLoader12.java 22 Sep 2003 09:17:46 - 1.4 +++ JasperLoader12.java 23 Feb 2004 03:28:28 - 1.5 @@ -1,59 +1,17 @@ /* - * -
cvs commit: jakarta-tomcat/src/share/org/apache/jasper CommandLineContext.java Constants.java EmbededServletOptions.java JasperEngineContext.java JasperException.java JasperOptionsImpl.java JspC.java JspCompilationContext.java JspEngineContext.java Options.java
billbarker2004/02/22 19:41:26 Modified:src/share/org/apache/jasper CommandLineContext.java Constants.java EmbededServletOptions.java JasperEngineContext.java JasperException.java JasperOptionsImpl.java JspC.java JspCompilationContext.java JspEngineContext.java Options.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.10 +12 -58 jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java Index: CommandLineContext.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CommandLineContext.java 22 Sep 2003 09:17:46 - 1.9 +++ CommandLineContext.java 23 Feb 2004 03:41:26 - 1.10 @@ -1,63 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 + * Copyright 1999-2004 The Apache Software Foundation * - * 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/>. - * - */ - - - - + * 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 + */ package org.apache.jasper; 1.26 +12 -54jakarta-tomcat/src/share/org/apache/jasper/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Constants.java22 Sep 2003 09:17:46 - 1.25 +++ Const
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler CommentGenerator.java
billbarker2004/02/22 20:04:05 Modified:src/share/org/apache/jasper/compiler CommentGenerator.java Log: Fix typo. Revision ChangesPath 1.4 +0 -1 jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java Index: CommentGenerator.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CommentGenerator.java 23 Feb 2004 02:45:12 - 1.3 +++ CommentGenerator.java 23 Feb 2004 04:04:05 - 1.4 @@ -12,7 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language */ -/* package org.apache.jasper.compiler; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade CookieFacade.java HttpServletRequestFacade.java HttpServletResponseFacade.java HttpSessionFacade.java JspInterceptor.java LoadOnStartupInterceptor.java RequestDispatcherImpl.java Servlet22Interceptor.java ServletConfigImpl.java ServletContextFacade.java ServletHandler.java ServletInfo.java ServletInputStreamFacade.java ServletOutputStreamFacade.java ServletWriterFacade.java SessionContextImpl.java TagPoolManagerInterceptor.java WebXmlReader.java package.html
billbarker2004/02/22 22:06:13 Modified:src/facade22/org/apache/tomcat/facade CookieFacade.java HttpServletRequestFacade.java HttpServletResponseFacade.java HttpSessionFacade.java JspInterceptor.java LoadOnStartupInterceptor.java RequestDispatcherImpl.java Servlet22Interceptor.java ServletConfigImpl.java ServletContextFacade.java ServletHandler.java ServletInfo.java ServletInputStreamFacade.java ServletOutputStreamFacade.java ServletWriterFacade.java SessionContextImpl.java TagPoolManagerInterceptor.java WebXmlReader.java package.html Log: Fix cut-and-paste problem with license. Revision ChangesPath 1.8 +2 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java Index: CookieFacade.java === RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CookieFacade.java 23 Feb 2004 02:08:54 - 1.7 +++ CookieFacade.java 23 Feb 2004 06:06:13 - 1.8 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.tomcat.facade; 1.36 +2 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java Index: HttpServletRequestFacade.java === RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- HttpServletRequestFacade.java 23 Feb 2004 02:08:54 - 1.35 +++ HttpServletRequestFacade.java 23 Feb 2004 06:06:13 - 1.36 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.33 +5 -4 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java Index: HttpServletResponseFacade.java === RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- HttpServletResponseFacade.java23 Feb 2004 02:08:54 - 1.32 +++ HttpServletResponseFacade.java23 Feb 2004 06:06:13 - 1.33 @@ -15,7 +15,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.23 +2 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java Index: HttpSessionFacade.java === RCS file: /home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- HttpSessionFacade.java23 Feb 2004 02:08:54 - 1.22 +++ HttpSessionFacade.java23 Feb 2004 06:06:13 - 1.23 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ 1.43 +2 -1 jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspIntercep
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.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 TagPoolGenerator.java TagPoolManagerGenerator.java
billbarker2004/02/22 22:22:38 Modified:src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.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 TagPoolGenerator.java TagPoolManagerGenerator.java Log: Fix cut-and-paste problem with license. Revision ChangesPath 1.9 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java Index: BaseJspListener.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BaseJspListener.java 23 Feb 2004 02:45:11 - 1.8 +++ BaseJspListener.java 23 Feb 2004 06:22:36 - 1.9 @@ -15,7 +15,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.compiler; 1.3 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java Index: BeanEndGenerator.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BeanEndGenerator.java 23 Feb 2004 02:45:11 - 1.2 +++ BeanEndGenerator.java 23 Feb 2004 06:22:36 - 1.3 @@ -15,7 +15,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.compiler; 1.12 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java Index: BeanGenerator.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- BeanGenerator.java23 Feb 2004 02:45:11 - 1.11 +++ BeanGenerator.java23 Feb 2004 06:22:36 - 1.12 @@ -14,7 +14,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.compil
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html
billbarker2004/02/22 22:26:32 Modified:src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html Log: Fix cut-and-paste problem with license. Revision ChangesPath 1.14 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java Index: BodyContentImpl.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- BodyContentImpl.java 23 Feb 2004 03:23:12 - 1.13 +++ BodyContentImpl.java 23 Feb 2004 06:26:32 - 1.14 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.runtime; 1.8 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java Index: HttpJspBase.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HttpJspBase.java 23 Feb 2004 03:23:12 - 1.7 +++ HttpJspBase.java 23 Feb 2004 06:26:32 - 1.8 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.runtime; 1.17 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java Index: JspFactoryImpl.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- JspFactoryImpl.java 23 Feb 2004 03:23:13 - 1.16 +++ JspFactoryImpl.java 23 Feb 2004 06:26:32 - 1.17 @@ -15,7 +15,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.runtime; 1.19 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java Index: JspLoader.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- JspLoader.java23 Feb 2004 03:23:13 - 1.18 +++ JspLoader.java23 Feb 2004 06:26:32 - 1.19 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper.runtime; 1.11 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java Index: JspRuntimeLibrary.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- JspRuntimeLibrary.java23 Feb 2004 03:23:13 - 1.10 +++ JspRuntimeLibrary.java23 Feb 2004 06:26:32 - 1.11 @@ -10,7 +10,8 @@ * Unless required by applicab
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java
billbarker2004/02/22 22:30:55 Modified:src/share/org/apache/jasper CommandLineContext.java Constants.java EmbededServletOptions.java JasperEngineContext.java JasperException.java JasperOptionsImpl.java JspC.java JspCompilationContext.java JspEngineContext.java Options.java src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java Log: Fix cut-and-paste problem with license. Revision ChangesPath 1.11 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java Index: CommandLineContext.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- CommandLineContext.java 23 Feb 2004 03:41:26 - 1.10 +++ CommandLineContext.java 23 Feb 2004 06:30:55 - 1.11 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper; 1.27 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Constants.java23 Feb 2004 03:41:26 - 1.26 +++ Constants.java23 Feb 2004 06:30:55 - 1.27 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper; 1.11 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java Index: EmbededServletOptions.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- EmbededServletOptions.java23 Feb 2004 03:41:26 - 1.10 +++ EmbededServletOptions.java23 Feb 2004 06:30:55 - 1.11 @@ -15,7 +15,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper; 1.5 +2 -1 jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java Index: JasperEngineContext.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JasperEngineContext.java 23 Feb 2004 03:41:26 - 1.4 +++ JasperEngineContext.java 23 Feb 2004 06:30:55 - 1.5 @@ -10,7 +10,8 @@ * 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 + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jasper; 1.3 +5 -4 jakarta-tomcat/src/share/org/apache/jasper/JasperException.java Index: JasperException.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JasperException.java 23 Feb 2004 03:41:26 - 1.2 +++ Jasper
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/ant Tomcat3JSPVersionFile.java Tomcat3Precompiler.java
billbarker2004/02/24 00:00:56 Modified:src/share/org/apache/tomcat/ant Tomcat3JSPVersionFile.java Tomcat3Precompiler.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.3 +14 -52 jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3JSPVersionFile.java Index: Tomcat3JSPVersionFile.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3JSPVersionFile.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Tomcat3JSPVersionFile.java21 May 2002 18:15:02 - 1.2 +++ Tomcat3JSPVersionFile.java24 Feb 2004 08:00:56 - 1.3 @@ -1,55 +1,17 @@ -/* - * The Apache Software License, Version 1.1 +/* + * Copyright 2002-2004 The Apache Sofware Foundation. * - * 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", "Ant", 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/>. + * 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.tomcat.ant; 1.5 +13 -51 jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java Index: Tomcat3Precompiler.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Tomcat3Precompiler.java 5 Aug 2002 13:30:49 - 1.4 +++ Tomcat3Precompiler.java 24 Feb 2004 08:00:56 - 1.5 @@ -1,55 +1,17 @@ -/* - * The Apache Software License, Version 1.1 +/* + * Copyright 2001-2004 The Apache Sofware Foundation. * - * Copyright (c) 2001
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core BaseInterceptor.java Container.java Context.java ContextManager.java Handler.java OutputBuffer.java Request.java Response.java ServerSession.java TomcatException.java package.html
billbarker2004/02/24 22:45:07 Modified:src/share/org/apache/tomcat/core BaseInterceptor.java Container.java Context.java ContextManager.java Handler.java OutputBuffer.java Request.java Response.java ServerSession.java TomcatException.java package.html Log: Update to Apache License v2.0. Revision ChangesPath 1.54 +14 -58 jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java Index: BaseInterceptor.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- BaseInterceptor.java 21 Aug 2002 03:58:59 - 1.53 +++ BaseInterceptor.java 25 Feb 2004 06:45:07 - 1.54 @@ -1,62 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Sofware Foundation. * - * 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] - * - */ - + * 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.tomcat.core; 1.57 +14 -57jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java Index: Container.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v retrieving revision 1.56 retrieving re
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers AccessLogInterceptor.java AccountingInterceptor.java LogEvents.java
billbarker2004/02/24 22:52:40 Modified:src/share/org/apache/tomcat/modules/aaa AccessInterceptor.java CredentialsInterceptor.java JDBCRealm.java RealmBase.java SimpleRealm.java src/share/org/apache/tomcat/modules/generators ErrorHandler.java InvokerInterceptor.java Jdk12Interceptor.java StaticInterceptor.java src/share/org/apache/tomcat/modules/loggers AccessLogInterceptor.java AccountingInterceptor.java LogEvents.java Log: Updating to the Apache License v2.0 Revision ChangesPath 1.22 +13 -56 jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java Index: AccessInterceptor.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- AccessInterceptor.java22 Sep 2003 09:18:38 - 1.21 +++ AccessInterceptor.java25 Feb 2004 06:52:40 - 1.22 @@ -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 Sofware 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.tomcat.modules.aaa; 1.5 +15 -57 jakarta-tomcat/src/share/o
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12.java Ajp12Interceptor.java Ajp13.java Ajp13Interceptor.java Ajp13Packet.java Http10.java Http10Interceptor.java JNIConnectionHandler.java JNIEndpoint.java JNIRequestAdapter.java JNIResponseAdapter.java PoolTcpConnector.java package.html
billbarker2004/02/24 23:18:35 Modified:src/share/org/apache/tomcat/modules/server Ajp12.java Ajp12Interceptor.java Ajp13.java Ajp13Interceptor.java Ajp13Packet.java Http10.java Http10Interceptor.java JNIConnectionHandler.java JNIEndpoint.java JNIRequestAdapter.java JNIResponseAdapter.java PoolTcpConnector.java package.html Log: Updating to the Apache License v2.0. Revision ChangesPath 1.24 +13 -58 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java Index: Ajp12.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Ajp12.java22 Sep 2003 09:18:37 - 1.23 +++ Ajp12.java25 Feb 2004 07:18:35 - 1.24 @@ -1,63 +1,18 @@ -/* - * - * - * - * 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 Sofware 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. */ - /* Based on Ajp11ConnectionHandler and Ajp12 implementation of JServ 1.21 +13 -58 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java Index: Ajp12Interceptor.java =
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/session SessionExpirer.java SessionId.java SessionIdGenerator.java SimpleSessionStore.java
billbarker2004/02/24 23:19:12 Modified:src/share/org/apache/tomcat/modules/mappers DecodeInterceptor.java ReloadInterceptor.java SimpleMapper1.java src/share/org/apache/tomcat/modules/session SessionExpirer.java SessionId.java SessionIdGenerator.java SimpleSessionStore.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.23 +14 -57 jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java Index: DecodeInterceptor.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- DecodeInterceptor.java12 Oct 2003 22:34:03 - 1.22 +++ DecodeInterceptor.java25 Feb 2004 07:19:12 - 1.23 @@ -1,61 +1,18 @@ -/* - * +/* + * Copyright 1999-2004 The Apache Sofware Foundation. * - * 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] - * - */ + * 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.tomcat.modules.mappers; 1.17 +13 -56 jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java Index: ReloadInterceptor.java === RCS file: /home/cvs/
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java EnableAdmin.java Jspc.java Main.java Property.java StopTomcat.java Tomcat.java
billbarker2004/02/24 23:25:49 Modified:src/share/org/apache/tomcat/resources LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties web.dtd src/share/org/apache/tomcat/startup EmbededTomcat.java EnableAdmin.java Jspc.java Main.java Property.java StopTomcat.java Tomcat.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.17 +16 -1 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties Index: LocalStrings.properties === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- LocalStrings.properties 3 Nov 2001 03:50:50 - 1.16 +++ LocalStrings.properties 25 Feb 2004 07:25:48 - 1.17 @@ -1,5 +1,20 @@ # $Id$ # +# +# Copyright 1999-2004 The Apache Sofware 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. +# # Localized strings for package org.apache.tomcat.core # This is the default locale and is en_US 1.19 +15 -1 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_es.properties Index: LocalStrings_es.properties === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_es.properties,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- LocalStrings_es.properties3 Nov 2001 03:50:50 - 1.18 +++ LocalStrings_es.properties25 Feb 2004 07:25:48 - 1.19 @@ -1,5 +1,19 @@ # $Id$ # +# +# Copyright 1999-2004 The Apache Sofware 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. # Localized strings for package org.apache.tomcat.core # This is the Spanish locale and is es 1.8 +15 -1 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_fr.properties Index: LocalStrings_fr.properties === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_fr.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- LocalStrings_fr.properties29 Sep 2003 07:41:10 - 1.7 +++ LocalStrings_fr.properties25 Feb 2004 07:25:48 - 1.8 @@ -1,5 +1,19 @@ # $Id$ # +# +# Copyright 1999-2004 The Apache Sofware 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. # Localized strings for package org.apache.tomcat.core # This is the French locale and is fr_FR 1.2 +15 -1 jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_ja.properties Index: LocalStrings_ja.properties === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings_ja.properties,v retrieving
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/xml PathMatch.java SaxContext.java XmlAction.java XmlMapper.java XmlMatch.java
billbarker2004/02/25 00:02:00 Modified:src/share/org/apache/tomcat/util/log CommonLogHandler.java Log.java LogHandler.java LogManager.java src/share/org/apache/tomcat/util/qlog FastDateFormat.java LogDaemon.java LogEntry.java Logger.java QLogFactory.java QueueLogger.java package.html src/share/org/apache/tomcat/util/test Attributes.java Body.java Cookie.java GTest.java Header.java HttpClient.java HttpRequest.java HttpResponse.java Matcher.java Parameter.java Properties.java Report.java TestDefaults.java src/share/org/apache/tomcat/util/test/matchers GoldenMatch.java HeaderMatch.java HttpStatusMatch.java ResponseMatch.java ResponseMatchFile.java SessionMatch.java src/share/org/apache/tomcat/util/xml PathMatch.java SaxContext.java XmlAction.java XmlMapper.java XmlMatch.java Log: Updating to the Apache License v2.0. Revision ChangesPath 1.2 +15 -55 jakarta-tomcat/src/share/org/apache/tomcat/util/log/CommonLogHandler.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/log/CommonLogHandler.java.diff?r1=1.1&r2=1.2 1.9 +15 -55jakarta-tomcat/src/share/org/apache/tomcat/util/log/Log.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/log/Log.java.diff?r1=1.8&r2=1.9 1.6 +15 -55 jakarta-tomcat/src/share/org/apache/tomcat/util/log/LogHandler.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/log/LogHandler.java.diff?r1=1.5&r2=1.6 1.5 +15 -55 jakarta-tomcat/src/share/org/apache/tomcat/util/log/LogManager.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/log/LogManager.java.diff?r1=1.4&r2=1.5 1.5 +13 -58 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/FastDateFormat.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/FastDateFormat.java.diff?r1=1.4&r2=1.5 1.5 +15 -55 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/LogDaemon.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/LogDaemon.java.diff?r1=1.4&r2=1.5 1.4 +15 -55 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/LogEntry.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/LogEntry.java.diff?r1=1.3&r2=1.4 1.6 +15 -55jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/Logger.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/Logger.java.diff?r1=1.5&r2=1.6 1.4 +13 -54 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/QLogFactory.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/QLogFactory.java.diff?r1=1.3&r2=1.4 1.5 +14 -54 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/QueueLogger.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/QueueLogger.java.diff?r1=1.4&r2=1.5 1.3 +15 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/package.html http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/package.html.diff?r1=1.2&r2=1.3 1.3 +15 -57 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Attributes.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Attributes.java.diff?r1=1.2&r2=1.3 1.5 +15 -57jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java.diff?r1=1.4&r2=1.5 1.4 +15 -57jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java.diff?r1=1.3&r2=1.4 1.16 +15 -57jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java.diff?r1=1.15&r2=1.16 1.8 +15 -57jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java.diff?r1=1.7&r2=1.8 1.13 +15 -57 jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java.diff?
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3 CoyoteInterceptor2.java
billbarker2004/02/25 22:00:29
Modified:coyote/src/java/org/apache/coyote/tomcat3
CoyoteInterceptor2.java
Log:
Save off the protocol for use by JMXSupport.
Revision ChangesPath
1.19 +5 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
Index: CoyoteInterceptor2.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CoyoteInterceptor2.java 24 Feb 2004 08:54:30 - 1.18
+++ CoyoteInterceptor2.java 26 Feb 2004 06:00:27 - 1.19
@@ -80,6 +80,7 @@
private String processorClassName="org.apache.coyote.http11.Http11Protocol";
Tomcat3Adapter adapter;
ProtocolHandler proto;
+int protocolNote;
public CoyoteInterceptor2() {
super();
@@ -112,11 +113,14 @@
*/
public void engineInit(ContextManager cm) throws TomcatException {
super.engineInit( cm );
-
+
+protocolNote = cm.getNoteId(ContextManager.MODULE_NOTE,
+ "coyote.protocol");
adapter=new Tomcat3Adapter(cm);
try {
Class c=Class.forName(processorClassName);
proto=(ProtocolHandler)c.newInstance();
+ setNote(protocolNote, proto);
} catch( Exception ex ) {
ex.printStackTrace();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config DynamicMBeanProxy.java MxInterceptor.java
billbarker2004/02/25 22:04:41 Modified:proposals/JmxSupport build.xml proposals/JmxSupport/WEB-INF interceptors.xml proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config DynamicMBeanProxy.java MxInterceptor.java Log: Register the Coyote Protocol and sub-components. Also updating license to Apache v2.0. Revision ChangesPath 1.4 +19 -3 jakarta-tomcat/proposals/JmxSupport/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/proposals/JmxSupport/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 11 Feb 2004 16:24:14 - 1.3 +++ build.xml 26 Feb 2004 06:04:41 - 1.4 @@ -1,5 +1,20 @@ - + + @@ -20,7 +35,7 @@ - + @@ -62,6 +77,7 @@ + @@ -69,7 +85,7 @@ - + 1.3 +16 -1 jakarta-tomcat/proposals/JmxSupport/WEB-INF/interceptors.xml Index: interceptors.xml === RCS file: /home/cvs/jakarta-tomcat/proposals/JmxSupport/WEB-INF/interceptors.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- interceptors.xml 13 Oct 2003 09:45:13 - 1.2 +++ interceptors.xml 26 Feb 2004 06:04:41 - 1.3 @@ -1,4 +1,19 @@ + @@ -27,7 +42,7 @@ use the http adaptor --> - 1.3 +13 -56 jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config/DynamicMBeanProxy.java Index: DynamicMBeanProxy.java === RCS file: /home/cvs/jakarta-tomcat/proposals/JmxSupport/WEB-INF/classes/org/apache/tomcat/modules/config/DynamicMBeanProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DynamicMBeanProxy.java29 Sep 2003 07:38:10 - 1.2 +++ DynamicMBeanProxy.java26 Feb 2004 06:04:41 - 1.3 @@ -1,61 +1,18 @@ /* - * + * Copyright 1999-2004 The Apache Software Foundation * - * 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. - * =
cvs commit: jakarta-tomcat/proposals/StreamHandler/WEB-INF/classes/org/apache/tomcat/util/net StreamHandlerFactory.java
billbarker2004/02/25 22:37:28 Modified:proposals/Log4jHelper build.xml proposals/Log4jHelper/WEB-INF interceptors.xml proposals/Log4jHelper/WEB-INF/classes/org/apache/tomcat/modules/loggers/log4j CRS.java Log4jHelper.java proposals/PasswordPrompter build.xml proposals/PasswordPrompter/WEB-INF interceptors.xml proposals/PasswordPrompter/WEB-INF/classes/org/apache/tomcat/modules/config PasswordPrompter.java proposals/PasswordPrompter/WEB-INF/classes/org/apache/tomcat/util/io Prompter.java PrompterException.java proposals/StreamHandler build.xml proposals/StreamHandler/WEB-INF interceptors.xml proposals/StreamHandler/WEB-INF/classes/org/apache/tomcat/modules/config StreamHandler.java proposals/StreamHandler/WEB-INF/classes/org/apache/tomcat/util/net StreamHandlerFactory.java Log: Update to the Apache License v2.0. Revision ChangesPath 1.2 +15 -0 jakarta-tomcat/proposals/Log4jHelper/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/proposals/Log4jHelper/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 7 Apr 2003 00:29:22 - 1.1 +++ build.xml 26 Feb 2004 06:37:28 - 1.2 @@ -1,4 +1,19 @@ + 1.2 +15 -0 jakarta-tomcat/proposals/Log4jHelper/WEB-INF/interceptors.xml Index: interceptors.xml === RCS file: /home/cvs/jakarta-tomcat/proposals/Log4jHelper/WEB-INF/interceptors.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- interceptors.xml 7 Apr 2003 00:29:22 - 1.1 +++ interceptors.xml 26 Feb 2004 06:37:28 - 1.2 @@ -1,4 +1,19 @@ + 1.3 +13 -55 jakarta-tomcat/proposals/Log4jHelper/WEB-INF/classes/org/apache/tomcat/modules/loggers/log4j/CRS.java Index: CRS.java === RCS file: /home/cvs/jakarta-tomcat/proposals/Log4jHelper/WEB-INF/classes/org/apache/tomcat/modules/loggers/log4j/CRS.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CRS.java 29 Sep 2003 07:39:48 - 1.2 +++ CRS.java 26 Feb 2004 06:37:28 - 1.3 @@ -1,61 +1,19 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 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 THE
cvs commit: jakarta-tomcat/src/shell cpappend.bat jspc.bat jspc.sh shutdown.bat shutdown.sh startup.bat startup.sh tomcat.bat tomcat.sh tomcatEnv.bat
billbarker2004/02/26 21:32:58 Modified:src/shell cpappend.bat jspc.bat jspc.sh shutdown.bat shutdown.sh startup.bat startup.sh tomcat.bat tomcat.sh tomcatEnv.bat Log: Updating to the Apache License v2.0. Revision ChangesPath 1.5 +15 -0 jakarta-tomcat/src/shell/cpappend.bat Index: cpappend.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/cpappend.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpappend.bat 4 Sep 2000 21:24:49 - 1.4 +++ cpappend.bat 27 Feb 2004 05:32:58 - 1.5 @@ -1 +1,16 @@ +rem +rem Copyright 1999-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem set _LIBJARS=%_LIBJARS%;%1 1.7 +16 -1 jakarta-tomcat/src/shell/jspc.bat Index: jspc.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/jspc.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jspc.bat 30 Aug 2001 11:44:32 - 1.6 +++ jspc.bat 27 Feb 2004 05:32:58 - 1.7 @@ -1,6 +1,21 @@ @echo off rem $Id$ rem A batch file to run the JspC Compiler +rem +rem Copyright 1999-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem rem This batch file written and tested under Windows NT rem Improvements to this file are welcome 1.7 +16 -1 jakarta-tomcat/src/shell/jspc.sh Index: jspc.sh === RCS file: /home/cvs/jakarta-tomcat/src/shell/jspc.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jspc.sh 18 Apr 2002 13:58:01 - 1.6 +++ jspc.sh 27 Feb 2004 05:32:58 - 1.7 @@ -1,6 +1,21 @@ #!/bin/sh # # $Id$ +# +# 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. +# # Shell script to runt JspC 1.9 +16 -1 jakarta-tomcat/src/shell/shutdown.bat Index: shutdown.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- shutdown.bat 9 Sep 2001 21:59:55 - 1.8 +++ shutdown.bat 27 Feb 2004 05:32:58 - 1.9 @@ -1,6 +1,21 @@ @echo off rem $Id$ rem Startup batch file for tomcat server. +rem +rem Copyright 1999-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the "License"); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHO
cvs commit: jakarta-tomcat/src/etc/users admin-users.xml example-users.xml global-users.xml tomcat-users.xml
billbarker2004/02/26 21:45:47 Modified:src/etc apps-127.0.0.1.xml apps-admin.xml apps-examples.xml modules.xml server.xml tomcat.policy src/etc/jk mod_jk.conf mod_jk.conf-jni obj.conf uriworkermap.properties workers.properties wrapper.properties src/etc/users admin-users.xml example-users.xml global-users.xml tomcat-users.xml Log: Update to the Apache License v2.0. Revision ChangesPath 1.2 +15 -0 jakarta-tomcat/src/etc/apps-127.0.0.1.xml Index: apps-127.0.0.1.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/apps-127.0.0.1.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apps-127.0.0.1.xml10 Feb 2001 16:53:15 - 1.1 +++ apps-127.0.0.1.xml27 Feb 2004 05:45:47 - 1.2 @@ -1,4 +1,19 @@ + 1.2 +15 -0 jakarta-tomcat/src/etc/apps-examples.xml Index: apps-examples.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/apps-examples.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apps-examples.xml 10 Feb 2001 16:53:15 - 1.1 +++ apps-examples.xml 27 Feb 2004 05:45:47 - 1.2 @@ -1,4 +1,19 @@ + 1.103 +15 -0 jakarta-tomcat/src/etc/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- server.xml17 Feb 2004 06:28:57 - 1.102 +++ server.xml27 Feb 2004 05:45:47 - 1.103 @@ -1,4 +1,19 @@ + 1.2 +15 -0 jakarta-tomcat/src/etc/users/example-users.xml Index: example-users.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/users/example-users.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- example-users.xml 29 Dec 2000 00:33:14 - 1.1 +++ example-users.xml 27 Feb 2004 05:45:47 - 1.2 @@ -1,3 +1,18 @@ + 1.2 +15 -0 jakarta-tomcat/src/etc/users/global-users.xml Index: global-users.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/users/global-users.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- global-users.xml 29 Dec 2000 00:33:14 - 1.1 +++ global-users.xml 27 Feb 2004 05:45:47 - 1.2 @@ -1,3 +1,18 @@ + 1.2 +15 -0 jakarta-tomcat/src/etc/users/tomcat-users.xml Index: tomcat-users.xml === RCS file: /home/cvs/jakarta-tomcat/src/etc/users/tomcat-users.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat-users.xml 29 Dec 2000 00:33:14 - 1.1 +++ tomcat-users.xml 27 Feb 2004 05:45:47 - 1.2 @@ -1,3 +1,18 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/webpages/WEB-INF web.xml
billbarker2004/02/26 21:39:34 Modified:src/webpages index.html src/webpages/WEB-INF web.xml Log: Updating to the Apache License v2.0. Revision ChangesPath 1.29 +15 -0 jakarta-tomcat/src/webpages/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/webpages/index.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- index.html14 Jan 2004 08:39:14 - 1.28 +++ index.html27 Feb 2004 05:39:34 - 1.29 @@ -1,5 +1,20 @@ + 1.6 +15 -0 jakarta-tomcat/src/webpages/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/webpages/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml 6 Jul 2000 22:55:37 - 1.5 +++ web.xml 27 Feb 2004 05:39:34 - 1.6 @@ -1,4 +1,19 @@ +
cvs commit: jakarta-tomcat/src/doc/appdev/sample/web hello.jsp index.html
billbarker2004/02/29 14:42:51
Modified:src/doc AJPv13.html JDBCRealm-howto.html
NT-Service-howto.html Tomcat-Workers-HowTo.html
in-process-howto.html index.html internal.html
mod_jk-howto.html serverxml.html
tomcat-apache-howto.html tomcat-iis-howto.html
tomcat-netscape-howto.html tomcat-security.html
tomcat-ssl-howto.html tomcat-ug.html
src/doc/appdev build.xml.txt contents.html deployment.html
footer.html header.html index.html
installation.html introduction.html processes.html
source.html web.xml.txt
src/doc/appdev/sample build.bat build.sh build.xml
src/doc/appdev/sample/etc web.xml
src/doc/appdev/sample/src Hello.java
src/doc/appdev/sample/web hello.jsp index.html
Log:
Updating to the Apache License v2.0.
Revision ChangesPath
1.9 +15 -0 jakarta-tomcat/src/doc/AJPv13.html
Index: AJPv13.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/AJPv13.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AJPv13.html 14 Jan 2004 08:22:21 - 1.8
+++ AJPv13.html 29 Feb 2004 22:42:50 - 1.9
@@ -1,5 +1,20 @@
+
Apache JServ Protocol version 1.3
1.7 +18 -2 jakarta-tomcat/src/doc/JDBCRealm-howto.html
Index: JDBCRealm-howto.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/JDBCRealm-howto.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCRealm-howto.html 14 Jan 2004 08:22:21 - 1.6
+++ JDBCRealm-howto.html 29 Feb 2004 22:42:50 - 1.7
@@ -1,4 +1,20 @@
+
+
td {
@@ -13,7 +29,7 @@
background-color: #00;
}
-Working with JDBCRealm
+Working with JDBCRealm
Working with JDBCRealm
What is JDBCRealm?
Is an implementation of a tomcat 3.X Realm that use a set of configurable
tables inside a RDMS to store user's data, this tables are accessed by means of
standard JDBC drivers.
1.7 +16 -2 jakarta-tomcat/src/doc/NT-Service-howto.html
Index: NT-Service-howto.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/NT-Service-howto.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NT-Service-howto.html 6 Sep 2001 19:12:19 - 1.6
+++ NT-Service-howto.html 29 Feb 2004 22:42:50 - 1.7
@@ -2,7 +2,21 @@
-
+
1.4 +16 -2 jakarta-tomcat/src/doc/Tomcat-Workers-HowTo.html
Index: Tomcat-Workers-HowTo.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/Tomcat-Workers-HowTo.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Tomcat-Workers-HowTo.html 30 Jan 2002 12:46:16 - 1.3
+++ Tomcat-Workers-HowTo.html 29 Feb 2004 22:42:50 - 1.4
@@ -2,7 +2,21 @@
-
+
1.4 +15 -0 jakarta-tomcat/src/doc/in-process-howto.html
Index: in-process-howto.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/in-process-howto.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- in-process-howto.html 29 Sep 2001 00:26:31 - 1.3
+++ in-process-howto.html 29 Feb 2004 22:42:50 - 1.4
@@ -1,6 +1,21 @@
+
In-Process Howto
1.12 +16 -2 jakarta-tomcat/src/doc/index.html
Index: index.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/index.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- index.html7 Nov 2002 13:23:32 - 1.11
+++ index.html29 Feb 2004 22:42:50 - 1.12
@@ -2,7 +2,21 @@
-
+
Tomcat Documentation
1.6 +15 -0 jakarta-tomcat/src/doc/internal.html
Index: internal.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/internal.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal.html 17 Sep 2000 07:55:16 - 1.5
+++ internal.html 29 Feb 2004 22:42:50 - 1.6
@@ -1,6
cvs commit: jakarta-tomcat/src/doc readme-3.3.2 index.html serverxml.html
billbarker2004/02/29 16:32:18 Modified:src/doc index.html serverxml.html Added: src/doc readme-3.3.2 Log: Updating the documentation to reflect changes since 3.3.1. Revision ChangesPath 1.13 +3 -2 jakarta-tomcat/src/doc/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- index.html29 Feb 2004 22:42:50 - 1.12 +++ index.html1 Mar 2004 00:32:18 - 1.13 @@ -44,7 +44,8 @@ Tomcat 3.3 Release Notes - Tomcat 3.3.1 Release Notes + Tomcat 3.3.1 Release Notes + Tomcat 3.3.2 Release Notes Using Tomcat 1.35 +215 -5jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- serverxml.html29 Feb 2004 22:42:50 - 1.34 +++ serverxml.html1 Mar 2004 00:32:18 - 1.35 @@ -276,6 +276,7 @@ Server + CoyoteConnector Http10Connector JniConnector Ajp12Connector @@ -1187,6 +1188,206 @@ +CoyoteConnector + +Type: Server + +Description + +Handles incoming AJP13 and HTTP, or optionally HTTPS, requests. [Tomcat 3.3.2] + +Attributes + + + +Attribute +Description +Default + + +socketCloseDelay +Specifies the number of milliseconds to delay before closing the socket + after processing a request. If negative, the delay is disabled. Setting + a value greater or equal to zero is intended to help with diagnosing + client errors resulting from unread data in the body of the HTTP request. + If this unread data arrives just before or during the closing of the + socket, the client may see a "Connection aborted by peer" error. +-1 + + +processorClassName +The Coyote processor class to use. The values are +org.apache.coyote.http11.Http11Processor for the HTTP/1.1 +connector, and org.apache.jk.server.JkCoyoteHandler for +the AJP13 connector. +org.apache.coyote.http11.Http11Processor + + +HTTP/1.1 Connection Properties + + + + +disableUploadTimeout +If true then use the same timeout for uploads and for +keep-alives. +true + + +maxKeepAliveRequests +The maxiumum number of keep-alive requests to allow on the same +socket connection. +100 + + +secure +Enables use of a SSL socket factory and act as an HTTPS server. +false + + +keystoreFile +Keystore containing the Server certificate +PureTLS: server.pem +JSSE: .keystore in directory specified by the user.home System property + + +keypass +Password to the keystore. +changeit + + +clientauth +Enables requirement for client authentication. +false + + +Socket Properties + + + + +address +Address to which the server socket binds. +null, bind on all addresses + + +backlog +Maximum length of the backlog queue for the server socket. +100 + + +port +Port on which to receive requests. +no default, must be specified + + +SSLImplementation +Class which implements the +org.apache.tomcat.util.net.SSLImplementation interface. +This setting controls which SSL support is used by secure connections. +Currently supported are: + +PureTLS - specify +org.apache.tomcat.util.net.PureTLSImplementation +JSSE - specify +org.apache.tomcat.util.net.JSSEImplementation + +not set +default behavior will detect PureTLS and JSSE and choose the one +available, or PureTLS if both are available. + + +timeout +Socket read timeout in seconds. +300 + + +Thread Pool Properties + + + + +maxThreads +Maximum number of threads in Thread pool. +200 + + +maxSpareThreads +Maximun number of spare threads. Unused threads will be terminated as + needed to keep the number of spare threads under this number. +50 + + +minSpareThreads +Minimum number of spare threads. Additional threads will be created + as needed to keep the number of spare threads up to this number. +4 + + + +Note: You may specify attributes that do +not app
cvs commit: jakarta-tomcat README RELEASE-NOTES-3.3.2.txt build.xml
billbarker2004/02/29 17:52:59
Modified:.README RELEASE-NOTES-3.3.2.txt build.xml
Log:
Updating Release-Notes to include changes.
Adding RegExp and commons-modeler to the list of required packages to build.
License build.xml, and allow to build with Ant 1.5.x.
Revision ChangesPath
1.21 +15 -6 jakarta-tomcat/README
Index: README
===
RCS file: /home/cvs/jakarta-tomcat/README,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- README18 Apr 2002 13:57:59 - 1.20
+++ README1 Mar 2004 01:52:59 - 1.21
@@ -22,19 +22,28 @@
("%JAVA_HOME%\bin" for Windows) to your PATH. Configure the CLASSPATH
environment variable as well, if required.
-* Download the latest Ant binary distribution (currently version 1.4.1) from
- <http://jakarta.apache.org/site/binindex.html> and install it in the
+* Download the latest Ant binary distribution (currently version 1.6.1) from
+ <http://ant.apache.org/bindownload.cgi> and install it in the
$JAKARTA_HOME directory. Set an "ANT_HOME" environment variable
to point to $JAKARTA_HOME/jakarta-ant- where matches
- the version of Ant downloaded ($JAKARTA_HOME/jakarta-ant-1.4.1 for
- Ant v1.4.1). If you are using Windows 9x, you should set ANT_HOME using
+ the version of Ant downloaded ($JAKARTA_HOME/jakarta-ant-1.6.1 for
+ Ant v1.6.1). If you are using Windows 9x, you should set ANT_HOME using
the DOS 8.3 name. In this case, you may find it convenient to rename
- the directory to a name that is within the DOS 8.3 format, such as "ant-141".
+ the directory to a name that is within the DOS 8.3 format, such as "ant-161".
Also, add "$ANT_HOME/bin" (%ANT_HOME%/bin for Windows) to your PATH.
+* Download the latest RegExp binary distribution (currently version 1.3.1) from
+ <http://jakarta.apache.org/site/binindex.cgi> and install it in the
+ $JAKARTA_HOME directory.
+
+* Download the latest commons-modeler binary distribution
+ (currently version 1.1.1) from <http://jakarta.apache.org/site/binindex.cgi>
+ and install it in the $JAKARTA_HOME directory.
+
* If you want to include SSL support, download the Java Secure Sockets
Extension (JSSE) implementation (current version number is 1.0.2) from
- <http://java.sun.com/products/jsse/> and install it into $JAKARTA_HOME.
+ <http://java.sun.com/products/jsse/> and install it into $JAKARTA_HOME.
+ This step is not necessary if you are using a 1.4.x JVM.
* Obtain the following source distribution(s) either from anonymous CVS (see
<http://jakarta.apache.org/site/cvsindex.html> for details) or by
1.22 +8 -2 jakarta-tomcat/RELEASE-NOTES-3.3.2.txt
Index: RELEASE-NOTES-3.3.2.txt
===
RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.2.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RELEASE-NOTES-3.3.2.txt 26 Oct 2003 01:43:59 - 1.21
+++ RELEASE-NOTES-3.3.2.txt 1 Mar 2004 01:52:59 - 1.22
@@ -78,6 +78,8 @@
24123Fix problem where the AccessLog wasn't logging request that produce
no output. Also log the Request's content length for PUT requests.
+ Partially update to use commons-logging.
+
Jasper:
Bug No. Description
@@ -89,10 +91,14 @@
23101Fix case dependency problem on Windows platforms.
+ Fix high byte chars (xlate to unicode)
+
+ Fix a problem when a jsp include another jsp with relative path.
+
Configuration:
Bug No. Description
-
+8634 Allow alternative location for modules.xml
Connectors:
1.202 +16 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- build.xml 20 Feb 2004 03:55:03 - 1.201
+++ build.xml 1 Mar 2004 01:52:59 - 1.202
@@ -1,4 +1,19 @@
+
@@ -839,7 +854,7 @@
+ file="${ant-launcher.jar}" failonerror="false" />
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/03/02 22:15:56 Modified:.build.xml Log: Add the j-t-c docs to the bundled documentation. Revision ChangesPath 1.203 +8 -0 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- build.xml 1 Mar 2004 01:52:59 - 1.202 +++ build.xml 3 Mar 2004 06:15:55 - 1.203 @@ -81,6 +81,7 @@ + + + + + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc index.html
billbarker2004/03/02 22:16:43 Modified:src/doc index.html Log: Add a link to the JK docs. Revision ChangesPath 1.14 +3 -1 jakarta-tomcat/src/doc/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/index.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- index.html1 Mar 2004 00:32:18 - 1.13 +++ index.html3 Mar 2004 06:16:43 - 1.14 @@ -79,6 +79,8 @@ Integrating Tomcat with a Web Server +JK Documentation - How to setup and configure + mod_jk and mod_jk2 for use with Tomcat. Apache mod_jk - Installation and - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 confighowto.xml configtc.xml configtccom.xml configtcex.xml configweb.xml configwebcom.xml configwebex.xml installhowto.xml vhosthowto.xml
billbarker2004/03/03 20:46:34
Modified:jk/xdocs faq.xml index.xml menu.idx.in style.css.in
style.xsl.in
jk/xdocs/common AJPv13-extensions-proposal.xml AJPv13.xml
doccontrib.xml tools.xml
jk/xdocs/jk aphowto.xml domhowto.xml iishowto.xml
neshowto.xml quickhowto.xml workershowto.xml
jk/xdocs/jk2 confighowto.xml configtc.xml configtccom.xml
configtcex.xml configweb.xml configwebcom.xml
configwebex.xml installhowto.xml vhosthowto.xml
Log:
Updating to the Apache License v2.0.
Revision ChangesPath
1.10 +16 -1 jakarta-tomcat-connectors/jk/xdocs/faq.xml
Index: faq.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/faq.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- faq.xml 1 Nov 2003 19:16:45 - 1.9
+++ faq.xml 4 Mar 2004 04:46:33 - 1.10
@@ -1,5 +1,20 @@
+
+ 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.
+
FAQ
Henri Gomez
1.14 +16 -1 jakarta-tomcat-connectors/jk/xdocs/index.xml
Index: index.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- index.xml 26 Jan 2004 20:48:04 - 1.13
+++ index.xml 4 Mar 2004 04:46:33 - 1.14
@@ -1,5 +1,20 @@
+
+ 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.
+
Overview
Jean-Frederic Clere
1.5 +15 -0 jakarta-tomcat-connectors/jk/xdocs/menu.idx.in
Index: menu.idx.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.idx.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu.idx.in 7 Sep 2003 03:33:24 - 1.4
+++ menu.idx.in 4 Mar 2004 04:46:33 - 1.5
@@ -4,6 +4,21 @@
]>
+
1.6 +15 -0 jakarta-tomcat-connectors/jk/xdocs/style.css.in
Index: style.css.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/style.css.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- style.css.in 5 Sep 2002 08:39:26 - 1.5
+++ style.css.in 4 Mar 2004 04:46:33 - 1.6
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
body {
margin: 0;
font-family: "verdana", "tahoma", "arial", "helvetica", sans-serif;
1.17 +23 -2 jakarta-tomcat-connectors/jk/xdocs/style.xsl.in
Index: style.xsl.in
===
RCS file: /home/cvs/jakarta-tomcat-connector
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkMX.java
billbarker2004/03/08 21:39:15
Modified:jk/java/org/apache/jk/common JkMX.java
Log:
Fix problems with finding the Adapter in TC 5.
In TC 5, jmx.jar is in a different CL than jmx-tools.jar, so you can't use
createMBean w/o specifying the CL. TC 3 & 4 should work much as before.
Revision ChangesPath
1.21 +103 -110 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JkMX.java 24 Feb 2004 08:48:42 - 1.20
+++ JkMX.java 9 Mar 2004 05:39:14 - 1.21
@@ -36,96 +36,96 @@
public class JkMX extends JkHandler
{
MBeanServer mserver;
- private boolean enabled=false;
- private int httpport=-1;
- private String httphost="localhost";
- private int jrmpport=-1;
- private String jrmphost="localhost";
+private boolean enabled=false;
+private int httpport=-1;
+private String httphost="localhost";
+private int jrmpport=-1;
+private String jrmphost="localhost";
-public JkMX()
-{
+public JkMX() {
}
/* Public methods */
- /** Enable the MX4J adapters (new way)
- */
- public void setEnabled(boolean b) {
- enabled=b;
- }
-
- public boolean getEnabled() {
- return enabled;
- }
-
- /** Enable the MX4J adapters (old way, compatible)
- */
- public void setPort(int i) {
- enabled=(i != -1);
- }
-
- public int getPort() {
- return ((httpport != -1) ? httpport : jrmpport);
- }
-
- /** Enable the MX4J HTTP internal adapter
- */
- public void setHttpPort( int i ) {
- httpport=i;
- }
-
- public int getHttpPort() {
- return httpport;
- }
-
- public void setHttpHost(String host ) {
- this.httphost=host;
- }
-
- public String getHttpHost() {
- return httphost;
- }
-
- /** Enable the MX4J JRMP internal adapter
- */
- public void setJrmpPort( int i ) {
- jrmpport=i;
- }
-
- public int getJrmpPort() {
- return jrmpport;
- }
-
- public void setJrmpHost(String host ) {
- this.jrmphost=host;
- }
-
- public String getJrmpHost() {
- return jrmphost;
- }
+/** Enable the MX4J adapters (new way)
+ */
+public void setEnabled(boolean b) {
+enabled=b;
+}
+
+public boolean getEnabled() {
+return enabled;
+}
+
+/** Enable the MX4J adapters (old way, compatible)
+ */
+public void setPort(int i) {
+enabled=(i != -1);
+}
+
+public int getPort() {
+return ((httpport != -1) ? httpport : jrmpport);
+}
+
+/** Enable the MX4J HTTP internal adapter
+ */
+public void setHttpPort( int i ) {
+httpport=i;
+}
+
+public int getHttpPort() {
+return httpport;
+}
+
+public void setHttpHost(String host ) {
+this.httphost=host;
+}
+
+public String getHttpHost() {
+return httphost;
+}
+
+/** Enable the MX4J JRMP internal adapter
+ */
+public void setJrmpPort( int i ) {
+jrmpport=i;
+}
+
+public int getJrmpPort() {
+return jrmpport;
+}
+
+public void setJrmpHost(String host ) {
+this.jrmphost=host;
+}
+
+public String getJrmpHost() {
+return jrmphost;
+}
/* Start/stop */
- ObjectName httpServerName=null;
- ObjectName jrmpServerName=null;
+ObjectName httpServerName=null;
+ObjectName jrmpServerName=null;
/** Initialize the worker. After this call the worker will be
* ready to accept new requests.
*/
public void loadAdapter() throws IOException {
- boolean httpAdapterLoaded = false;
- boolean jrmpAdapterLoaded = false;
-
+boolean httpAdapterLoaded = false;
+boolean jrmpAdapterLoaded = false;
+
if ((httpport != -1) && classExists("mx4j.adaptor.http.HttpAdaptor")) {
try {
- httpServerName = new
ObjectName("Http:name=HttpAdaptor");
-mserver.createMBean("mx4j.adaptor.http.HttpAdaptor",
httpServerName, n
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
billbarker2004/03/09 07:22:11
Modified:src/share/org/apache/tomcat/core ContextManager.java
Log:
Updating version to 3.3.3-dev.
Revision ChangesPath
1.209 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ContextManager.java 6 Mar 2004 15:44:37 - 1.208
+++ ContextManager.java 9 Mar 2004 15:22:11 - 1.209
@@ -105,7 +105,7 @@
public class ContextManager {
/** Official name and version
*/
-public static final String TOMCAT_VERSION = "3.3.2 Final";
+public static final String TOMCAT_VERSION = "3.3.3 - Dev";
public static final String TOMCAT_NAME = "Tomcat Web Server";
/** System property used to set the base directory ( tomcat home ).
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs index.html
billbarker2004/03/10 21:01:20 Modified:xdocsindex.xml docs index.html Log: Updating latest Tomcat 3 version to 3.3.2. Revision ChangesPath 1.48 +2 -2 jakarta-tomcat-site/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- index.xml 23 Feb 2004 09:24:10 - 1.47 +++ index.xml 11 Mar 2004 05:01:20 - 1.48 @@ -50,7 +50,7 @@ 2.2/1.1 - 3.3.1a + 3.3.2 @@ -140,7 +140,7 @@ 2.2 and JSP 1.1 specifications. -Tomcat 3.3.x. Version 3.3.1 is the current production +Tomcat 3.3.x. Version 3.3.2 is the current production quality release. It continues the refactoring that was begun in version 3.2 and carries it to its logical conclusion. Version 3.3 provides a much more modular design and allows the servlet container to be customized by adding and removing 1.59 +2 -2 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- index.html9 Mar 2004 20:11:44 - 1.58 +++ index.html11 Mar 2004 05:01:20 - 1.59 @@ -213,7 +213,7 @@ -3.3.1a +3.3.2 @@ -316,7 +316,7 @@ Software Foundation. The 3.x versions all implement the Servlet 2.2 and JSP 1.1 specifications. -Tomcat 3.3.x. Version 3.3.1 is the current production +Tomcat 3.3.x. Version 3.3.2 is the current production quality release. It continues the refactoring that was begun in version 3.2 and carries it to its logical conclusion. Version 3.3 provides a much more modular design and allows the servlet container to be customized by adding and removing - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSE14Support.java
billbarker2004/03/18 22:26:41
Modified:util/java/org/apache/tomcat/util/net/jsse JSSE14Support.java
Log:
If using clientAuth="want", then don't change it to "need" when requesting the cert
for CLIENT-CERT auth.
About the only thing that this allows is the ability to send back an error page if
the client chooses not to send a cert.
Revision ChangesPath
1.8 +6 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
Index: JSSE14Support.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JSSE14Support.java24 Feb 2004 08:50:05 - 1.7
+++ JSSE14Support.java19 Mar 2004 06:26:41 - 1.8
@@ -27,6 +27,7 @@
import javax.net.ssl.HandshakeCompletedEvent;
import javax.net.ssl.HandshakeCompletedListener;
import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
@@ -58,7 +59,11 @@
}
protected void handShake() throws IOException {
-ssl.setNeedClientAuth(true);
+if( ssl.getWantClientAuth() ) {
+logger.debug("No client cert sent for want");
+} else {
+ssl.setNeedClientAuth(true);
+}
synchronousHandshake(ssl);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java
billbarker2004/03/21 15:50:54
Modified:jk/java/org/apache/jk/common ChannelSocket.java
Log:
Fix exception when attempting to pause the channel w/o specifying an address.
Also fix problem where requests weren't being unregistered because of a misformatted
Msg.
Revision ChangesPath
1.45 +4 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChannelSocket.java24 Feb 2004 08:48:42 - 1.44
+++ ChannelSocket.java21 Mar 2004 23:50:53 - 1.45
@@ -415,7 +415,8 @@
private void unLockSocket() throws IOException {
// Need to create a connection to unlock the accept();
Socket s;
- if (inet == null) {
+
+ if (inet == null || "0.0.0.0".equals(inet.getHostAddress())) {
s=new Socket("127.0.0.1", port );
}else{
s=new Socket(inet, port );
@@ -653,6 +654,8 @@
MsgAjp endM = new MsgAjp();
endM.reset();
endM.appendByte((byte)HANDLE_THREAD_END);
+ endM.end();
+ endM.processHeader();
next.invoke(endM, ep);
} catch( Exception ee) {
log.error( "Error, releasing connection",ee);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelUn.java
billbarker2004/03/21 16:42:13
Modified:jk/java/org/apache/jk/common ChannelUn.java
Log:
Fix thread unregistration.
Revision ChangesPath
1.27 +2 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChannelUn.java24 Feb 2004 08:48:42 - 1.26
+++ ChannelUn.java22 Mar 2004 00:42:13 - 1.27
@@ -248,6 +248,8 @@
MsgAjp endM = new MsgAjp();
endM.reset();
endM.appendByte((byte)HANDLE_THREAD_END);
+endM.end();
+endM.processHeader();
next.invoke(endM, ep);
} catch( Exception ee) {
log.error( "Error, releasing connection",ee);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
billbarker2004/03/24 19:01:21
Modified:jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Make certain that the endpoint is closed, even if Apache has already dropped the
connection.
IOExceptions here are pretty harmless, since they mean that Apache has already
finished with the page, and so doesn't need to be told that the page is done.
Fix for Bug #27917.
Revision ChangesPath
1.53 +12 -9
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- JkCoyoteHandler.java 24 Feb 2004 08:48:41 - 1.52
+++ JkCoyoteHandler.java 25 Mar 2004 03:01:21 - 1.53
@@ -173,7 +173,7 @@
"jkInputStream");
} catch( Exception ex ) {
-ex.printStackTrace();
+log.error("Error during init",ex);
}
}
@@ -189,7 +189,7 @@
}
getJkMain().start();
} catch( Exception ex ) {
-ex.printStackTrace();
+log.error("Error during startup",ex);
}
}
@@ -295,7 +295,7 @@
try {
adapter.service( req, res );
} catch( Exception ex ) {
-ex.printStackTrace();
+log.info("Error servicing request " + req,ex);
}
if(ep.getStatus() != JK_STATUS_CLOSED) {
res.finish();
@@ -439,13 +439,16 @@
msg.reset();
msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE );
msg.appendByte( 1 );
-
-ep.setType( JkHandler.HANDLE_SEND_PACKET );
-ep.getSource().invoke( msg, ep );
-
-ep.setType( JkHandler.HANDLE_FLUSH );
-ep.getSource().invoke( msg, ep );
+try {
+ep.setType( JkHandler.HANDLE_SEND_PACKET );
+ep.getSource().invoke( msg, ep );
+
+ep.setType( JkHandler.HANDLE_FLUSH );
+ep.getSource().invoke( msg, ep );
+} catch(IOException iex) {
+log.debug("Connection error ending request.",iex);
+}
ep.setStatus(JK_STATUS_CLOSED );
if( logTime.isDebugEnabled() )
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat JdkCompat.java
billbarker2004/04/02 22:47:24
Modified:util/java/org/apache/tomcat/util/compat JdkCompat.java
Log:
Add detection for JDK 1.5
Revision ChangesPath
1.12 +9 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JdkCompat.java24 Feb 2004 08:50:05 - 1.11
+++ JdkCompat.java3 Apr 2004 06:47:24 - 1.12
@@ -66,6 +66,10 @@
return java14;
}
+public static boolean isJava15() {
+return java15;
+}
+
// Implementation
// from ant
@@ -74,10 +78,12 @@
public static final String JAVA_1_2 = "1.2";
public static final String JAVA_1_3 = "1.3";
public static final String JAVA_1_4 = "1.4";
+public static final String JAVA_1_5 = "1.5";
static String javaVersion;
static boolean java2=false;
static boolean java14=false;
+static boolean java15=false;
static JdkCompat jdkCompat;
static {
@@ -97,6 +103,9 @@
Class.forName("java.lang.CharSequence");
javaVersion = JAVA_1_4;
java14=true;
+Class.forName("java.lang.Appendable");
+javaVersion = JAVA_1_5;
+java15=true;
} catch (ClassNotFoundException cnfe) {
// swallow as we've hit the max class version that we have
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java
billbarker2004/05/09 12:58:43
Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
Log:
Reverting previous patch.
Since MessageFormat.setLocale works just as well, there isn't a need to expose the
1.4 constructor.
Revision ChangesPath
1.11 +0 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Jdk14Compat.java 8 May 2004 22:05:11 - 1.10
+++ Jdk14Compat.java 9 May 2004 19:58:43 - 1.11
@@ -118,7 +118,4 @@
wrapper.initCause(wrapped);
}
-public MessageFormat getMessageFormat(String pattern, Locale locale) {
-return new MessageFormat(pattern, locale);
-}
}
1.15 +0 -10
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JdkCompat.java8 May 2004 22:05:11 - 1.14
+++ JdkCompat.java9 May 2004 19:58:43 - 1.15
@@ -225,14 +225,4 @@
// do nothing
}
-/**
- * Obtain a MessageFormat for the correct pattern and Locale.
- *
- * @param pattern The pattern to format with.
- * @param locale The Locale to use.
- */
-public MessageFormat getMessageFormat(String pattern, Locale locale) {
-return new MessageFormat(pattern);
-}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res StringManager.java
billbarker2004/05/09 13:02:08
Modified:util/java/org/apache/tomcat/util/res StringManager.java
Log:
Change to use MessageFormat.setLocale, instead of the JDK 1.4 constructor.
This has the additional benefit of setting the Locale of the error message correctly
all the way back to JDK 1.1.6 :).
Revision ChangesPath
1.6 +6 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringManager.java8 May 2004 22:05:11 - 1.5
+++ StringManager.java9 May 2004 20:02:08 - 1.6
@@ -22,8 +22,6 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.tomcat.util.compat.JdkCompat;
-
/**
* An internationalization / localization helper class which reduces
* the bother of handling ResourceBundles and takes care of the
@@ -53,12 +51,12 @@
public class StringManager {
-private static JdkCompat jdkcompat = JdkCompat.getJdkCompat();
/**
* The ResourceBundle for this StringManager.
*/
private ResourceBundle bundle;
+private Locale locale;
/**
* Creates a new StringManager for a given package. This is a
@@ -74,10 +72,12 @@
}
private StringManager(String packageName,Locale loc) {
+locale = loc;
String bundleName = packageName + ".LocalStrings";
try {
bundle = ResourceBundle.getBundle(bundleName,loc);
} catch( MissingResourceException ex ) {
+locale = Locale.US;
bundle= ResourceBundle.getBundle( bundleName, Locale.US);
}
}
@@ -157,7 +157,8 @@
}
}
if( value==null ) value=key;
- MessageFormat mf = jdkcompat.getMessageFormat(value, bundle.getLocale());
+ MessageFormat mf = new MessageFormat(value);
+mf.setLocale(locale);
iString = mf.format(nonNullArgs, new StringBuffer(), null).toString();
} catch (IllegalArgumentException iae) {
StringBuffer buf = new StringBuffer();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/generators Jdk12Interceptor.java
billbarker2004/04/26 19:45:13
Modified:src/share/org/apache/tomcat/modules/generators
Jdk12Interceptor.java
Log:
Reset the Context CL correctly after an include. Also, adding a PostRequest so the
the Context CL is in a defined state after the request finishes.
The rule is that if the Child has a Parent, then the Parent is the request that
included. Otherwise, the including request is the top-level one.
There are still CL issues with cross-context RD reqests, but this at least fixes the
bug that was there with same-context RD requests.
Fix for Bug #28590
Reported By: Hugh J. Lee [EMAIL PROTECTED]
Revision ChangesPath
1.11 +9 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java
Index: Jdk12Interceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Jdk12Interceptor.java 25 Feb 2004 06:52:40 - 1.10
+++ Jdk12Interceptor.java 27 Apr 2004 02:45:12 - 1.11
@@ -93,11 +93,16 @@
// after include, reset the class loader
// fix for 1112
- request=child.getParent();
- if( request != null )
- fixJDKContextClassLoader(request.getContext());
+ Request chParent=child.getParent();
+ if( chParent != null )
+ fixJDKContextClassLoader(chParent.getContext());
else
- jdk11Compat.setContextClassLoader(this.getClass().getClassLoader());
+ fixJDKContextClassLoader(request.getContext());
+ return 0;
+}
+
+public int postRequest(Request request, Response response) {
+ jdk11Compat.setContextClassLoader(this.getClass().getClassLoader());
return 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina build.xml
billbarker2004/04/26 22:51:20 Modified:catalina build.xml Log: Include all of o.a.t.u.compat in bootstrap.jar. Without this, Tomcat can't access any of the features of a 1.4.x JVM. Fix for Bug #28610 Reported By: David Holscher [EMAIL PROTECTED] Revision ChangesPath 1.60 +1 -1 jakarta-tomcat-catalina/catalina/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- build.xml 15 Apr 2004 22:11:36 - 1.59 +++ build.xml 27 Apr 2004 05:51:20 - 1.60 @@ -882,7 +882,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
billbarker2004/05/04 22:43:22 Modified:jk/native/common jk_worker.c Log: Grammatical fix for logging message. Fix for Bug #28761 Submitted By: Hans Schmid [EMAIL PROTECTED] Revision ChangesPath 1.15 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_worker.c 24 Feb 2004 08:45:47 - 1.14 +++ jk_worker.c 5 May 2004 05:43:22 - 1.15 @@ -91,8 +91,8 @@ rc = map_get(worker_map, name, NULL); -jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s found a worker\n", -rc ? "" : "did not"); +jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s a worker\n", +rc ? "found" : "did not find"); return rc; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res StringManager.java
billbarker2004/05/08 15:05:12
Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
util/java/org/apache/tomcat/util/res StringManager.java
Log:
Enable parsing error messages in the given Locale when using a 1.4 JVM.
Fix for bug #28850
Reported By: Stephane Bailliez [EMAIL PROTECTED]
Revision ChangesPath
1.10 +5 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Jdk14Compat.java 15 Apr 2004 01:44:49 - 1.9
+++ Jdk14Compat.java 8 May 2004 22:05:11 - 1.10
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Locale;
+import java.text.MessageFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -116,4 +118,7 @@
wrapper.initCause(wrapped);
}
+public MessageFormat getMessageFormat(String pattern, Locale locale) {
+return new MessageFormat(pattern, locale);
+}
}
1.14 +13 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JdkCompat.java15 Apr 2004 01:44:49 - 1.13
+++ JdkCompat.java8 May 2004 22:05:11 - 1.14
@@ -21,8 +21,10 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Vector;
+import java.util.Locale;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.text.MessageFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -222,4 +224,15 @@
public void chainException(Throwable wrapper, Throwable wrapped) {
// do nothing
}
+
+/**
+ * Obtain a MessageFormat for the correct pattern and Locale.
+ *
+ * @param pattern The pattern to format with.
+ * @param locale The Locale to use.
+ */
+public MessageFormat getMessageFormat(String pattern, Locale locale) {
+return new MessageFormat(pattern);
+}
+
}
1.5 +6 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java
Index: StringManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringManager.java24 Feb 2004 08:50:06 - 1.4
+++ StringManager.java8 May 2004 22:05:11 - 1.5
@@ -22,6 +22,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.apache.tomcat.util.compat.JdkCompat;
+
/**
* An internationalization / localization helper class which reduces
* the bother of handling ResourceBundles and takes care of the
@@ -51,6 +53,7 @@
public class StringManager {
+private static JdkCompat jdkcompat = JdkCompat.getJdkCompat();
/**
* The ResourceBundle for this StringManager.
*/
@@ -154,7 +157,8 @@
}
}
if( value==null ) value=key;
-iString = MessageFormat.format(value, nonNullArgs);
+ MessageFormat mf = jdkcompat.getMessageFormat(value, bundle.getLocale());
+iString = mf.format(nonNullArgs, new StringBuffer(), null).toString();
} catch (IllegalArgumentException iae) {
StringBuffer buf = new StringBuffer();
buf.append(value);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
billbarker2004/05/20 00:17:23
Modified:jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Change header encoding to iso-8859-1.
Per RFC 2616, the HTTP headers are encoded in iso-8859-1 (with the exception given
by RFC 2947). Both mod_jk and mod_jk2 will handle the values we send as bytes, so
encoding has to be done here.
Fix for Bug #29105
Reported By: Eric Jacobson [EMAIL PROTECTED]
Revision ChangesPath
1.54 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- JkCoyoteHandler.java 25 Mar 2004 03:01:21 - 1.53
+++ JkCoyoteHandler.java 20 May 2004 07:17:23 - 1.54
@@ -324,7 +324,7 @@
new PrivilegedExceptionAction () {
public Object run()
throws IOException{
- return new C2BConverter( "UTF8" );
+ return new C2BConverter( "iso-8859-1" );
}
});
} catch(PrivilegedActionException pae) {
@@ -333,7 +333,7 @@
throw (IOException)ex;
}
} else {
-c2b=new C2BConverter( "UTF8" );
+c2b=new C2BConverter( "iso-8859-1" );
}
res.setNote( utfC2bNote, c2b );
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ApacheConfig.java
billbarker2004/05/26 21:42:13
Modified:src/share/org/apache/tomcat/modules/config ApacheConfig.java
Log:
Quote the module name passed to LoadModule.
Revision ChangesPath
1.33 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
Index: ApacheConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ApacheConfig.java 25 Feb 2004 07:06:59 - 1.32
+++ ApacheConfig.java 27 May 2004 04:42:13 - 1.33
@@ -336,8 +336,8 @@
// Verify the file exists !!
mod_jk.println("");
- mod_jk.println(" LoadModule jk_module "+
-modJk.toString().replace('\\','/'));
+ mod_jk.println(" LoadModule jk_module \""+
+modJk.toString().replace('\\','/')+"\"");
mod_jk.println("");
mod_jk.println();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads ThreadPool.java
billbarker2004/05/27 19:49:35
Modified:util/java/org/apache/tomcat/util/threads ThreadPool.java
Log:
Change logging message to DEBUG level.
Revision ChangesPath
1.26 +3 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ThreadPool.java 27 May 2004 16:12:54 - 1.25
+++ ThreadPool.java 28 May 2004 02:49:35 - 1.26
@@ -165,8 +165,9 @@
* more than Thread.MAX_PRIORITY
*/
public synchronized void setThreadPriority(int threadPriority) {
- System.out.println(getClass().getName() +
- ": setPriority(" + threadPriority + "): here.");
+if(log.isDebugEnabled())
+log.debug(getClass().getName() +
+ ": setPriority(" + threadPriority + "): here.");
if (threadPriority < Thread.MIN_PRIORITY) {
throw new IllegalArgumentException("new priority < MIN_PRIORITY");
-
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/mapper Mapper.java
billbarker2004/05/27 22:02:08
Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
Change mapping rules for request to /myapp.
With this change, if the web-app defines a servlet-mapping for the pattern '/*',
then a request for /myapp is forwarded to it. Otherwise, the behavior is unchanged.
This should allow Tomcat's webDAV servlet play nicer with MS's broken client.
Revision ChangesPath
1.38 +13 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Mapper.java 18 Mar 2004 01:55:16 - 1.37
+++ Mapper.java 28 May 2004 05:02:08 - 1.38
@@ -634,17 +634,17 @@
int pathOffset = path.getOffset();
int pathEnd = path.getEnd();
int servletPath = pathOffset;
+boolean noServletPath = false;
int length = context.name.length();
if (length != (pathEnd - pathOffset)) {
servletPath = pathOffset + length;
} else {
-// The path is empty, redirect to "/"
+noServletPath = true;
path.append('/');
-mappingData.redirectPath.setChars
-(path.getBuffer(), path.getOffset(), path.getEnd());
-path.setEnd(path.getEnd() - 1);
-return;
+pathOffset = path.getOffset();
+pathEnd = path.getEnd();
+servletPath = pathOffset+length;
}
path.setOffset(servletPath);
@@ -679,6 +679,14 @@
mappingData.pathInfo.recycle();
}
}
+}
+
+if(mappingData.wrapper == null && noServletPath) {
+// The path is empty, redirect to "/"
+mappingData.redirectPath.setChars
+(path.getBuffer(), pathOffset, pathEnd);
+path.setEnd(pathEnd - 1);
+return;
}
// Rule 3 -- Extension Match
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
billbarker2004/05/30 21:48:54
Modified:jk/java/org/apache/jk/apr AprImpl.java
jk/java/org/apache/jk/common ChannelJni.java
ChannelSocket.java ChannelUn.java
HandlerRequest.java JkInputStream.java
JniHandler.java
jk/java/org/apache/jk/core MsgContext.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Added: jk/java/org/apache/jk/core JkChannel.java
Log:
Clean up the API a bit to make it easier to improve.
The big change is that the 'source' attribute of MsgContext is now a JkChannel
instead of an arbitrary JkHandler. This allows the Actions to bypass the 'invoke'
path (which is really for incoming requests), and makes Request registration easier.
Other than Request registration, there really isn't much functionality change here.
However, now JK finally plays nice with the Manager status servlet (at least with the
Socket and Unix channels). Also, the memory leak with the JNI channel is finally gone
(since it doesn't implement Request registration).
Revision ChangesPath
1.31 +2 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AprImpl.java 24 Feb 2004 08:48:44 - 1.30
+++ AprImpl.java 31 May 2004 04:48:54 - 1.31
@@ -22,6 +22,7 @@
import java.util.Hashtable;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.MsgContext;
+import org.apache.jk.core.JkChannel;
/** Implements the interface with the APR library. This is for internal-use
* only. The goal is to use 'natural' mappings for user code - for example
@@ -167,7 +168,7 @@
public static Object createJavaContext(String type, long cContext) {
// XXX will be an instance method, fields accessible directly
AprImpl apr=aprSingleton;
-JkHandler jkH=(JkHandler)apr.jkHandlers.get( type );
+JkChannel jkH=(JkChannel)apr.jkHandlers.get( type );
if( jkH==null ) return null;
MsgContext ep=jkH.createMsgContext();
1.17 +21 -5
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
Index: ChannelJni.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChannelJni.java 24 Feb 2004 08:48:42 - 1.16
+++ ChannelJni.java 31 May 2004 04:48:54 - 1.17
@@ -21,13 +21,14 @@
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
+import org.apache.jk.core.JkChannel;
-
+import org.apache.coyote.Request;
/** Pass messages using jni
*
* @author Costin Manolache
*/
-public class ChannelJni extends JniHandler {
+public class ChannelJni extends JniHandler implements JkChannel {
int receivedNote=1;
public ChannelJni() {
@@ -92,6 +93,7 @@
public int send( Msg msg, MsgContext ep )
throws IOException
{
+ep.setNote( receivedNote, null );
if( log.isDebugEnabled() ) log.debug("ChannelJni.send: " + msg );
int rc=super.nativeDispatch( msg, ep, JK_HANDLE_JNI_DISPATCH, 0);
@@ -104,6 +106,22 @@
return rc;
}
+public int flush(Msg msg, MsgContext ep) throws IOException {
+ep.setNote( receivedNote, null );
+return OK;
+}
+
+public boolean isSameAddress(MsgContext ep) {
+return true;
+}
+
+public void registerRequest(Request req, MsgContext ep, int count) {
+// Not supported.
+}
+
+public String getChannelName() {
+return getName();
+}
/** Receive a packet from the C side. This is called from the C
* code using invocation, but only for the first packet - to avoid
* recursivity and thread problems.
@@ -136,11 +154,9 @@
case JkHandler.HANDLE_RECEIVE_PACKET:
return receive( msg, ep );
case JkHandler.HANDLE_SEND_PACKET:
-ep.setNote( receivedNote, null );
return send( msg, ep );
case JkHandler.HANDLE_FLUSH:
-ep.setNote( receivedNote, null );
-return 0;
+return flush(msg, ep);
}
// Reset receivedNote. It'll be visible only after a SEND and before a
receive.
1.46 +64 -12
jakarta-tomcat-connectors/jk/
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteResponse.java
billbarker2004/06/04 22:13:47
Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteResponse.java
Log:
Use JDK 1.3.x supported method.
Revision ChangesPath
1.17 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java
Index: CoyoteResponse.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CoyoteResponse.java 16 May 2004 16:39:45 - 1.16
+++ CoyoteResponse.java 5 Jun 2004 05:13:47 - 1.17
@@ -1450,7 +1450,7 @@
} catch (PrivilegedActionException pae){
IllegalArgumentException iae =
new IllegalArgumentException(location);
-jdkCompat.chainException(iae, pae.getCause());
+jdkCompat.chainException(iae, pae.getException());
throw iae;
}
} else {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
billbarker2004/06/04 22:19:04
Modified:jk/java/org/apache/jk/common HandlerRequest.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Adding stage information to the RequestInfo.
Revision ChangesPath
1.37 +4 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- HandlerRequest.java 31 May 2004 04:48:54 - 1.36
+++ HandlerRequest.java 5 Jun 2004 05:19:04 - 1.37
@@ -29,6 +29,7 @@
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
+import org.apache.coyote.Constants;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
@@ -441,6 +442,8 @@
}
}
+ RequestInfo rp = req.getRequestProcessor();
+ rp.setStage(Constants.STAGE_PARSE);
MessageBytes tmpMB2 = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE);
if(tmpMB2 != null) {
tmpMB2.recycle();
@@ -480,9 +483,7 @@
decodeAttributes( ep, msg, req, tmpMB );
-// if(req.getSecure() ) {
-// req.setScheme(req.SCHEME_HTTPS);
-// }
+ rp.setStage(Constants.STAGE_PREPARE);
MessageBytes valueMB = req.getMimeHeaders().getValue("host");
parseHost(valueMB, req);
// set cookies on request now that we have all headers
1.56 +5 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JkCoyoteHandler.java 31 May 2004 04:48:54 - 1.55
+++ JkCoyoteHandler.java 5 Jun 2004 05:19:04 - 1.56
@@ -36,6 +36,8 @@
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
+import org.apache.coyote.RequestInfo;
+import org.apache.coyote.Constants;
import org.apache.jk.common.HandlerRequest;
import org.apache.jk.common.JkInputStream;
import org.apache.jk.common.MsgAjp;
@@ -292,7 +294,8 @@
res.setNote( epNote, ep );
ep.setStatus( JK_STATUS_HEAD );
-
+ RequestInfo rp = req.getRequestProcessor();
+ rp.setStage(Constants.STAGE_SERVICE);
try {
adapter.service( req, res );
} catch( Exception ex ) {
@@ -307,6 +310,7 @@
req.recycle();
req.updateCounters();
res.recycle();
+ rp.setStage(Constants.STAGE_KEEPALIVE);
return OK;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java
billbarker2004/06/04 22:51:30
Modified:jk/java/org/apache/jk/common ChannelSocket.java
Log:
Finally remove the default setting of address if not specified.
Also some cleanup of logging levels.
Fix for Bug #39375
Fix for Bug #29399
Revision ChangesPath
1.47 +32 -25
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChannelSocket.java31 May 2004 04:48:54 - 1.46
+++ ChannelSocket.java5 Jun 2004 05:51:30 - 1.47
@@ -25,6 +25,7 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.SocketException;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
@@ -148,14 +149,14 @@
try {
this.inet= InetAddress.getByName( inet );
} catch( Exception ex ) {
-ex.printStackTrace();
+log.error("Error parsing "+inet,ex);
}
}
public String getAddress() {
if( inet!=null)
return inet.toString();
-return null;
+return "/0.0.0.0";
}
/**
@@ -340,11 +341,13 @@
}
if (maxPort < startPort)
maxPort = startPort;
-if (getAddress() == null)
-setAddress("0.0.0.0");
for( int i=startPort; i<=maxPort; i++ ) {
try {
-sSocket=new ServerSocket( i, 0, inet );
+if( inet == null ) {
+sSocket = new ServerSocket( i, 0 );
+} else {
+sSocket=new ServerSocket( i, 0, inet );
+}
port=i;
break;
} catch( IOException ex ) {
@@ -447,17 +450,18 @@
}
private void unLockSocket() throws IOException {
- // Need to create a connection to unlock the accept();
- Socket s;
+// Need to create a connection to unlock the accept();
+Socket s;
+InetAddress ladr = inet;
+
+if (ladr == null || "0.0.0.0".equals(ladr.getHostAddress())) {
+ladr = InetAddress.getLocalHost();
+}
+s=new Socket(ladr, port );
+// setting soLinger to a small value will help shutdown the
+// connection quicker
+s.setSoLinger(true, 0);
- if (inet == null || "0.0.0.0".equals(inet.getHostAddress())) {
- s=new Socket("127.0.0.1", port );
- }else{
- s=new Socket(inet, port );
- // setting soLinger to a small value will help shutdown the
- // connection quicker
- s.setSoLinger(true, 0);
- }
s.close();
}
@@ -590,8 +594,16 @@
int got;
while(pos < len) {
-got = is.read(b, pos + offset, len - pos);
-
+try {
+got = is.read(b, pos + offset, len - pos);
+} catch(SocketException sex) {
+if(pos > 0) {
+log.info("Error reading data after "+pos+"bytes",sex);
+} else {
+log.debug("Error reading data", sex);
+}
+got = -1;
+}
if (log.isTraceEnabled()) {
log.trace("read() " + b + " " + (b==null ? 0: b.length) + " " +
offset + " " + len + " = " + got );
@@ -743,16 +755,11 @@
public String getChannelName() {
String encodedAddr = "";
-String address = getAddress();
-if (address != null) {
-encodedAddr = address;
+if (inet != null && !"0.0.0.0".equals(inet.getHostAddress())) {
+encodedAddr = getAddress();
if (encodedAddr.startsWith("/"))
encodedAddr = encodedAddr.substring(1);
-if("0.0.0.0".equals(encodedAddr)) {
-encodedAddr = "";
-} else {
-encodedAddr = URLEncoder.encode(encodedAddr) + "-";
-}
+ encodedAddr = URLEncoder.encode(encodedAddr) + "-";
}
return ("jk-" + encodedAddr + port);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote RequestGroupInfo.java
billbarker2004/06/04 23:28:05
Modified:coyote/src/java/org/apache/coyote RequestGroupInfo.java
Log:
Remember the Requests stats even after the Request has gone to that great GC in the
sky.
Fix for Bug #29339
Revision ChangesPath
1.5 +29 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestGroupInfo.java
Index: RequestGroupInfo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestGroupInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestGroupInfo.java 24 Feb 2004 08:54:29 - 1.4
+++ RequestGroupInfo.java 5 Jun 2004 06:28:05 - 1.5
@@ -24,17 +24,33 @@
*/
public class RequestGroupInfo {
ArrayList processors=new ArrayList();
+private long deadMaxTime = 0;
+private long deadProcessingTime = 0;
+private int deadRequestCount = 0;
+private int deadErrorCount = 0;
+private long deadBytesReceived = 0;
+private long deadBytesSent = 0;
public synchronized void addRequestProcessor( RequestInfo rp ) {
processors.add( rp );
}
public synchronized void removeRequestProcessor( RequestInfo rp ) {
-processors.remove( rp );
+if( rp != null ) {
+if( deadMaxTime < rp.getMaxTime() )
+deadMaxTime = rp.getMaxTime();
+deadProcessingTime += rp.getProcessingTime();
+deadRequestCount += rp.getRequestCount();
+deadErrorCount += rp.getErrorCount();
+deadBytesReceived += rp.getBytesReceived();
+deadBytesSent += rp.getBytesSent();
+
+processors.remove( rp );
+}
}
public synchronized long getMaxTime() {
-long maxTime=0;
+long maxTime=deadMaxTime;
for( int i=0; i
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkMX.java
billbarker2004/06/16 23:31:12
Modified:jk/java/org/apache/jk/common JkMX.java
Log:
Add support for the mx4j 2.x HttpAdapter.
Also added option to turn off the XSLTProcessor, and cleaned up some dead code.
Partial fix for Bug #29259
Revision ChangesPath
1.23 +40 -26jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JkMX.java 9 Apr 2004 08:22:29 - 1.22
+++ JkMX.java 17 Jun 2004 06:31:12 - 1.23
@@ -41,6 +41,7 @@
private String httphost="localhost";
private int jrmpport=-1;
private String jrmphost="localhost";
+private boolean useXSLTProcessor = true;
public JkMX() {
}
@@ -103,6 +104,14 @@
return jrmphost;
}
+public boolean getUseXSLTProcessor() {
+return useXSLTProcessor;
+}
+
+public void setUseXSLTProcessor(boolean uxsltp) {
+useXSLTProcessor = uxsltp;
+}
+
/* Start/stop */
ObjectName httpServerName=null;
ObjectName jrmpServerName=null;
@@ -124,30 +133,40 @@
mserver.setAttribute(httpServerName, new Attribute("Host",
httphost));
mserver.setAttribute(httpServerName, new Attribute("Port", new
Integer(httpport)));
-ObjectName processorName =
registerObject("mx4j.adaptor.http.XSLTProcessor",
+if(useXSLTProcessor) {
+ObjectName processorName =
registerObject("mx4j.adaptor.http.XSLTProcessor",
"Http:name=XSLTProcessor");
-//mserver.setAttribute(processorName, new Attribute("File",
"/opt/41/server/lib/openjmx-tools.jar"));
-//mserver.setAttribute(processorName, new Attribute("UseCache", new
Boolean(false)));
-//mserver.setAttribute(processorName, new Attribute("PathInJar",
"/openjmx/adaptor/http/xsl"));
-mserver.setAttribute(httpServerName, new Attribute("ProcessorName",
processorName));
-
-//server.invoke(serverName, "addAuthorization",
-// new Object[] {"openjmx", "openjmx"},
-// new String[] {"java.lang.String",
"java.lang.String"});
-
-// use basic authentication
-//server.setAttribute(serverName, new
Attribute("AuthenticationMethod", "basic"));
-
-// ObjectName sslFactory = new
ObjectName("Adaptor:service=SSLServerSocketFactory");
-//
server.createMBean("openjmx.adaptor.ssl.SSLAdaptorServerSocketFactory", sslFactory,
null);
-//SSLAdaptorServerSocketFactoryMBean factory =
-//
(SSLAdaptorServerSocketFactoryMBean)StandardMBeanProxy.create(SSLAdaptorServerSocketFactoryMBean.class,
server, sslFactory);
-// // Customize the values below
-// factory.setKeyStoreName("certs");
-// factory.setKeyStorePassword("openjmx");
+mserver.setAttribute(httpServerName, new
Attribute("ProcessorName", processorName));
+}
+
+// starts the server
+mserver.invoke(httpServerName, "start", null, null);
+
+log.info( "Started MX4J console on host " + httphost + " at port "
+ httpport);
+
+httpAdapterLoaded = true;
+
+} catch( Throwable t ) {
+httpServerName=null;
+log.error( "Can't load the MX4J http adapter ", t );
+}
+}
+
+if ((httpport != -1) && (!httpAdapterLoaded) &&
classExists("mx4j.tools.adaptor.http.HttpAdaptor")) {
+try {
+httpServerName =
registerObject("mx4j.tools.adaptor.http.HttpAdaptor",
+"Http:name=HttpAdaptor");
-// server.setAttribute(serverName, new
Attribute("SocketFactoryName", sslFactory.toString()));
+
+if( httphost!=null )
+mserver.setAttribute(httpServerName, new Attribute("Host&qu
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util URLEncoder.java
billbarker2004/06/16 23:41:20
Modified:catalina/src/share/org/apache/catalina/util URLEncoder.java
Log:
Fix C2B conversion.
Hopefully in 5.1.x, we can deprecate this one in favor of the j-t-c class.
Fix for Bug #29364 (I hope ;-).
Revision ChangesPath
1.3 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/URLEncoder.java
Index: URLEncoder.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/URLEncoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLEncoder.java 27 Feb 2004 14:58:51 - 1.2
+++ URLEncoder.java 17 Jun 2004 06:41:20 - 1.3
@@ -76,7 +76,7 @@
} else {
// convert to external encoding before hex conversion
try {
-writer.write(c);
+writer.write((char)c);
writer.flush();
} catch(IOException e) {
buf.reset();
-
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/mapper Mapper.java
billbarker2004/06/18 21:25:14
Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
Change to do case-insensitive mapping of the Host.
Host names (like all DNS names) are not case-sensitive, so ignore case when mapping.
Fix for Bug #29661
Reported By: François Jeanmougin [EMAIL PROTECTED]
Revision ChangesPath
1.39 +88 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Mapper.java 28 May 2004 05:02:08 - 1.38
+++ Mapper.java 19 Jun 2004 04:25:14 - 1.39
@@ -21,6 +21,7 @@
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.Ascii;
import java.util.List;
import java.util.ArrayList;
@@ -551,8 +552,8 @@
// Virtual host mapping
if (mappingData.host == null) {
Host[] hosts = this.hosts;
-int pos = find(hosts, host);
-if ((pos != -1) && (host.equals(hosts[pos].name))) {
+int pos = findIgnoreCase(hosts, host);
+if ((pos != -1) && (host.equalsIgnoreCase(hosts[pos].name))) {
mappingData.host = hosts[pos].object;
contexts = hosts[pos].contextList.contexts;
nesting = hosts[pos].contextList.nesting;
@@ -961,6 +962,61 @@
}
+/**
+ * Find a map elemnt given its name in a sorted array of map elements.
+ * This will return the index for the closest inferior or equal item in the
+ * given array.
+ */
+private static final int findIgnoreCase(MapElement[] map, CharChunk name) {
+return findIgnoreCase(map, name, name.getStart(), name.getEnd());
+}
+
+
+/**
+ * Find a map elemnt given its name in a sorted array of map elements.
+ * This will return the index for the closest inferior or equal item in the
+ * given array.
+ */
+private static final int findIgnoreCase(MapElement[] map, CharChunk name,
+ int start, int end) {
+
+int a = 0;
+int b = map.length - 1;
+
+// Special cases: -1 and 0
+if (b == -1) {
+return -1;
+}
+if (compareIgnoreCase(name, start, end, map[0].name) < 0 ) {
+return -1;
+}
+if (b == 0) {
+return 0;
+}
+
+int i = 0;
+while (true) {
+i = (b + a) / 2;
+int result = compareIgnoreCase(name, start, end, map[i].name);
+if (result == 1) {
+a = i;
+} else if (result == 0) {
+return i;
+} else {
+b = i;
+}
+if ((b - a) == 1) {
+int result2 = compareIgnoreCase(name, start, end, map[b].name);
+if (result2 < 0) {
+return a;
+} else {
+return b;
+}
+}
+}
+
+}
+
/**
* Find a map elemnt given its name in a sorted array of map elements.
@@ -1024,6 +1080,36 @@
if (c[i + start] > compareTo.charAt(i)) {
result = 1;
} else if (c[i + start] < compareTo.charAt(i)) {
+result = -1;
+}
+}
+if (result == 0) {
+if (compareTo.length() > (end - start)) {
+result = -1;
+} else if (compareTo.length() < (end - start)) {
+result = 1;
+}
+}
+return result;
+}
+
+
+/**
+ * Compare given char chunk with String ignoring case.
+ * Return -1, 0 or +1 if inferior, equal, or superior to the String.
+ */
+private static final int compareIgnoreCase(CharChunk name, int start, int end,
+ String compareTo) {
+int result = 0;
+char[] c = name.getBuffer();
+int len = compareTo.length();
+if ((end - start) < len) {
+len = end - start;
+}
+for (int i = 0; (i < len) && (result == 0); i++) {
+if (Ascii.toLower(c[i + start]) > Ascii.toLower(compareTo.charAt(i))) {
+result = 1;
+} else if (Ascii.toLower(c[i + start]) <
Ascii.toLower(
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net URL.java
billbarker2004/06/19 17:08:15
Modified:util/java/org/apache/tomcat/util/net URL.java
Log:
Improve parsing of the scheme component of the URI to closer match the RFC.
Revision ChangesPath
1.8 +12 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/URL.java
Index: URL.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/URL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URL.java 24 Feb 2004 08:50:05 - 1.7
+++ URL.java 20 Jun 2004 00:08:15 - 1.8
@@ -106,8 +106,8 @@
}
// Parse out the new protocol
-for (i = start; !aRef && (i < limit) &&
- ((c = spec.charAt(i)) != '/'); i++) {
+for (i = start; !aRef && (i < limit) ; i++) {
+c = spec.charAt(i);
if (c == ':') {
String s = spec.substring(start, i).toLowerCase();
// Assume all protocols are valid
@@ -116,7 +116,7 @@
break;
} else if( c == '#' ) {
aRef = true;
-} else if( c == '?' ) {
+} else if( !isSchemeChar((char)c) ) {
break;
}
}
@@ -719,5 +719,13 @@
}
+/**
+ * Determine if the character is allowed in the scheme of a URI.
+ * See RFC 2396, Section 3.1
+ */
+public static boolean isSchemeChar(char c) {
+return Character.isLetterOrDigit(c) ||
+c == '+' || c == '-' || c == '.';
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteResponse.java
billbarker2004/06/19 17:28:07
Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteResponse.java
Log:
Make the check for an absolute URI conform conform better to the RFC.
Now an absolute URI is anything of the form :. This
allows protocols such as 'mailto' and 'news' as well as the standard URLs.
Fix for Bug #18147
Revision ChangesPath
1.21 +18 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java
Index: CoyoteResponse.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CoyoteResponse.java 19 Jun 2004 18:52:42 - 1.20
+++ CoyoteResponse.java 20 Jun 2004 00:28:07 - 1.21
@@ -1423,8 +1423,7 @@
boolean leadingSlash = location.startsWith("/");
-if (leadingSlash
-|| (!leadingSlash && (location.indexOf("://") == -1))) {
+if (leadingSlash || !hasScheme(location)) {
redirectURLCC.recycle();
@@ -1487,6 +1486,22 @@
}
+
+/**
+ * Determine if a URI string has a scheme component.
+ */
+private boolean hasScheme(String uri) {
+int len = uri.length();
+for(int i=0; i < len ; i++) {
+char c = uri.charAt(i);
+if(c == ':') {
+return i > 0;
+} else if(!URL.isSchemeChar(c)) {
+return false;
+}
+}
+return false;
+}
/**
* Return the specified URL with the specified session identifier
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config PolicyInterceptor.java
billbarker2004/10/19 22:26:26
Modified:src/share/org/apache/tomcat/modules/config
PolicyInterceptor.java
Log:
Allow compilation with a 1.5 JDK
Revision ChangesPath
1.16 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
Index: PolicyInterceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PolicyInterceptor.java25 Feb 2004 07:06:59 - 1.15
+++ PolicyInterceptor.java20 Oct 2004 05:26:25 - 1.16
@@ -27,6 +27,7 @@
import java.security.Permissions;
import java.security.Policy;
import java.security.ProtectionDomain;
+import java.security.cert.Certificate;
import java.util.Enumeration;
import java.util.PropertyPermission;
@@ -199,7 +200,7 @@
try {
File dir = new File(base);
URL url = new URL("file:" + dir.getAbsolutePath());
- CodeSource cs = new CodeSource(url,null);
+ CodeSource cs = new CodeSource(url,(Certificate [])null);
/* We'll construct permissions for Jasper.
Tomcat uses normal policy and URLClassLoader.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/10/19 22:29:55
Modified:.build.xml
Log:
Allow compilation with a 1.5 JDK.
Note that setting compile.source="1.5" won't currently work, since there are still
some enums floating around.
Revision ChangesPath
1.205 +35 -7 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- build.xml 6 Apr 2004 07:12:31 - 1.204
+++ build.xml 20 Oct 2004 05:29:54 - 1.205
@@ -23,6 +23,8 @@
+
+
@@ -117,9 +119,6 @@
-
-
-
@@ -433,7 +432,6 @@
-
@@ -448,7 +446,8 @@
-
@@ -513,7 +510,12 @@
debug="${debug}"
optimize="${optimize}"
deprecation="off"
+ source="${compile.source}"
+ target="${compile.target}"
srcdir="src/share">
+
+
+
@@ -543,6 +545,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="off"
+ source="${compile.source}"
+ target="${compile.target}"
srcdir="src/share">
@@ -575,6 +579,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="off"
+ source="${compile.source}"
+ target="${compile.target}"
srcdir="src/share">
@@ -602,6 +608,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="off"
+ source="${compile.source}"
+ target="${compile.target}"
srcdir="src/share">
@@ -626,6 +634,8 @@
debug="${debug}"
optimize="${optimize}"
deprecation="off"
+ source="${compile.source}"
+ target="${compile.target}"
srcdir="src/facade22">
@@ -676,6 +686,8 @@
srcdir="src/share"
debug="${debug}"
optimize="${optimize}"
+ source="${compile.source}"
+ target="${compile.target}"
deprecation="off">
@@ -744,6 +756,8 @@
srcdir="src/share"
debug="${debug}"
optimize="${optimize}"
+ source="${compile.source}"
+ target="${compile.target}"
deprecation="off">
@@ -794,6 +808,8 @@
@@ -821,10 +837,14 @@
@@ -868,6 +888,8 @@
@@ -942,6 +964,8 @@
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads Expirer.java
billbarker2004/10/20 19:41:38
Modified:util/java/org/apache/tomcat/util/threads Expirer.java
Log:
Clean up references to TS when one is removed.
Fix for Bug #31800
Submitted By: David Blavier [EMAIL PROTECTED]
Revision ChangesPath
1.9 +6 -10
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java
Index: Expirer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Expirer.java 17 Sep 2004 18:34:19 - 1.8
+++ Expirer.java 21 Oct 2004 02:41:38 - 1.9
@@ -82,8 +82,9 @@
for( int i=0; i< managedCount; i++ ) {
if( ts == managedObjs[i] ) {
synchronized( managedObjs ) {
- managedObjs[ i ] = managedObjs[managedCount-1];
managedCount--;
+ managedObjs[ i ] = managedObjs[managedCount];
+managedObjs[managedCount] = null;
}
return;
}
@@ -117,7 +118,7 @@
public void runIt( Object td[] ) {
long timeNow = System.currentTimeMillis();
- if( dL > 2 ) debug( "Checking " + timeNow );
+ if( log.isTraceEnabled() ) log.trace( "Checking " + timeNow );
int checkedCount;
synchronized( managedObjs ) {
checkedCount=managedCount;
@@ -133,7 +134,7 @@
continue;
long maxInactiveInterval = ts.getMaxInactiveInterval();
- if( dL > 3 ) debug( "TS: " + maxInactiveInterval + " " +
+ if( log.isTraceEnabled() ) log.trace( "TS: " + maxInactiveInterval + " " +
ts.getLastAccessedTime());
if (maxInactiveInterval < 0)
continue;
@@ -142,8 +143,8 @@
if (timeIdle >= maxInactiveInterval) {
if( expireCallback != null ) {
- if( dL > 0 )
- debug( ts + " " + timeIdle + " " +
+ if( log.isDebugEnabled() )
+ log.debug( ts + " " + timeIdle + " " +
maxInactiveInterval );
expireCallback.expired( ts );
}
@@ -151,9 +152,4 @@
}
}
-private static final int dL=0;
-private void debug( String s ) {
-if (log.isDebugEnabled())
-log.debug("Expirer: " + s );
-}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.3.txt
billbarker2004/10/20 19:44:36 Modified:.RELEASE-NOTES-3.3.3.txt Log: Document fix to 31800 Revision ChangesPath 1.3 +3 -1 jakarta-tomcat/RELEASE-NOTES-3.3.3.txt Index: RELEASE-NOTES-3.3.3.txt === RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.3.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RELEASE-NOTES-3.3.3.txt 11 Oct 2004 00:13:34 - 1.2 +++ RELEASE-NOTES-3.3.3.txt 21 Oct 2004 02:44:36 - 1.3 @@ -28,6 +28,8 @@ 31474Fix the query-string that is passed by forwarded requests. +31800Clean up reference to Session when one is unmananged. + Jasper: Bug No. Description - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c
billbarker2004/10/22 20:02:32
Modified:jk/native/netscape jk_nsapi_plugin.c
Log:
Add the cert header and footer line to the SSL cert.
Fix for bug #31766
Based on submission by: Nathan Clement [EMAIL PROTECTED]
Revision ChangesPath
1.13 +12 -3 jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
Index: jk_nsapi_plugin.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_nsapi_plugin.c 8 Oct 2004 08:55:14 - 1.12
+++ jk_nsapi_plugin.c 23 Oct 2004 03:02:32 - 1.13
@@ -48,6 +48,9 @@
static int init_on_other_thread_is_done = JK_FALSE;
static int init_on_other_thread_is_ok = JK_FALSE;
+static const char ssl_cert_start[] = "-BEGIN CERTIFICATE-\r\n";
+static const char ssl_cert_end[] = "\r\n-END CERTIFICATE-\r\n";
+
static jk_logger_t *logger = NULL;
static jk_worker_env_t worker_env;
@@ -400,8 +403,14 @@
s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
if (s->is_ssl) {
-s->ssl_cert = pblock_findval("auth-cert", private_data->rq->vars);
-if (s->ssl_cert) {
+char *ssl_cert = pblock_findval("auth-cert", private_data->rq->vars);
+if (ssl_cert != NULL) {
+s->ssl_cert = jk_pool_alloc(s->pool, sizeof(ssl_cert_start)+
+ strlen(ssl_cert)+
+ sizeof(ssl_cert_end));
+strcpy(s->ssl_cert, ssl_cert_start);
+strcat(s->ssl_cert, ssl_cert);
+strcat(s->ssl_cert, ssl_cert_end);
s->ssl_cert_len = strlen(s->ssl_cert);
}
s->ssl_cipher = pblock_findval("cipher", private_data->sn->client);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Request.java
billbarker2004/11/18 22:07:56
Modified:catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/connector
Request.java
Log:
Since we are documenting the SSL Session ID attribute, treat it like other
SSL attributes.
Revision ChangesPath
1.13 +8 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Globals.java 15 Oct 2004 00:18:35 - 1.12
+++ Globals.java 19 Nov 2004 06:07:56 - 1.13
@@ -144,6 +144,13 @@
public static final String KEY_SIZE_ATTR =
"javax.servlet.request.key_size";
+/**
+ * The request attribute under which we store the session id being used
+ * for this SSL connection (as an object of type java.lang.String).
+ */
+public static final String SSL_SESSION_ID_ATTR =
+"javax.servlet.request.ssl_session";
+
/**
* The servlet context attribute under which the managed bean Registry
1.17 +7 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Request.java 26 Oct 2004 15:42:05 - 1.16
+++ Request.java 19 Nov 2004 06:07:56 - 1.17
@@ -863,6 +863,10 @@
if(attr != null) {
attributes.put(Globals.KEY_SIZE_ATTR, attr);
}
+attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
+if(attr != null) {
+attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
+}
attr = attributes.get(name);
}
return attr;
@@ -875,7 +879,8 @@
static boolean isSSLAttribute(String name) {
return Globals.CERTIFICATES_ATTR.equals(name) ||
Globals.CIPHER_SUITE_ATTR.equals(name) ||
-Globals.KEY_SIZE_ATTR.equals(name);
+Globals.KEY_SIZE_ATTR.equals(name) ||
+Globals.SSL_SESSION_ID_ATTR.equals(name);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/11/19 00:15:53 Modified:.build.xml Log: Fix the build for new Jk doc location. Revision ChangesPath 1.206 +1 -2 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- build.xml 20 Oct 2004 05:29:54 - 1.205 +++ build.xml 19 Nov 2004 08:15:53 - 1.206 @@ -867,11 +867,10 @@ - + - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs build.xml
billbarker2004/11/19 07:52:51 Modified:webapps/tomcat-docs build.xml Log: Fix Gump build. Revision ChangesPath 1.14 +4 -5 jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- build.xml 12 Jan 2003 17:26:46 - 1.13 +++ build.xml 19 Nov 2004 15:52:51 - 1.14 @@ -169,11 +169,10 @@ - - - - - + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java ChannelUn.java
billbarker2004/11/19 18:39:34
Modified:jk/java/org/apache/jk/common ChannelSocket.java
ChannelUn.java
Log:
It seems that the 1.5 JVM is less tolarant of 'null' ONames.
Reported By: Allistair Crossley [EMAIL PROTECTED]
Revision ChangesPath
1.49 +3 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChannelSocket.java17 Sep 2004 04:08:53 - 1.48
+++ ChannelSocket.java20 Nov 2004 02:39:34 - 1.49
@@ -703,7 +703,9 @@
Request req = (Request)ep.getRequest();
if( req != null ) {
ObjectName roname =
(ObjectName)ep.getNote(JMXRequestNote);
-Registry.getRegistry().unregisterComponent(roname);
+if( roname != null ) {
+Registry.getRegistry().unregisterComponent(roname);
+}
req.getRequestProcessor().setGlobalProcessor(null);
}
} catch( Exception ee) {
1.29 +3 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChannelUn.java31 May 2004 04:48:54 - 1.28
+++ ChannelUn.java20 Nov 2004 02:39:34 - 1.29
@@ -312,7 +312,9 @@
Request req = (Request)ep.getRequest();
if( req != null ) {
ObjectName roname =
(ObjectName)ep.getNote(JMXRequestNote);
-Registry.getRegistry().unregisterComponent(roname);
+if( roname != null ) {
+Registry.getRegistry().unregisterComponent(roname);
+}
req.getRequestProcessor().setGlobalProcessor(null);
}
} catch( Exception ee) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
