Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-12-15 15:58:28 +0000
committerkmoore2010-12-15 15:58:28 +0000
commite09a9d1744ff9aa218e197c5135b8fe5cd5c6bd5 (patch)
tree109a22fe5ec6a246e7566cbbc0103518db058659
parent73576031ab7717d093ea494f9e30bb6204bf831e (diff)
downloadwebtools.dali-e09a9d1744ff9aa218e197c5135b8fe5cd5c6bd5.tar.gz
webtools.dali-e09a9d1744ff9aa218e197c5135b8fe5cd5c6bd5.tar.xz
webtools.dali-e09a9d1744ff9aa218e197c5135b8fe5cd5c6bd5.zip
updated to the latest eclipselink_oxm_2_2.xsd
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd22
1 files changed, 13 insertions, 9 deletions
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 7038e2cad7..61e37c7daf 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
@@ -52,6 +52,7 @@
<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:attribute name="package-name" type="xs:string" default="##default" />
</xs:complexType>
</xs:element>
<xs:element name="xml-registry">
@@ -60,12 +61,13 @@
<xs:element name="xml-element-decl" maxOccurs="unbounded" >
<xs:complexType>
<xs:attribute name="java-method" type="xs:string" />
- <xs:attribute name="name" type="xs:string" />
+ <xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="defaultValue" type="xs:string" default="\u0000" />
<xs:attribute name="namespace" type="xs:string" default="##default" />
<xs:attribute name="scope" type="xs:string" default="javax.xml.bind.annotation.XmlElementDecl.GLOBAL" />
<xs:attribute name="substitutionHeadName" type="xs:string" default="" />
<xs:attribute name="substitutionHeadNamespace" type="xs:string" default="##default" />
+ <xs:attribute name="type" type="xs:string" default="##default" />
</xs:complexType>
</xs:element>
</xs:sequence>
@@ -201,7 +203,7 @@
<xs:complexType>
<xs:complexContent>
<xs:extension base="java-attribute">
- <xs:attribute name="value" type="xs:string" />
+ <xs:attribute name="value" type="xs:string" use="required" />
<xs:attribute name="type" type="xs:string" default="javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT" />
</xs:extension>
</xs:complexContent>
@@ -375,6 +377,7 @@
<xs:element ref="xml-element" minOccurs="0" maxOccurs="unbounded" />
<xs:element ref="xml-element-wrapper" minOccurs="0"/>
<xs:element ref="xml-properties" minOccurs="0" />
+ <xs:element ref="xml-join-nodes" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<xs:attribute name="xml-idref" type="xs:boolean" default="false" />
<xs:attribute name="xml-list" type="xs:boolean" default="false" />
@@ -396,6 +399,7 @@
</xs:all>
<xs:attribute name="name" type="xs:string" default="##default" />
<xs:attribute name="namespace" type="xs:string" />
+ <xs:attribute name="container-type" type="xs:string" default="##default" />
<xs:attribute name="type" type="xs:string" default="javax.xml.bind.annotation.XmlElementRef.DEFAULT" />
<xs:attribute name="xml-mixed" type="xs:boolean" default="false" />
<xs:attribute name="read-only" type="xs:boolean" default="false" />
@@ -429,7 +433,7 @@
<xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-properties" minOccurs="0" />
</xs:all>
- <xs:attribute name="mapped-by" type="xs:string" />
+ <xs:attribute name="mapped-by" type="xs:string" use="required" />
<xs:attribute name="container-type" type="xs:string" default="##default" />
<xs:attribute name="type" type="xs:string" default="##default" />
</xs:extension>
@@ -483,7 +487,7 @@
<xs:complexType name="xml-abstract-null-policy" abstract="true">
<xs:attribute name="xsi-nil-represents-null" type="xs:boolean" default="false" />
<xs:attribute name="empty-node-represents-null" type="xs:boolean" default="false" />
- <xs:attribute name="null-representation-for-xml" type="xml-marshal-null-representation" />
+ <xs:attribute name="null-representation-for-xml" type="xml-marshal-null-representation" default="ABSENT_NODE" />
</xs:complexType>
<xs:element name="xml-null-policy" substitutionGroup="xml-abstract-null-policy">
<xs:complexType>
@@ -501,12 +505,12 @@
<xs:sequence>
<xs:element name="is-set-parameter" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
- <xs:attribute name="value" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
+ <xs:attribute name="value" type="xs:string" use="required" />
+ <xs:attribute name="type" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="is-set-method-name" type="xs:string" />
+ <xs:attribute name="is-set-method-name" type="xs:string" use="required" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -527,12 +531,12 @@
<xs:element name="xml-write-transformer" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="method" type="xs:string" />
- <xs:attribute name="xml-path" type="xs:string" />
+ <xs:attribute name="xml-path" type="xs:string" use="required" />
<xs:attribute name="transformer-class" type="xs:string" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="optional" type="xs:boolean" default="false"/>
+ <xs:attribute name="optional" type="xs:boolean" default="true"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>

Back to the top