[maven-release-plugin] copy for tag 2.2.2
git-svn-id: https://svn.apache.org/repos/asf/openjpa/tags/2.2.2@1468616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE b/LICENSE
index be28be3..567900d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -516,3 +516,68 @@
Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.
+
+
+
+serp-1.13.1.jar - BSD License
+=============================
+
+Copyright (c) 2002, A. Abram White
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+* 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.
+* Neither the name of 'serp' nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+
+
+asm-3.2.jar - License
+=====================
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+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. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 73fcbf8..a0d9c68 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -150,10 +150,5 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
</dependencies>
</project>
diff --git a/openjpa-examples/openbooks/build.properties b/openjpa-examples/openbooks/build.properties
index 6af5df7..0cb4863 100644
--- a/openjpa-examples/openbooks/build.properties
+++ b/openjpa-examples/openbooks/build.properties
@@ -21,7 +21,7 @@
# Directory location of maven repository
maven.repos=${user.home}/.m2/repository
# OpenJPA runtime artifact
-openjpa.version=2.2.1-SNAPSHOT
+openjpa.version=2.2.2-SNAPSHOT
# This is the variable of interest.
# Notice that the variable points to a directory, not a *.jar file.
diff --git a/openjpa-examples/openbooks/run.properties b/openjpa-examples/openbooks/run.properties
index 7a257cb..394d005 100644
--- a/openjpa-examples/openbooks/run.properties
+++ b/openjpa-examples/openbooks/run.properties
@@ -21,7 +21,7 @@
# Directory location of maven repository
maven.repos=${user.home}/.m2/repository
# OpenJPA runtime artifact
-openjpa.version=2.2.1-SNAPSHOT
+openjpa.version=2.2.2-SNAPSHOT
openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
# Other depends
# MySQL
diff --git a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
index 007c176..e634dd7 100644
--- a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
+++ b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.liberty.xml
@@ -19,7 +19,9 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="OpenBooks">
<jta-data-source>java:comp/env/jdbc/OpenBooks</jta-data-source>
<non-jta-data-source>java:comp/env/jdbc/NonTxOpenBooks</non-jta-data-source>
@@ -31,6 +33,8 @@
<class>openbook.domain.Customer</class>
<class>openbook.domain.Author</class>
+ <validation-mode>NONE</validation-mode>
+
<properties>
<property name="openjpa.DataCache" value="true"/>
<property name="openjpa.RemoteCommitProvider" value="sjvm"/>
diff --git a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
index f08cb1f..05c56a1 100644
--- a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
+++ b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.jee.was.xml
@@ -19,28 +19,32 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="OpenBooks">
- <jta-data-source>jdbc/OpenBooks</jta-data-source>
- <non-jta-data-source>jdbc/NonTxOpenBooks</non-jta-data-source>
+ <jta-data-source>jdbc/OpenBooks</jta-data-source>
+ <non-jta-data-source>jdbc/NonTxOpenBooks</non-jta-data-source>
- <class>openbook.domain.Book</class>
- <class>openbook.domain.Inventory</class>
- <class>openbook.domain.PurchaseOrder</class>
- <class>openbook.domain.LineItem</class>
- <class>openbook.domain.Customer</class>
- <class>openbook.domain.Author</class>
-
- <properties>
- <property name="openjpa.DataCache" value="true"/>
- <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
- <property name="openjpa.DynamicEnhancementAgent" value="false"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+ <class>openbook.domain.Book</class>
+ <class>openbook.domain.Inventory</class>
+ <class>openbook.domain.PurchaseOrder</class>
+ <class>openbook.domain.LineItem</class>
+ <class>openbook.domain.Customer</class>
+ <class>openbook.domain.Author</class>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- <property name="openjpa.jdbc.QuerySQLCache" value="true(EnableStatistics=true)"/>
-
- </properties>
+ <validation-mode>NONE</validation-mode>
+
+ <properties>
+ <property name="openjpa.DataCache" value="true"/>
+ <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <property name="openjpa.DynamicEnhancementAgent" value="false"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ <property name="openjpa.jdbc.QuerySQLCache" value="true(EnableStatistics=true)"/>
+
+ </properties>
</persistence-unit>
</persistence>
diff --git a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
index 2215656..4d79a79 100644
--- a/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
+++ b/openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
@@ -19,6 +19,8 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
version="2.0">
<persistence-unit name="OpenBooks">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
@@ -30,6 +32,8 @@
<class>openbook.domain.Customer</class>
<class>openbook.domain.Author</class>
+ <validation-mode>NONE</validation-mode>
+
<properties>
<!-- Use these for MySQL
<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index fb21047..8087e14 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -223,6 +223,13 @@
<artifactId>openjpa-all</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- The slf4j dependency is for bval 0.3-incubating -->
+ <!-- This can be removed if we move to bval 0.5, where the slf4j dependency is removed -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
</dependencies>
<!-- ^^^^^^^^^^^^^^^^^^^ -->
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
index fd7bcce..29ba4ce 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
@@ -65,7 +65,7 @@
(XMLMetaDataParser.class);
private static boolean _schemaBug;
- private static final String OPENJPA_NAMESPACE = "http://www.apache.org/openjpa/ns/orm";
+ private static final String OPENJPA_NAMESPACE = "http://openjpa.apache.org/ns/orm";
protected int _extendedNamespace = 0;
protected int _openjpaNamespace = 0;
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
index 48e7d9a..8b3f0aa 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
index 5b6b9cd..0abe76d 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
index 3bd6f88..93b374d 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
index 8d16b31..974553b 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
index 8be48f3..23ae380 100644
--- a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
index 7a8328f..dd2c181 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
+import javax.persistence.Cache;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
import javax.persistence.Query;
@@ -171,14 +172,22 @@
}
protected Log getDumpStackLog() {
- return emf.getConfiguration().getLog("DumpStack");
+ if (emf != null) {
+ return emf.getConfiguration().getLog("DumpStack");
+ } else {
+ return null;
+ }
}
protected void logStack(Throwable t) {
StringWriter str = new StringWriter();
PrintWriter print = new PrintWriter(str);
t.printStackTrace(print);
- getDumpStackLog().trace(str.toString());
+ if (getDumpStackLog() != null) {
+ getDumpStackLog().trace(str.toString());
+ } else {
+ System.err.println(str.toString());
+ }
}
private void notifyParent() {
@@ -216,6 +225,9 @@
// OpenJPA entity manager API
Detach, // ();
+ // OpenJPA entity manager factory API
+ ClearCache, // ()
+
// Transaction API
StartTx, // ()
CommitTx, // ()
@@ -247,6 +259,7 @@
SaveVersion, // ([int id])
TestVersion, // (int id, int increment)
TestLockMode, // (int id, LockModeType lockMode)
+ TestInCache, // ([int id[, boolean expectedInCache]])
Test, // Open-ended testing actions
};
@@ -530,6 +543,13 @@
log.trace("Employee (after) :" + detEmployee);
break;
+ case ClearCache:
+ Cache cache = em.getEntityManagerFactory().getCache();
+ if (cache != null) {
+ cache.evictAll();
+ }
+ break;
+
case StartTx:
em.getTransaction().begin();
break;
@@ -577,7 +597,7 @@
}
if (waitTime < MinThreadWaitInMs / 2)
waitTime = MinThreadWaitInMs / 2;
- log.trace(">> Started wait for " + waitTime + " ms");
+ log.trace(">> Started thread " + waitThreadid + " wait for " + waitTime + " ms");
if( waitThreadid != 0) {
thisThread.wait(waitTime);
} else {
@@ -773,6 +793,26 @@
}
break;
+ case TestInCache:
+ id = 1;
+ boolean expectedInCache = false;
+ if (args.length > 1) {
+ id = (Integer)args[1];
+ }
+ if (args.length > 2) {
+ expectedInCache = (Boolean)args[2];
+ }
+ Cache testCache = em.getEntityManagerFactory().getCache();
+ if (testCache != null) {
+ boolean inCache = testCache.contains(LockEmployee.class, id);
+ log.trace("cache.contains(Employee("+id+")) = " + inCache);
+ assertTrue(curAct + ":TestInCache Expecting=" + expectedInCache
+ + ", Testing=" + inCache + "]", inCache == expectedInCache);
+ } else {
+ log.info(curAct+":TestInCache - No Cache found.");
+ }
+ break;
+
case WaitAllChildren:
// wait for threads to die or timeout
log.trace("checking if thread is alive for " +
@@ -833,7 +873,11 @@
break;
case Sleep:
- Thread.sleep((Integer) args[1]);
+ int sleepMS = 5000;
+ if (args.length > 1) {
+ sleepMS = (Integer) args[1];
+ }
+ Thread.sleep(sleepMS);
break;
case DetachSerialize:
id = 1;
diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
index cf8e5a6..33dd0bd 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
@@ -18,8 +18,8 @@
under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
+ targetNamespace="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
index 1f1303f..5cb2fa4 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
@@ -18,15 +18,15 @@
under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.apache.org/openjpa/ns/orm"
- xmlns:openjpa-orm="http://www.apache.org/openjpa/ns/orm"
- xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
+ targetNamespace="http://openjpa.apache.org/ns/orm"
+ xmlns:openjpa-orm="http://openjpa.apache.org/ns/orm"
+ xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
- <xsd:import namespace="http://www.apache.org/openjpa/ns/orm/extendable"/>
+ <xsd:import namespace="http://openjpa.apache.org/ns/orm/extendable"/>
<xsd:import namespace="http://java.sun.com/xml/ns/persistence/orm"/>
<!-- **************************************************** -->
diff --git a/openjpa-project/CHANGES.txt b/openjpa-project/CHANGES.txt
index 4c70770..ffbf752 100644
--- a/openjpa-project/CHANGES.txt
+++ b/openjpa-project/CHANGES.txt
@@ -117,6 +117,7 @@
Bug
+ [OPENJPA-2172] - openjpa-all jar is missing slf4j runtime dependency
[OPENJPA-2196] - Create Sequence Postgres 9.1
[OPENJPA-2233] - Failed to invoke pcGetIDOwningClass method on embeddable entity with ID annotation
[OPENJPA-2235] - "READ_UNCOMMITTED" setting for the fetch plan isolation level is ignored in DB2Dictionary
@@ -146,6 +147,8 @@
[OPENJPA-2348] - Cache calculated hashCode in OpenJPAId
[OPENJPA-2353] - Reduce object allocations
[OPENJPA-2354] - Removed synchronized from enhancer added pcReplaceStateManager method
+ [OPENJPA-2368] - Move www.apache.org/openjpa/ns/orm to openjpa.apache.org/ns/orm
+
New Feature
diff --git a/openjpa-project/LICENSE b/openjpa-project/LICENSE
index 3ea3c75..1cbe28b 100644
--- a/openjpa-project/LICENSE
+++ b/openjpa-project/LICENSE
@@ -415,4 +415,4 @@
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.
\ No newline at end of file
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/openjpa-project/RELEASE-NOTES.html b/openjpa-project/RELEASE-NOTES.html
index 94e45b5..17139d3 100644
--- a/openjpa-project/RELEASE-NOTES.html
+++ b/openjpa-project/RELEASE-NOTES.html
@@ -134,6 +134,8 @@
<h2> Bug
</h2>
<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2172'>OPENJPA-2172</a>] - openjpa-all jar is missing slf4j runtime dependency
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2196'>OPENJPA-2196</a>] - Create Sequence Postgres 9.1
</li>
<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2233'>OPENJPA-2233</a>] - Failed to invoke pcGetIDOwningClass method on embeddable entity with ID annotation
@@ -191,6 +193,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2354'>OPENJPA-2354</a>] - Removed synchronized from enhancer added pcReplaceStateManager method
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2368'>OPENJPA-2368</a>] - Move www.apache.org/openjpa/ns/orm to openjpa.apache.org/ns/orm
+</li>
</ul>
<h2> New Feature
diff --git a/openjpa-project/src/doc/manual/ref_guide_meta.xml b/openjpa-project/src/doc/manual/ref_guide_meta.xml
index 3bcee60..f72dd41 100644
--- a/openjpa-project/src/doc/manual/ref_guide_meta.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_meta.xml
@@ -987,7 +987,7 @@
<para>
OpenJPA has extended the JPA 2.0 schema to include elements and attributes corresponding
to OpenJPA extended metadata and mapping annotations. The schema are contained in 2
-files: <ulink url="http://openjpa.apache.org/builds/latest/docs/schema/extendable-orm.xsd">
+files: <ulink url="http://openjpa.apache.org/builds/latest/docs/schema/extendable/extendable-orm.xsd">
extendable-orm.xsd</ulink> and
<ulink url="http://openjpa.apache.org/builds/latest/docs/schema/openjpa-orm.xsd">openjpa-orm.xsd</ulink>.
The extendable-orm.xsd file provides copies of some of the JPA 2.0 schema elements with additional schema to make it
@@ -1007,8 +1007,8 @@
OpenJPA Schema Extensions
</title>
<programlisting>
-<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
- xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
+<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
+ xmlns:openjpa="http://openjpa.apache.org/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
