Author: dwoods
Date: Thu Oct 1 15:19:10 2009
New Revision: 820684
URL: http://svn.apache.org/viewvc?rev=820684&view=rev
Log:
OPENJPA-1229 Update NOTICE files to match new ASF/Sun agreement for releasing
early access specs. Also point to new geronimo-staging-017 to pickup latest
spec releases under vote with updated notices.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
(with props)
Modified:
openjpa/trunk/NOTICE.txt
openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/trunk/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/trunk/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/trunk/openjpa-project/NOTICE.txt
openjpa/trunk/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/trunk/pom.xml
Modified: openjpa/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/openjpa/trunk/NOTICE.txt?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/NOTICE.txt (original)
+++ openjpa/trunk/NOTICE.txt Thu Oct 1 15:19:10 2009
@@ -1,31 +1,29 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache OpenJPA distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- This is an implementation of an early-draft specification developed under
the
- Java Community Process (JCP) and is made available for testing and
evaluation
- purposes only. The code is not compatible with any specification of the JCP.
+================================================================================
+== NOTICE file corresponding to the section 4 d of
==
+== the Apache License, Version 2.0,
==
+== in this case for the Apache OpenJPA distribution.
==
+================================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
COPYRIGHT NOTICES
- 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 includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 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 the persistence and orm schemas from the JPA
specifications.
- 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.
Modified:
openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
Thu Oct 1 15:19:10 2009
@@ -1,27 +1,26 @@
- This is an implementation of an early-draft specification developed under
the Java Community Process (JCP) and is made available for testing and
evaluation purposes only. The code is not compatible with any specification
of the JCP.
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
- 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 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
specifications.
- 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-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 2.0 spec apis)
+ SERP project
+
+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 specifications.
+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.
Modified:
openjpa/trunk/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
Thu Oct 1 15:19:10 2009
@@ -1,3 +1,5 @@
-* openjpa-kernel includes software written by Miroslav Nachev
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
+
+openjpa-kernel includes software written by Miroslav Nachev
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm?rev=820684&view=auto
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
(added)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
Thu Oct 1 15:19:10 2009
@@ -0,0 +1,3 @@
+
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
+
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/main/appended-resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/trunk/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
Thu Oct 1 15:19:10 2009
@@ -1,11 +1,11 @@
- This is an implementation of an early-draft specification developed under
the Java Community Process (JCP) and is made available for testing and
evaluation purposes only. The code is not compatible with any specification
of the JCP.
- OpenJPA includes the persistence and orm schemas from the JPA
specifications.
- 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/
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
+
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 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/trunk/openjpa-project/NOTICE.txt
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/NOTICE.txt?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/NOTICE.txt (original)
+++ openjpa/trunk/openjpa-project/NOTICE.txt Thu Oct 1 15:19:10 2009
@@ -1,26 +1,29 @@
-OpenJPA Aggregate Jar with Dependencies - Early Access 2
+OpenJPA Aggregate Jar with Dependencies
Copyright 2006-2009 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This is an implementation of an early-draft specification developed under the
Java Community Process (JCP) and is made available for testing and evaluation
purposes only. The code is not compatible with any specification of the JCP.
-
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
The OpenJPA binary assembly includes software developed by the:
- Apache Commons Collections project
- Apache Commons Lang project
- Apache Commons Pool project
- Apache Derby project
- Apache Geronimo project (JMS 1.1, JTA 1.1, JPA 2.0 and Bean Validation
1.0 spec apis)
- SERP project
+ Apache Commons Collections project
+ Apache Commons Lang project
+ Apache Commons Pool project
+ Apache Derby project
+ Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec apis)
+ SERP project
OpenJPA includes software developed by the SERP project
- Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+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 specifications.
+Copyright 2005-2009 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.
Modified: openjpa/trunk/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa/src/main/appended-resources/META-INF/NOTICE.vm?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ openjpa/trunk/openjpa/src/main/appended-resources/META-INF/NOTICE.vm Thu
Oct 1 15:19:10 2009
@@ -1,18 +1,18 @@
- This is an implementation of an early-draft specification developed under
the Java Community Process (JCP) and is made available for testing and
evaluation purposes only. The code is not compatible with any specification
of the JCP.
- OpenJPA includes software developed by the SERP project
- Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+This is an implementation of an early-draft specification developed under the
Java Community Process (JCP). The code is untested and presumed not to be a
compatible implementation of the JSR-317 Java Persistence API, Version 2.0
specification. We encourage you to migrate to an implementation of the JSR-317
Java Persistence API, Version 2.0 specification that has been tested and
verified to be compatible as soon as such an implementation is available, and
we encourage you to retain this notice in any implementation of JSR-317 Java
Persistence API, Version 2.0 specification that you distribute.
- OpenJPA includes the persistence and orm schemas from the JPA
specifications.
- 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 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 specifications.
+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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=820684&r1=820683&r2=820684&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Thu Oct 1 15:19:10 2009
@@ -34,7 +34,7 @@
<artifactId>openjpa-parent</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Parent POM</name>
- <description>OpenJPA</description>
+ <description>Apache OpenJPA implementation of JSR-317 JPA 2.0</description>
<properties>
<openjpa.version>${pom.version}</openjpa.version>
@@ -852,7 +852,7 @@
<repositories>
<repository>
<id>geronimo-staging</id>
-
<url>https://repository.apache.org/content/repositories/geronimo-staging-015/</url>
+
<url>https://repository.apache.org/content/repositories/geronimo-staging-017/</url>
<releases>
<checksumPolicy>fail</checksumPolicy>
<enabled>true</enabled>
