You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2004/02/23 00:13:32 UTC
cvs commit: jakarta-tomcat/src/examples/jsp/colors ColorGameBean.html clr.html colors.html colors.txt colrs.jsp
billbarker 2004/02/22 15:13:32
Modified: src/examples/jsp/colors ColorGameBean.html clr.html
colors.html colors.txt colrs.jsp
Log:
Updating to the Apache License v2.0.
Revision Changes Path
1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html
Index: ColorGameBean.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ColorGameBean.html 20 Oct 1999 23:17:14 -0000 1.2
+++ ColorGameBean.html 22 Feb 2004 23:13:32 -0000 1.3
@@ -1,7 +1,18 @@
<HTML>
-<!--
- Copyright (c) 1999 The Apache Software Foundation. All rights
- reserved.
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<HEAD>
1.4 +14 -3 jakarta-tomcat/src/examples/jsp/colors/clr.html
Index: clr.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/clr.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clr.html 10 Mar 2001 03:00:54 -0000 1.3
+++ clr.html 22 Feb 2004 23:13:32 -0000 1.4
@@ -1,7 +1,18 @@
<html>
-<!--
- Copyright (c) 1999 The Apache Software Foundation. All rights
- reserved.
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<head>
1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.html
Index: colors.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colors.html 20 Oct 1999 23:17:18 -0000 1.2
+++ colors.html 22 Feb 2004 23:13:32 -0000 1.3
@@ -1,7 +1,18 @@
<html>
-<!--
- Copyright (c) 1999 The Apache Software Foundation. All rights
- reserved.
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<body bgcolor= white>
1.3 +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.txt
Index: colors.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colors.txt 20 Oct 1999 23:17:19 -0000 1.2
+++ colors.txt 22 Feb 2004 23:13:32 -0000 1.3
@@ -1,7 +1,18 @@
<html>
-<!--
- Copyright (c) 1999 The Apache Software Foundation. All rights
- reserved.
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<jsp:useBean id="cb" scope="session" class="colors.ColorGameBean" />
1.3 +14 -59 jakarta-tomcat/src/examples/jsp/colors/colrs.jsp
Index: colrs.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colrs.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colrs.jsp 8 Feb 2000 18:25:32 -0000 1.2
+++ colrs.jsp 22 Feb 2004 23:13:32 -0000 1.3
@@ -1,63 +1,18 @@
<html>
-<!--
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@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 Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * [Additional notices, if required by prior licensing conditions]
- *
- */
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<jsp:useBean id="cb" scope="session" class="colors.ColorGameBean" />
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org