Author: craigmcc
Date: Wed Jun 20 20:15:58 2007
New Revision: 549340
URL: http://svn.apache.org/viewvc?view=rev&rev=549340
Log:
Update to appropriately licensed versions of the JSF configuration DTDs.
Modified:
shale/framework/trunk/shale-tiger/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_0.dtd
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_1.dtd
Modified:
shale/framework/trunk/shale-tiger/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiger/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=549340&r1=549339&r2=549340
==============================================================================
--- shale/framework/trunk/shale-tiger/src/main/resources/META-INF/NOTICE.txt
(original)
+++ shale/framework/trunk/shale-tiger/src/main/resources/META-INF/NOTICE.txt
Wed Jun 20 20:15:58 2007
@@ -7,3 +7,5 @@
This product contains code written by David Geary and Cay Horstmann
for the first edition of Core JavaServer Faces.
+This product contains software written by Sun Microsystems, Inc.,
+and licensed under the CDDL license.
Modified:
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_0.dtd
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_0.dtd?view=diff&rev=549340&r1=549339&r2=549340
==============================================================================
---
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_0.dtd
(original)
+++
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_0.dtd
Wed Jun 20 20:15:58 2007
@@ -1,6 +1,37 @@
<!--
- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can obtain
+ a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ Sun designates this particular file as subject to the "Classpath" exception
+ as provided by Sun in the GPL Version 2 section of the License file that
+ accompanied this code. If applicable, add the following below the License
+ Header, with the fields enclosed by brackets [] replaced by your own
+ identifying information: "Portions Copyrighted [year]
+ [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
-->
<!--
@@ -13,7 +44,7 @@
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd";>
- $Id: web-facesconfig_1_0.dtd 166395 2004-03-04 18:35:20Z manolito $
+ $Id: web-facesconfig_1_0.dtd,v 1.34 2007/06/19 18:17:20 rogerk Exp $
-->
Modified:
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_1.dtd
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_1.dtd?view=diff&rev=549340&r1=549339&r2=549340
==============================================================================
---
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_1.dtd
(original)
+++
shale/framework/trunk/shale-tiger/src/main/resources/org/apache/shale/tiger/resources/web-facesconfig_1_1.dtd
Wed Jun 20 20:15:58 2007
@@ -1,6 +1,37 @@
<!--
- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can obtain
+ a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in each
+ file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ Sun designates this particular file as subject to the "Classpath" exception
+ as provided by Sun in the GPL Version 2 section of the License file that
+ accompanied this code. If applicable, add the following below the License
+ Header, with the fields enclosed by brackets [] replaced by your own
+ identifying information: "Portions Copyrighted [year]
+ [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or GPL
+ Version 2] license." If you don't indicate a single choice of license, a
+ recipient has the option to distribute your version of this file under
+ either the CDDL, the GPL Version 2 or to extend the choice of license to
+ its licensees as provided above. However, if you add GPL Version 2 code
+ and therefore, elected the GPL Version 2 license, then the option applies
+ only if the new code is made subject to such option by the copyright
+ holder.
-->
<!--
@@ -13,7 +44,7 @@
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd";>
- $Id: web-facesconfig_1_1.dtd 166875 2004-06-04 23:51:48Z o_rossmueller $
+ $Id: web-facesconfig_1_1.dtd,v 1.6 2007/06/19 18:17:20 rogerk Exp $
-->
