Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-11-16 10:46:41 -0500
committerkmoore2010-11-16 10:46:41 -0500
commit8ebc7085c11bf323a8472161dfb3610fbf62550c (patch)
treef73b75f60952abc459a0254275b23a9d521adf70
parent03e373f6a83bb39338b2ffa707afd92e9a586356 (diff)
downloadwebtools.dali-8ebc7085c11bf323a8472161dfb3610fbf62550c.tar.gz
webtools.dali-8ebc7085c11bf323a8472161dfb3610fbf62550c.tar.xz
webtools.dali-8ebc7085c11bf323a8472161dfb3610fbf62550c.zip
checking in recent changes to eclipselink_oxm schemas
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd8
2 files changed, 7 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
index 270f5c66ab..d4ea8426bb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
@@ -459,4 +459,4 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
-</xs:schema>
+</xs:schema> \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
index e2c78a3be1..7038e2cad7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
@@ -51,6 +51,7 @@
</xs:all>
<xs:attribute name="xml-accessor-type" type="xml-access-type" default="PUBLIC_MEMBER" />
<xs:attribute name="xml-accessor-order" type="xml-access-order" default="UNDEFINED" />
+ <xs:attribute name="xml-mapping-metadata-complete" type="xs:boolean" default="false" />
</xs:complexType>
</xs:element>
<xs:element name="xml-registry">
@@ -429,6 +430,8 @@
<xs:element ref="xml-properties" minOccurs="0" />
</xs:all>
<xs:attribute name="mapped-by" type="xs:string" />
+ <xs:attribute name="container-type" type="xs:string" default="##default" />
+ <xs:attribute name="type" type="xs:string" default="##default" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -445,11 +448,12 @@
<xs:complexType>
<xs:complexContent>
<xs:extension base="java-attribute">
- <xs:sequence>
+ <xs:all>
<xs:element ref="xml-abstract-null-policy" minOccurs="0" />
<xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-properties" minOccurs="0" />
- </xs:sequence>
+ <xs:element ref="xml-java-type-adapter" minOccurs="0"/>
+ </xs:all>
<xs:attribute name="cdata" type="xs:boolean" default="false" />
<xs:attribute name="read-only" type="xs:boolean" default="false" />
<xs:attribute name="type" type="xs:string" default="##default" />

Back to the top