You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/07/15 22:56:15 UTC
svn commit: r964581 - in /myfaces/portlet-bridge/core/tags/2.0.0-beta: ./
api/src/main/resources/META-INF/ assembly/src/main/resources/META-INF/
examples/assembly/src/main/resources/META-INF/
examples/guessNumberMojarraWrapper/src/main/java/guessNumber...
Author: mfreedman
Date: Thu Jul 15 20:56:15 2010
New Revision: 964581
URL: http://svn.apache.org/viewvc?rev=964581&view=rev
Log:
Fixed up Copyright statements and some NOTICE files -- there were a few stale Sun copyrights and a few stale NOTICE refs to early draft review.
Modified:
myfaces/portlet-bridge/core/tags/2.0.0-beta/NOTICE
myfaces/portlet-bridge/core/tags/2.0.0-beta/api/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/2.0.0-beta/assembly/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/assembly/src/main/resources/META-INF/NOTICE
myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/MessageFactory.java
myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/UserNumberBean.java
myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraResponseWrapper.java
myfaces/portlet-bridge/core/tags/2.0.0-beta/impl/src/main/resources/META-INF/NOTICE
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/NOTICE?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/NOTICE Thu Jul 15 20:56:15 2010
@@ -1,7 +1,7 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
-This is an implementation of an early draft specification
+This is an implementation of a public review specification
developed under the Java Community Process (JCP). This
implementation may not fully conform to this specification.
This implementation may differ from the final specification.
@@ -10,7 +10,7 @@ The code is not compatible with any spec
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Portions of this software are Copyright (c) 2007 Oracle
+Portions of this software are Copyright (c) 2005, 2007, Oracle
Corporation, <http://www.oracle.com/> and are licensed to
the Apache Software Foundation under the "Software Grant
and Corporate Contribution License Agreement"
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/api/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/api/src/main/resources/META-INF/NOTICE?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/api/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/api/src/main/resources/META-INF/NOTICE Thu Jul 15 20:56:15 2010
@@ -1,7 +1,7 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
-This is an implementation of an early draft specification
+This is an implementation of a public review specification
developed under the Java Community Process (JCP). This
implementation may not fully conform to this specification.
This implementation may differ from the final specification.
@@ -10,7 +10,7 @@ The code is not compatible with any spec
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Portions of this software are Copyright (c) 2007 Oracle
+Portions of this software are Copyright (c) 2007, Oracle
Corporation, <http://www.oracle.com/> and are licensed to
the Apache Software Foundation under the "Software Grant
and Corporate Contribution License Agreement"
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/assembly/src/main/resources/META-INF/NOTICE?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/assembly/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/assembly/src/main/resources/META-INF/NOTICE Thu Jul 15 20:56:15 2010
@@ -1,7 +1,7 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
-This is an implementation of an early draft specification
+This is an implementation of a public review specification
developed under the Java Community Process (JCP). This
implementation may not fully conform to this specification.
This implementation may differ from the final specification.
@@ -10,7 +10,7 @@ The code is not compatible with any spec
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Portions of this software are Copyright (c) 2007 Oracle
+Portions of this software are Copyright (c) 2005, 2007, Oracle
Corporation, <http://www.oracle.com/> and are licensed to
the Apache Software Foundation under the "Software Grant
and Corporate Contribution License Agreement"
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/assembly/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/assembly/src/main/resources/META-INF/NOTICE?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/assembly/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/assembly/src/main/resources/META-INF/NOTICE Thu Jul 15 20:56:15 2010
@@ -1,7 +1,7 @@
Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
-This is an implementation of an early draft specification
+This is an implementation of a public review specification
developed under the Java Community Process (JCP). This
implementation may not fully conform to this specification.
This implementation may differ from the final specification.
@@ -10,7 +10,7 @@ The code is not compatible with any spec
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Portions of this software are Copyright (c) 2007 Oracle
+Portions of this software are Copyright (c) 2005, 2007, Oracle
Corporation, <http://www.oracle.com/> and are licensed to
the Apache Software Foundation under the "Software Grant
and Corporate Contribution License Agreement"
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/MessageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/MessageFactory.java?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/MessageFactory.java (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/MessageFactory.java Thu Jul 15 20:56:15 2010
@@ -1,32 +1,22 @@
-/*
- * $Id: MessageFactory.java,v 1.6 2005/12/14 22:27:25 rlubke Exp $
+/* 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.
+ *
*/
-/*
-* The contents of this file are subject to the terms
-* of the Common Development and Distribution License
-* (the License). You may not use this file except in
-* compliance with the License.
-*
-* You can obtain a copy of the License at
-* https://javaserverfaces.dev.java.net/CDDL.html or
-* legal/CDDLv1.0.txt.
-* See the License for the specific language governing
-* permission and limitations under the License.
-*
-* When distributing Covered Code, include this CDDL
-* Header Notice in each file and include the License file
-* at legal/CDDLv1.0.txt.
-* If applicable, add the following below the CDDL Header,
-* with the fields enclosed by brackets [] replaced by
-* your own identifying information:
-* "Portions Copyrighted [year] [name of copyright owner]"
-*
-* [Name of File] [ver.__] [Date]
-*
-* Copyright 2005 Sun Microsystems Inc. All Rights Reserved
-*/
-
package guessNumber;
import javax.el.ValueExpression;
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/UserNumberBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/UserNumberBean.java?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/UserNumberBean.java (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/guessNumber/UserNumberBean.java Thu Jul 15 20:56:15 2010
@@ -1,26 +1,20 @@
-/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt.
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * [Name of File] [ver.__] [Date]
- *
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+/* 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.
+ *
*/
package guessNumber;
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraResponseWrapper.java?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraResponseWrapper.java (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/examples/guessNumberMojarraWrapper/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMojarraResponseWrapper.java Thu Jul 15 20:56:15 2010
@@ -1,3 +1,22 @@
+/* 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.
+ *
+ */
+
package org.apache.myfaces.portlet.faces.application;
import com.sun.faces.application.InterweavingResponse;
Modified: myfaces/portlet-bridge/core/tags/2.0.0-beta/impl/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/2.0.0-beta/impl/src/main/resources/META-INF/NOTICE?rev=964581&r1=964580&r2=964581&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/2.0.0-beta/impl/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/tags/2.0.0-beta/impl/src/main/resources/META-INF/NOTICE Thu Jul 15 20:56:15 2010
@@ -1,7 +1,7 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
-This is an implementation of an early draft specification
+This is an implementation of a public review specification
developed under the Java Community Process (JCP). This
implementation may not fully conform to this specification.
This implementation may differ from the final specification.
@@ -10,7 +10,7 @@ The code is not compatible with any spec
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Portions of this software are Copyright (c) 2007 Oracle
+Portions of this software are Copyright (c) 2007, Oracle
Corporation, <http://www.oracle.com/> and are licensed to
the Apache Software Foundation under the "Software Grant
and Corporate Contribution License Agreement"