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/24 09:42:04 UTC
cvs commit: jakarta-tomcat-connectors/jk/tools/reports tomcat_trend.pl tomcat_reports.pl
hgomez 2004/02/24 00:42:04
Modified: jk/tools/reports tomcat_trend.pl tomcat_reports.pl
Log:
Update to Apache License 2.0
Revision Changes Path
1.8 +18 -59 jakarta-tomcat-connectors/jk/tools/reports/tomcat_trend.pl
Index: tomcat_trend.pl
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/reports/tomcat_trend.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tomcat_trend.pl 5 Nov 2003 09:14:40 -0000 1.7
+++ tomcat_trend.pl 24 Feb 2004 08:42:04 -0000 1.8
@@ -1,61 +1,20 @@
#!/usr/local/bin/perl
-# =========================================================================
-#
-# 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.
+#
# $Header$
# $Revision$
1.4 +15 -56 jakarta-tomcat-connectors/jk/tools/reports/tomcat_reports.pl
Index: tomcat_reports.pl
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/tools/reports/tomcat_reports.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat_reports.pl 5 Nov 2003 09:14:40 -0000 1.3
+++ tomcat_reports.pl 24 Feb 2004 08:42:04 -0000 1.4
@@ -1,61 +1,20 @@
#!/usr/local/bin/perl
-# =========================================================================
#
-# The Apache Software License, Version 1.1
+# Copyright 1999-2004 The Apache Software Foundation
#
-# Copyright (c) 1999-2003 The Apache Software Foundation.
-# All rights reserved.
+# 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.
#
-# =========================================================================
-#
-# 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/>.
-#
-# =========================================================================
# $Header$
# $Revision$
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org