You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2009/10/22 00:45:37 UTC
svn commit: r828242 - in /openjpa/trunk:
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/
openjpa-persistence-jdbc/src/test/resources/META-INF/ openjpa-...
Author: curtisr7
Date: Wed Oct 21 22:45:36 2009
New Revision: 828242
URL: http://svn.apache.org/viewvc?rev=828242&view=rev
Log:
OPENJPA-859: Restructured testcase. Minor formatting change.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml (with props)
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/orm.xml
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java?rev=828242&r1=828241&r2=828242&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java Wed Oct 21 22:45:36 2009
@@ -18,20 +18,17 @@
*/
package org.apache.openjpa.persistence;
-import javax.persistence.Entity;
-
import org.apache.openjpa.persistence.entity.MixedMappingLocation;
import org.apache.openjpa.persistence.entity.MixedMappingLocationEmbeddedId;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
// org.apache.openjpa.persistence.TestMixedMappingLocation
-@Entity
public class TestMixedMappingLocation extends SingleEMFTestCase {
- @Override
protected String getPersistenceUnitName() {
- return "test_parsing";
+ return "xml-persistence-unit";
}
+
public void setUp() {
setUp(DROP_TABLES,MixedMappingLocationEmbeddedId.class, MixedMappingLocation.class);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java?rev=828242&r1=828241&r2=828242&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java Wed Oct 21 22:45:36 2009
@@ -31,6 +31,8 @@
@Basic
private String country;
+ private String basic10;
+
public MixedMappingLocationEmbeddedId() {
// TODO Auto-generated constructor stub
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=828242&r1=828241&r2=828242&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml Wed Oct 21 22:45:36 2009
@@ -20,7 +20,6 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">
-
<persistence-unit name="xml-persistence-unit">
<description>
This needs to be listed because the OpenJPA test framework
@@ -53,6 +52,7 @@
<mapping-file>org/apache/openjpa/persistence/embed/embed-assoc-over-orm.xml</mapping-file>
<mapping-file>org/apache/openjpa/persistence/detach/detach-orm.xml</mapping-file>
<mapping-file>org/apache/openjpa/persistence/enhance/identity/mapsId-orm.xml</mapping-file>
+ <mapping-file>org/apache/openjpa/persistence/entity/orm.xml</mapping-file>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
@@ -256,12 +256,6 @@
<class>org.apache.openjpa.persistence.meta.MdrTestEntity</class>
</persistence-unit>
- <persistence-unit name="test_parsing">
- <mapping-file>org/apache/openjpa/persistence/entity/orm.xml</mapping-file>
- <class>org.apache.openjpa.persistence.entity.MixedMappingLocation</class>
- <class>org.apache.openjpa.persistence.entity.MixedMappingLocationEmbeddedId</class>
- </persistence-unit>
-
<persistence-unit name="mapsId-pu">
<mapping-file>org/apache/openjpa/persistence/enhance/identity/mapsId-orm.xml</mapping-file>
<class>org.apache.openjpa.persistence.enhance.identity.Employee1Xml</class>
Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml?rev=828242&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml Wed Oct 21 22:45:36 2009
@@ -0,0 +1,41 @@
+<?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_2_0.xsd"
+ version="2.0">
+ <package>org.apache.openjpa.persistence.entity</package>
+ <entity name="MixedMappingLocation" class="MixedMappingLocation">
+ <attributes>
+ <embedded-id name="id"></embedded-id>
+ <basic name="basic1">
+ <column name="basic1_override" length="100"/>
+ </basic>
+ </attributes>
+ </entity>
+ <embeddable class="MixedMappingLocationEmbeddedId">
+ <attributes>
+ <basic name="basic10">
+ <column name="basic10_override" length="100"/>
+ </basic>
+ </attributes>
+ </embeddable>
+
+</entity-mappings>
Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=828242&r1=828241&r2=828242&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java Wed Oct 21 22:45:36 2009
@@ -497,14 +497,14 @@
// setup defaults (ie: Basic fields).
ClassMetaData m = getRepository().getCachedMetaData(_cls);
if (m == null) {
- if (!(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Entity.class)))
- .booleanValue()
- && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Embeddable.class)))
+ if (!(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Entity.class)))
.booleanValue()
- && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls,
- MappedSuperclass.class))).booleanValue())
- return null;
- }
+ && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Embeddable.class)))
+ .booleanValue()
+ && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls,
+ MappedSuperclass.class))).booleanValue())
+ return null;
+ }
// find / create metadata
ClassMetaData meta = (m == null) ? getMetaData() : m;
if (meta == null)