Author: remy.maucherat(a)jboss.com Date: 2012-09-26 13:13:02 -0400 (Wed, 26 Sep 2012) New Revision: 2089 Added: branches/7.2.x/src/main/resources/org/apache/tomcat/jni/ branches/7.2.x/src/main/resources/org/apache/tomcat/jni/Library.properties Removed: branches/7.2.x/src/main/java/org/apache/tomcat/jni/Library.properties Modified: branches/7.2.x/LICENSE branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContext.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfigFacade.java branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java branches/7.2.x/src/main/java/org/apache/catalina/deploy/JspPropertyGroup.java branches/7.2.x/src/main/java/org/apache/catalina/deploy/Multipart.java branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java branches/7.2.x/src/main/java/org/apache/coyote/ProtocolHandler.java branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Processor.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java branches/7.2.x/src/main/java/org/apache/jasper/compiler/JspConfig.java branches/7.2.x/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java branches/7.2.x/src/main/java/org/apache/naming/resources/AliasDirContext.java branches/7.2.x/src/main/java/org/apache/naming/resources/JARDirContext.java branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContext.java branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContextFacade.java branches/7.2.x/src/main/java/org/apache/tomcat/util/http/mapper/OnDemandContextMappingListener.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/CompletionHandlerAdapter.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/DefaultNioServerSocketChannelFactory.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioChannel.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEFactory.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEImplementation.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESupport.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEvent.java branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilter.java branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilterChain.java branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventServlet.java branches/7.2.x/src/main/java/org/jboss/servlet/http/UpgradableHttpServletResponse.java branches/7.2.x/src/main/java/org/jboss/web/CatalinaLogger.java branches/7.2.x/src/main/java/org/jboss/web/CatalinaMessages.java branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java branches/7.2.x/src/main/java/org/jboss/web/CoyoteMessages.java branches/7.2.x/src/main/java/org/jboss/web/ELLogger.java branches/7.2.x/src/main/java/org/jboss/web/ELMessages.java branches/7.2.x/src/main/java/org/jboss/web/JasperLogger.java branches/7.2.x/src/main/java/org/jboss/web/JasperMessages.java branches/7.2.x/src/main/java/org/jboss/web/Version.java branches/7.2.x/src/main/java/org/jboss/web/WebLogger.java branches/7.2.x/src/main/java/org/jboss/web/WebMessages.java branches/7.2.x/src/main/java/org/jboss/web/php/Constants.java branches/7.2.x/src/main/java/org/jboss/web/php/Handler.java branches/7.2.x/src/main/java/org/jboss/web/php/Highlight.java branches/7.2.x/src/main/java/org/jboss/web/php/Library.java branches/7.2.x/src/main/java/org/jboss/web/php/LifecycleListener.java branches/7.2.x/src/main/java/org/jboss/web/php/PhpThread.java branches/7.2.x/src/main/java/org/jboss/web/php/SAPI.java branches/7.2.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/Resolver.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteCond.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteMap.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteRule.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/Substitution.java branches/7.2.x/src/main/java/org/jboss/web/rewrite/TomcatResolver.java Log: Change to ASL Modified: branches/7.2.x/LICENSE =================================================================== --- branches/7.2.x/LICENSE 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/LICENSE 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,166 +1,202 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + 1. Definitions. - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - 0. Additional Definitions. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public 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. - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. - 1. Exception to Section 3 of the GNU GPL. + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. - 2. Conveying Modified Versions. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and - 3. Object Code Incorporating Material from Library Header Files. + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. - b) Accompany the object code with a copy of the GNU GPL and this license - document. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. - 4. Combined Works. + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. - d) Do one of the following: + END OF TERMS AND CONDITIONS - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. + APPENDIX: How to apply the Apache License to your work. - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) + Copyright [yyyy] [name of copyright owner] - 5. Combined Libraries. + 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 - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: + http://www.apache.org/licenses/LICENSE-2.0 - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. + 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. \ No newline at end of file Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.connector; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.connector; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContext.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContext.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; @@ -86,6 +58,7 @@ * is first started. * * @author Craig R. McClanahan + * @author Remy Maucherat * @version $Revision: 1673 $ $Date: 2011-03-12 18:58:07 +0100 (Sat, 12 Mar 2011) $ */ Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfigFacade.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfigFacade.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterConfigFacade.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.core; Modified: branches/7.2.x/src/main/java/org/apache/catalina/deploy/JspPropertyGroup.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/deploy/JspPropertyGroup.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/deploy/JspPropertyGroup.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.deploy; Modified: branches/7.2.x/src/main/java/org/apache/catalina/deploy/Multipart.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/deploy/Multipart.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/deploy/Multipart.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.deploy; Modified: branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/catalina/startup/ContextConfig.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.startup; Modified: branches/7.2.x/src/main/java/org/apache/coyote/ProtocolHandler.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/ProtocolHandler.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/ProtocolHandler.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote; Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.ajp; Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.ajp; Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProcessor.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.ajp; Modified: branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.ajp; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import static org.jboss.web.CoyoteMessages.MESSAGES; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/AbstractInternalOutputBuffer.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import java.util.HashMap; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.http11; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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 - * + * + * 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. + * 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.coyote.http11; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.http11; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.coyote.http11; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import static org.jboss.web.CoyoteMessages.MESSAGES; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.coyote.http11; import static org.jboss.web.CoyoteMessages.MESSAGES; Modified: branches/7.2.x/src/main/java/org/apache/jasper/compiler/JspConfig.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/jasper/compiler/JspConfig.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/jasper/compiler/JspConfig.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.jasper.compiler; import java.util.ArrayList; Modified: branches/7.2.x/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.jasper.compiler; import static org.jboss.web.JasperMessages.MESSAGES; Modified: branches/7.2.x/src/main/java/org/apache/naming/resources/AliasDirContext.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/naming/resources/AliasDirContext.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/naming/resources/AliasDirContext.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.naming.resources; Modified: branches/7.2.x/src/main/java/org/apache/naming/resources/JARDirContext.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/naming/resources/JARDirContext.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/naming/resources/JARDirContext.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.naming.resources; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContext.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContext.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContext.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.naming.resources; import java.io.ByteArrayInputStream; Modified: branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContextFacade.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContextFacade.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/naming/resources/ProxyDirContextFacade.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,49 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 1999-2009 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.naming.resources; import java.util.Hashtable; Deleted: branches/7.2.x/src/main/java/org/apache/tomcat/jni/Library.properties =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/jni/Library.properties 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/jni/Library.properties 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,59 +0,0 @@ -# Copyright(c) 2011 Red Hat Middleware, LLC, -# and individual contributors as indicated by the @authors tag. -# See the copyright.txt in the distribution for a -# full listing of individual contributors. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library in the file COPYING.LIB; -# if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -# -# @author Mladen Turk -# @author Jean-Frederic Clere -# -# Library.properties -# -windows.count=5 -windows.0=?*tcnative-1 -windows.1=?libapr-1 -windows.2=?libeay32 -windows.3=?ssleay32 -windows.4=libtcnative-1 - -linux2.count=5 -linux2.0=apr-1 -linux2.1=?z -linux2.2=?crypto -linux2.3=?ssl -linux2.4=tcnative-1 - -solaris.count=5 -solaris.0=apr-1 -solaris.1=?z -solaris.2=?crypto -solaris.3=?ssl -solaris.4=tcnative-1 - -hpux.count=5 -hpux.0=apr-1 -hpux.1=?z -hpux.2=?crypto -hpux.3=?ssl -hpux.4=tcnative-1 - -macosx.count=5 -macosx.0=apr-1 -macosx.1=?z -macosx.2=?crypto -macosx.3=?ssl -macosx.4=tcnative-1 Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/http/mapper/OnDemandContextMappingListener.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/http/mapper/OnDemandContextMappingListener.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/http/mapper/OnDemandContextMappingListener.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat, Inc, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.util.http.mapper; /** Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; import java.net.InetAddress; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.util.net; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/CompletionHandlerAdapter.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/CompletionHandlerAdapter.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/CompletionHandlerAdapter.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; import java.nio.channels.CompletionHandler; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/DefaultNioServerSocketChannelFactory.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/DefaultNioServerSocketChannelFactory.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/DefaultNioServerSocketChannelFactory.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2009, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.util.net; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioChannel.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioChannel.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioChannel.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2011, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEFactory.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEFactory.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEFactory.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net.jsse; import javax.net.ssl.SSLSession; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEImplementation.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEImplementation.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSEImplementation.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net.jsse; import java.net.Socket; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net.jsse; import static org.jboss.web.CoyoteMessages.MESSAGES; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESupport.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESupport.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESupport.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net.jsse; import java.io.ByteArrayInputStream; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/jsse/SecureNioChannel.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,24 +1,21 @@ -/** - * JBoss, Home of Professional Open Source. Copyright 2012, Red Hat, Inc., and - * individual contributors as indicated by the @author tags. See the - * copyright.txt file in the distribution for a full listing of individual - * contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. + * + * 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.util.net.jsse; import java.io.IOException; Modified: branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEvent.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEvent.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEvent.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.servlet.http; @@ -30,6 +26,8 @@ /** * The HttpEvent interface, which indicates the type of the event that is * being processed, as well as provides useful callbacks and utility objects. + * + * @author Remy Maucherat */ public interface HttpEvent { Modified: branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilter.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilter.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilter.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.servlet.http; @@ -30,6 +26,8 @@ /** * An event filter, similar to regular filters, performs filtering tasks on either * the request to a resource (an event driven Servlet), or on the response from a resource, or both. + * + * @author Remy Maucherat */ public interface HttpEventFilter extends Filter { Modified: branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilterChain.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilterChain.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventFilterChain.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.servlet.http; @@ -31,6 +27,8 @@ * giving a view into the invocation chain of a filtered event for a resource. Filters * use the HttpEventFilterChain to invoke the next filter in the chain, or if the calling filter * is the last filter in the chain, to invoke the resource at the end of the chain. + * + * @author Remy Maucherat */ public interface HttpEventFilterChain { Modified: branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventServlet.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventServlet.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/servlet/http/HttpEventServlet.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.servlet.http; @@ -33,6 +29,8 @@ * being able to output data without the need for being invoked by the container. * Note: When this interface is implemented, the service method of the Servlet will * never be called, and will be replaced with a begin event. + * + * @author Remy Maucherat */ public interface HttpEventServlet extends Servlet { Modified: branches/7.2.x/src/main/java/org/jboss/servlet/http/UpgradableHttpServletResponse.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/servlet/http/UpgradableHttpServletResponse.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/servlet/http/UpgradableHttpServletResponse.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.servlet.http; @@ -27,7 +23,7 @@ /** * Upgradable HTTP Servlet response. * - * @author remm + * @author Remy Maucherat */ public interface UpgradableHttpServletResponse { Modified: branches/7.2.x/src/main/java/org/jboss/web/CatalinaLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/CatalinaLogger.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -39,7 +35,7 @@ /** * Logging IDs 1000-2000 - * @author remm + * @author Remy Maucherat */ @MessageLogger(projectCode = "JBWEB") public interface CatalinaLogger extends BasicLogger { Modified: branches/7.2.x/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/CatalinaMessages.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -33,7 +29,7 @@ /** * Logging IDs 1-1000 - * @author remm + * @author Remy Maucherat */ @MessageBundle(projectCode = "JBWEB") public interface CatalinaMessages { Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -38,7 +34,7 @@ /** * Logging IDs 3000-4000 - * @author remm + * @author Remy Maucherat */ @MessageLogger(projectCode = "JBWEB") public interface CoyoteLogger extends BasicLogger { Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteMessages.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CoyoteMessages.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteMessages.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -31,7 +27,7 @@ /** * Logging IDs 2000-3000 - * @author remm + * @author Remy Maucherat */ @MessageBundle(projectCode = "JBWEB") public interface CoyoteMessages { Modified: branches/7.2.x/src/main/java/org/jboss/web/ELLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/ELLogger.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/ELLogger.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -35,7 +31,7 @@ /** * Logging IDs 6500-7000 - * @author remm + * @author Remy Maucherat */ @MessageLogger(projectCode = "JBWEB") public interface ELLogger extends BasicLogger { Modified: branches/7.2.x/src/main/java/org/jboss/web/ELMessages.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/ELMessages.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/ELMessages.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -29,7 +25,7 @@ /** * Logging IDs 6000-6500 - * @author remm + * @author Remy Maucherat */ @MessageBundle(projectCode = "JBWEB") public interface ELMessages { Modified: branches/7.2.x/src/main/java/org/jboss/web/JasperLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/JasperLogger.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/JasperLogger.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -36,7 +32,7 @@ /** * Logging IDs 5000-6000 - * @author remm + * @author Remy Maucherat */ @MessageLogger(projectCode = "JBWEB") public interface JasperLogger extends BasicLogger { Modified: branches/7.2.x/src/main/java/org/jboss/web/JasperMessages.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/JasperMessages.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/JasperMessages.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -31,7 +27,7 @@ /** * Logging IDs 4000-5000 - * @author remm + * @author Remy Maucherat */ @MessageBundle(projectCode = "JBWEB") public interface JasperMessages { Modified: branches/7.2.x/src/main/java/org/jboss/web/Version.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/Version.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/Version.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; Modified: branches/7.2.x/src/main/java/org/jboss/web/WebLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/WebLogger.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/WebLogger.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -35,7 +31,7 @@ /** * Logging IDs 7500-8000 - * @author remm + * @author Remy Maucherat */ @MessageLogger(projectCode = "JBWEB") public interface WebLogger extends BasicLogger { Modified: branches/7.2.x/src/main/java/org/jboss/web/WebMessages.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/WebMessages.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/WebMessages.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web; @@ -29,7 +25,7 @@ /** * Logging IDs 7000-7500 - * @author remm + * @author Remy Maucherat */ @MessageBundle(projectCode = "JBWEB") public interface WebMessages { Modified: branches/7.2.x/src/main/java/org/jboss/web/php/Constants.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/Constants.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/Constants.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/Handler.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/Handler.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/Handler.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/Highlight.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/Highlight.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/Highlight.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/Library.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/Library.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/Library.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/LifecycleListener.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/LifecycleListener.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/LifecycleListener.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/PhpThread.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/PhpThread.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/PhpThread.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,27 +1,21 @@ /* - * Copyright(c) 2007 Red Hat Middleware, LLC, - * and individual contributors as indicated by the @authors tag. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * 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 * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this library in the file COPYING.LIB; - * if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * @author Jean-Frederic Clere - * @version $Revision: 515 $, $Date: 2008-03-17 22:02:23 +0100 (Mon, 17 Mar 2008) $ + * 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.jboss.web.php; import java.lang.Thread; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/SAPI.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/SAPI.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/SAPI.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/php/ScriptEnvironment.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,23 +1,19 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.php; Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/Resolver.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/Resolver.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/Resolver.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,28 +1,27 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; +/** + * Resolver abstract class. + * @author Remy Maucherat + */ public abstract class Resolver { public abstract String resolve(String key); Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteCond.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteCond.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteCond.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,26 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; import java.util.Locale; @@ -28,6 +23,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * + * @author Remy Maucherat + */ public class RewriteCond { public abstract class Condition { Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteMap.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteMap.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteMap.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,28 +1,27 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; +/** + * + * @author Remy Maucherat + */ public interface RewriteMap { public String setParameters(String params); Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteRule.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteRule.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteRule.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,26 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; import java.util.ArrayList; @@ -28,6 +23,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * + * @author Remy Maucherat + */ public class RewriteRule { protected RewriteCond[] conditions = new RewriteCond[0]; Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/RewriteValve.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,26 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; import static org.jboss.web.WebMessages.MESSAGES; @@ -57,6 +52,10 @@ import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.net.URL; +/** + * + * @author Remy Maucherat + */ public class RewriteValve extends ValveBase implements Lifecycle { Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/Substitution.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/Substitution.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/Substitution.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,32 +1,31 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; import java.util.ArrayList; import java.util.Map; import java.util.regex.Matcher; +/** + * + * @author Remy Maucherat + */ public class Substitution { public abstract class SubstitutionElement { Modified: branches/7.2.x/src/main/java/org/jboss/web/rewrite/TomcatResolver.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/rewrite/TomcatResolver.java 2012-09-26 15:10:10 UTC (rev 2088) +++ branches/7.2.x/src/main/java/org/jboss/web/rewrite/TomcatResolver.java 2012-09-26 17:13:02 UTC (rev 2089) @@ -1,26 +1,21 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * JBoss, Home of Professional Open Source. + * Copyright 2012 Red Hat, Inc., and individual contributors + * as indicated by the @author tags. * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * 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 * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * 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.jboss.web.rewrite; import java.util.Calendar; @@ -31,6 +26,10 @@ import org.apache.naming.resources.ProxyDirContext; import org.apache.tomcat.util.http.FastHttpDateFormat; +/** + * + * @author Remy Maucherat + */ public class TomcatResolver extends Resolver { protected Request request = null; Added: branches/7.2.x/src/main/resources/org/apache/tomcat/jni/Library.properties =================================================================== --- branches/7.2.x/src/main/resources/org/apache/tomcat/jni/Library.properties (rev 0) +++ branches/7.2.x/src/main/resources/org/apache/tomcat/jni/Library.properties 2012-09-26 17:13:02 UTC (rev 2089) @@ -0,0 +1,56 @@ +# JBoss, Home of Professional Open Source. +# Copyright 2012 Red Hat, Inc., and individual contributors +# as indicated by the @author tags. +# +# 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. +# +# +# @author Mladen Turk +# @author Jean-Frederic Clere +# +# Library.properties +# +windows.count=5 +windows.0=?*tcnative-1 +windows.1=?libapr-1 +windows.2=?libeay32 +windows.3=?ssleay32 +windows.4=libtcnative-1 + +linux2.count=5 +linux2.0=apr-1 +linux2.1=?z +linux2.2=?crypto +linux2.3=?ssl +linux2.4=tcnative-1 + +solaris.count=5 +solaris.0=apr-1 +solaris.1=?z +solaris.2=?crypto +solaris.3=?ssl +solaris.4=tcnative-1 + +hpux.count=5 +hpux.0=apr-1 +hpux.1=?z +hpux.2=?crypto +hpux.3=?ssl +hpux.4=tcnative-1 + +macosx.count=5 +macosx.0=apr-1 +macosx.1=?z +macosx.2=?crypto +macosx.3=?ssl +macosx.4=tcnative-1