You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/09/02 23:37:52 UTC
svn commit: r810705 - in /openjpa/branches/1.3.x: ./
openjpa-all/src/main/appended-resources/META-INF/
openjpa-persistence/src/main/appended-resources/META-INF/
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/
openjpa/src/main/app...
Author: dwoods
Date: Wed Sep 2 21:37:52 2009
New Revision: 810705
URL: http://svn.apache.org/viewvc?rev=810705&view=rev
Log:
OPENJPA-1284 Fix missing 1.0 schema license headers and update NOTICE files with license header required wording
Modified:
openjpa/branches/1.3.x/NOTICE.txt
openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm-xsd.rsrc
openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence-xsd.rsrc
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
Modified: openjpa/branches/1.3.x/NOTICE.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/NOTICE.txt?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/NOTICE.txt (original)
+++ openjpa/branches/1.3.x/NOTICE.txt Wed Sep 2 21:37:52 2009
@@ -7,16 +7,21 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-COPYRIGHT NOTICES
-* OpenJPA includes software developed by the SERP project
- Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+COPYRIGHT NOTICES
-* OpenJPA is bundled with the schemas from the JPA specification, by
- Sun Microsystems and licensed under the CDDL 1.0. The source code is
- available at: https://glassfish.dev.java.net/source/browse/glassfish/
+ OpenJPA includes software developed by the SERP project
+ Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-* OpenJPA includes software written by Miroslav Nachev
+ OpenJPA includes the persistence and orm schemas from the JPA specification.
+ Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+ OpenJPA elects to include this software in this distribution under the
+ CDDL license.
+ You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+ The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
-* OpenJPA uses test code written by Charles Tillman.
+ OpenJPA includes software written by Miroslav Nachev
+ OpenJPA uses test code written by Charles Tillman.
Modified: openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm Wed Sep 2 21:37:52 2009
@@ -1,19 +1,25 @@
-* openjpa-all includes software developed by the:
- Apache Commons Collections project
- Apache Commons Lang project
- Apache Commons Logging project
- Apache Commons Pool project
- Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 1.0 spec apis)
- SERP project
-
-* OpenJPA includes software developed by the SERP project
- Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
-* OpenJPA is bundled with the schemas from the JPA specification, by
- Sun Microsystems and licensed under the CDDL 1.0. The source code is
- available at: https://glassfish.dev.java.net/source/browse/glassfish/
-* OpenJPA includes software written by Miroslav Nachev
+ openjpa-all includes software developed by the:
+ Apache Commons Collections project
+ Apache Commons Lang project
+ Apache Commons Logging project
+ Apache Commons Pool project
+ Apache Geronimo project (JMS 1.1, JTA 1.1, JPA 2.0 and Bean Validation 1.0 spec apis)
+ SERP project
-* OpenJPA uses test code written by Charles Tillman.
+ OpenJPA includes software developed by the SERP project
+ Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+
+ OpenJPA includes the persistence and orm schemas from the JPA specification.
+ Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+ OpenJPA elects to include this software in this distribution under the
+ CDDL license.
+ You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+ The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
+
+ OpenJPA includes software written by Miroslav Nachev
+
+ OpenJPA uses test code written by Charles Tillman.
Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm Wed Sep 2 21:37:52 2009
@@ -1,5 +1,10 @@
-* OpenJPA is bundled with the schemas from the JPA specification, by
- Sun Microsystems and licensed under the CDDL 1.0. The source code is
- available at: https://glassfish.dev.java.net/source/browse/glassfish/
+ OpenJPA includes the persistence and orm schemas from the JPA specification.
+ Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+ OpenJPA elects to include this software in this distribution under the
+ CDDL license.
+ You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+ The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm-xsd.rsrc
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm-xsd.rsrc?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm-xsd.rsrc (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm-xsd.rsrc Wed Sep 2 21:37:52 2009
@@ -12,6 +12,51 @@
@(#)orm_1_0.xsd 1.0 Feb 14 2006
</xsd:documentation>
</xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2005-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.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
<xsd:annotation>
<xsd:documentation><![CDATA[
Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence-xsd.rsrc
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence-xsd.rsrc?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence-xsd.rsrc (original)
+++ openjpa/branches/1.3.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence-xsd.rsrc Wed Sep 2 21:37:52 2009
@@ -12,6 +12,51 @@
@(#)persistence_1_0.xsd 1.0 Feb 9 2006
</xsd:documentation>
</xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2005-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.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
<xsd:annotation>
<xsd:documentation><![CDATA[
Modified: openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm?rev=810705&r1=810704&r2=810705&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm Wed Sep 2 21:37:52 2009
@@ -1,12 +1,17 @@
-* OpenJPA includes software developed by the SERP project
- Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+ OpenJPA includes software developed by the SERP project
+ Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-* OpenJPA is bundled with the schemas from the JPA specification, by
- Sun Microsystems and licensed under the CDDL 1.0. The source code is
- available at: https://glassfish.dev.java.net/source/browse/glassfish/
+ OpenJPA includes the persistence and orm schemas from the JPA specification.
+ Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+ OpenJPA elects to include this software in this distribution under the
+ CDDL license.
+ You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+ The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
-* OpenJPA includes software written by Miroslav Nachev
+ OpenJPA includes software written by Miroslav Nachev
-* OpenJPA uses test code written by Charles Tillman.
+ OpenJPA uses test code written by Charles Tillman.