You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2004/02/27 17:07:39 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/iis isapi_install.vbs
hgomez 2004/02/27 08:07:39
Modified: webapp Makedefs.in LICENSE.txt Makefile.win Makefile.in
configure.in build.properties.in
jk/native2 configure.in
webapp/apache-2.0 Makefile.in
webapp/apache-1.3 Makefile.in Makefile.win
jk/native/iis isapi_install.vbs
Log:
Should end the work on migrating to Apache License 2.0
Revision Changes Path
1.23 +16 -57 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makedefs.in 30 Aug 2002 14:15:06 -0000 1.22
+++ Makedefs.in 27 Feb 2004 16:07:38 -0000 1.23
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.3 +203 -57 jakarta-tomcat-connectors/webapp/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE.txt 24 Dec 2003 19:52:37 -0000 1.2
+++ LICENSE.txt 27 Feb 2004 16:07:38 -0000 1.3
@@ -1,58 +1,204 @@
-+---------------------------------------------------------------------------+
-| |
-| The Apache Software License, Version 1.1 |
-| |
-| Copyright (c) 1999-2001 The Apache Software Foundation. |
-| All rights reserved. |
-| |
-+---------------------------------------------------------------------------+
-| |
-| Redistribution and use in source and binary forms, with or without modi- |
-| fication, are permitted provided that the following conditions are met: |
-| |
-| 1. Redistributions of source code must retain the above copyright notice, |
-| this list of conditions and the following disclaimer. |
-| |
-| 2. Redistributions in binary form must reproduce the above copyright |
-| notice, this list of conditions and the following disclaimer in the |
-| documentation and/or other materials provided with the distribution. |
-| |
-| 3. The end-user documentation included with the redistribution, if any, |
-| must include the following acknowlegement: |
-| |
-| "This product includes software developed by the Apache Software |
-| Foundation <http://www.apache.org/>." |
-| |
-| Alternately, this acknowlegement may appear in the software itself, if |
-| and wherever such third-party acknowlegements normally appear. |
-| |
-| 4. The names "The Jakarta Project", "WebApp", and "Apache Software |
-| Foundation" must not be used to endorse or promote products derived |
-| from this software without prior written permission. For written |
-| permission, please contact <ap...@apache.org>. |
-| |
-| 5. Products derived from this software may not be called "Apache" nor may |
-| "Apache" appear in their names without prior written permission of the |
-| Apache Software Foundation. |
-| |
-| THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES |
-| INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY |
-| AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL |
-| THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
-| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
-| OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
-| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
-| STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
-| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
-| POSSIBILITY OF SUCH DAMAGE. |
-| |
-+---------------------------------------------------------------------------+
-| |
-| This software consists of voluntary contributions made by many indivi- |
-| duals on behalf of the Apache Software Foundation. For more information |
-| on the Apache Software Foundation, please see <http://www.apache.org/>. |
-| |
-+---------------------------------------------------------------------------+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "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.
+
+ "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).
+
+ "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.
+
+ "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."
+
+ "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. 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.
+
+ 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.
+
+ 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:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (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
+
+ (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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ 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.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
CVS Revision $Id$
1.6 +16 -57 jakarta-tomcat-connectors/webapp/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.win,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.win 1 Nov 2001 22:20:51 -0000 1.5
+++ Makefile.win 27 Feb 2004 16:07:38 -0000 1.6
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.38 +16 -57 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.in 30 Aug 2002 14:15:06 -0000 1.37
+++ Makefile.in 27 Feb 2004 16:07:38 -0000 1.38
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.64 +13 -54 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- configure.in 30 Aug 2002 14:15:06 -0000 1.63
+++ configure.in 27 Feb 2004 16:07:38 -0000 1.64
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2001 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "Apache WebApp Module", and "Apache
-dnl Software Foundation" must not be used to endorse or promote products
-dnl derived from this software without prior written permission. For
-dnl written permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@betaversion.org>
1.2 +15 -56 jakarta-tomcat-connectors/webapp/build.properties.in
Index: build.properties.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.properties.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.in 13 May 2002 23:23:58 -0000 1.1
+++ build.properties.in 27 Feb 2004 16:07:38 -0000 1.2
@@ -1,59 +1,18 @@
-# --------------------------------------------------------------------------- #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# --------------------------------------------------------------------------- #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# --------------------------------------------------------------------------- #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# --------------------------------------------------------------------------- #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# The full path of the sources directory
# (defaults to the directory where build.xml resides)
1.21 +14 -55 jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in 12 Feb 2004 09:15:11 -0000 1.20
+++ configure.in 27 Feb 2004 16:07:39 -0000 1.21
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2003 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "Apache WebApp Module", and "Apache
-dnl Software Foundation" must not be used to endorse or promote products
-dnl derived from this software without prior written permission. For
-dnl written permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl --------------------------------------------------------------------------
dnl Author Henri Gomez <hg...@apache.org>
1.9 +16 -57 jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 3 May 2002 18:05:25 -0000 1.8
+++ Makefile.in 27 Feb 2004 16:07:39 -0000 1.9
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.30 +16 -57 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in 30 Aug 2002 14:15:06 -0000 1.29
+++ Makefile.in 27 Feb 2004 16:07:39 -0000 1.30
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.4 +16 -57 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.win,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.win 1 Nov 2001 22:20:51 -0000 1.3
+++ Makefile.win 27 Feb 2004 16:07:39 -0000 1.4
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# notice, this list of conditions and the following disclaimer. #
-# #
-# 2. Redistributions in binary form must reproduce the above copyright #
-# notice, this list of conditions and the following disclaimer in the #
-# documentation and/or other materials provided with the distribution. #
-# #
-# 3. The end-user documentation included with the redistribution, if any, #
-# must include the following acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", and "Apache Software #
-# Foundation" must not be used to endorse or promote products derived #
-# from this software without prior written permission. For written #
-# permission, please contact <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names without prior written permission of the #
-# Apache Software Foundation. #
-# #
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL #
-# THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY #
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS #
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) #
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, #
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #
-# POSSIBILITY OF SUCH DAMAGE. #
-# #
-# ========================================================================= #
-# #
-# This software consists of voluntary contributions made by many indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# @author Pier Fumagalli <ma...@betaversion.org>
# @version $Id$
1.4 +16 -57 jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs
Index: isapi_install.vbs
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- isapi_install.vbs 5 Nov 2003 09:15:41 -0000 1.3
+++ isapi_install.vbs 27 Feb 2004 16:07:39 -0000 1.4
@@ -1,59 +1,18 @@
-' =========================================================================
-'
-' The Apache Software License, Version 1.1
-'
-' Copyright (c) 1999-2003 The Apache Software Foundation.
-' All rights reserved.
-'
-' =========================================================================
-'
-' Redistribution and use in source and binary forms, with or without modi-
-' fication, are permitted provided that the following conditions are met:
-'
-' 1. Redistributions of source code must retain the above copyright notice
-' notice, this list of conditions and the following disclaimer.
-'
-' 2. Redistributions in binary form must reproduce the above copyright
-' notice, this list of conditions and the following disclaimer in the
-' documentation and/or other materials provided with the distribution.
-'
-' 3. The end-user documentation included with the redistribution, if any,
-' must include the following acknowlegement:
-'
-' "This product includes software developed by the Apache Software
-' Foundation <http://www.apache.org/>."
-'
-' Alternately, this acknowlegement may appear in the software itself, if
-' and wherever such third-party acknowlegements normally appear.
-'
-' 4. The names "The Jakarta Project", "Jk", and "Apache Software
-' Foundation" must not be used to endorse or promote products derived
-' from this software without prior written permission. For written
-' permission, please contact <ap...@apache.org>.
-'
-' 5. Products derived from this software may not be called "Apache" nor may
-' "Apache" appear in their names without prior written permission of the
-' Apache Software Foundation.
-'
-' THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-' INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-' AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-' THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-' DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-' DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-' OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-' HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-' STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-' ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-' POSSIBILITY OF SUCH DAMAGE.
-'
-' =========================================================================
-'
-' This software consists of voluntary contributions made by many indivi-
-' duals on behalf of the Apache Software Foundation. For more information
-' on the Apache Software Foundation, please see <http://www.apache.org/>.
-'
-' =========================================================================
+'
+' Copyright 1999-2004 The Apache Software Foundation
+'
+' Licensed under the Apache License, Version 2.0 (the "License");
+' you may not use this file except in compliance with the License.
+' You may obtain a copy of the License at
+'
+' http://www.apache.org/licenses/LICENSE-2.0
+'
+' Unless required by applicable law or agreed to in writing, software
+' distributed under the License is distributed on an "AS IS" BASIS,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+' See the License for the specific language governing permissions and
+' limitations under the License.
+'
' =========================================================================
' Description: Install script for Tomcat ISAPI redirector
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org