Fix for bug 248293 - JPA 2.0 Element Collections (part 2)
Reviewed by: Tom Ware
Existing model and tests from the inherited (annotation) model were expanded to test the new dot notation of attribute overrides on direct
mappings and on entity to pass along to mappings from a mapped superclass.
Changes also include more logging and exception handling along with numerous code cleanup and improvements.
Test suites:
- org.eclipse.persistence.testing.tests.jpa.inheritedInheritedModelJunitTest
diff --git a/src/javax/persistence/orm_2_0.xsd b/src/javax/persistence/orm_2_0.xsd
index 38e41e6..f367d6d 100644
--- a/src/javax/persistence/orm_2_0.xsd
+++ b/src/javax/persistence/orm_2_0.xsd
@@ -481,6 +481,10 @@
</xsd:annotation>
<xsd:sequence>
<xsd:element name="column" type="orm:column" minOccurs="0" />
+ <xsd:element name="attribute-override" type="orm:attribute-override"
+ minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="association-override" type="orm:association-override"
+ minOccurs="0" maxOccurs="unbounded"/>
<xsd:choice>
<xsd:element name="order-by" type="orm:order-by" minOccurs="0" />
<xsd:element name="order-column" type="orm:order-column"
@@ -503,7 +507,7 @@
minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="target-entity" type="xsd:string" />
+ <xsd:attribute name="target-class" type="xsd:string" />
<xsd:attribute name="fetch" type="orm:fetch-type" />
<xsd:attribute name="access" type="orm:access-type" />
</xsd:complexType>
