Author: jgrassel
Date: Sun Nov 30 15:52:23 2014
New Revision: 1642555
URL: http://svn.apache.org/r1642555
Log:
OPENJPA-1988: openjpa does not process persistence unit default
<cascade-persist>
Added:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
(with props)
Removed:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/cascade/
Modified:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Modified:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java?rev=1642555&r1=1642554&r2=1642555&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
(original)
+++
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
Sun Nov 30 15:52:23 2014
@@ -19,46 +19,22 @@
package org.apache.openjpa.persistence.cascade.pudefault;
import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
public class TestPUDefaultCascadePersist extends SingleEMFTestCase {
- private EntityManagerFactory emf = null;
public void setUp() throws Exception {
- super.setUp();
- emf = OpenJPAPersistence.
- createEntityManagerFactory("TestPUDefaultCascadePersist",
-
"org/apache/openjpa/persistence/cascade/pudefault/META-INF/persistence.xml");
-
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
- em.createQuery("DELETE FROM PUDEntityA01").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityA02").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityAE01").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityA01_PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityA02_PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityAE01_PUDEntityB").executeUpdate();
- em.getTransaction().commit();
- } catch (Throwable t) {
- // Swallow
- } finally {
- if (em.getTransaction().isActive()) {
- em.getTransaction().rollback();
- }
- em.close();
- }
-// super.setUp(PUDEntityA01.class, PUDEntityB.class,
-//
"org/apache/openjpa/persistence/cascade/pudefault/META-INF/cascadepersistorm.xml",
-// CLEAR_TABLES);
+ super.setUp(PUDEntityA01.class, PUDEntityA02.class,
PUDEntityAE01.class, PUDEntityB.class,
+ CLEAR_TABLES);
+ }
+
+ protected String getPersistenceUnitName() {
+ return "TestPUDefaultCascadePersist";
}
+
public void tearDown() throws Exception {
super.tearDown();
- emf.close();
}
public void testPUDefaultCascadePersistOverM2M() {
@@ -83,9 +59,10 @@ public class TestPUDefaultCascadePersist
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
}
+ em.close();
}
- em.close();
+
em = emf.createEntityManager();
try {
Added:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml?rev=1642555&view=auto
==============================================================================
---
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
(added)
+++
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
Sun Nov 30 15:52:23 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
+ version="1.0">
+ <persistence-unit-metadata>
+ <persistence-unit-defaults>
+ <cascade-persist/>
+ </persistence-unit-defaults>
+ </persistence-unit-metadata>
+</entity-mappings>
\ No newline at end of file
Propchange:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=1642555&r1=1642554&r2=1642555&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Sun Nov 30 15:52:23 2014
@@ -474,4 +474,19 @@
</persistence-unit>
+ <persistence-unit name="TestPUDefaultCascadePersist"
transaction-type="RESOURCE_LOCAL">
+ <!--
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> -->
+ <mapping-file>META-INF/cascade-persist.xml</mapping-file>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityA01</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityAE01</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityA02</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityB</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.AnEmbeddable</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.EmbeddableWithRelationships</class>
+ <properties>
+ <property name="openjpa.ConnectionFactoryProperties"
value="MaxActive=110, MaxIdle=10, ValidationTimeout=50000,
+
MaxCachedStatements=10, ValidationSQL='', MaxWait=10000, TestOnBorrow=true" />
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)" />
+ </properties>
+ </persistence-unit>
</persistence>
