Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2011-06-24 11:49:56 -0400
committerkmoore2011-06-24 11:49:56 -0400
commit726cfde6c68ec247db729a29622e935840da58c8 (patch)
tree7d0d90ec96b12381e034d00b08648f499bf86097 /common/plugins/org.eclipse.jpt.common.eclipselink.core
parentb621d4cc191ebfdab3d36795a17cb48620d9df3d (diff)
downloadwebtools.dali-726cfde6c68ec247db729a29622e935840da58c8.tar.gz
webtools.dali-726cfde6c68ec247db729a29622e935840da58c8.tar.xz
webtools.dali-726cfde6c68ec247db729a29622e935840da58c8.zip
349071 - [EclipseLink] eclipselink 2.3 schemas not up to dateR3_0_0_maintenance
Diffstat (limited to 'common/plugins/org.eclipse.jpt.common.eclipselink.core')
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd17
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_3.xsd24
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.3.xsd5
3 files changed, 39 insertions, 7 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
index 4afc815ece..3fa1b482d6 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd
@@ -68,11 +68,21 @@
<!-- **************************************************** -->
<xsd:complexType name="emptyType"/>
+
<xsd:simpleType name="versionType">
<xsd:restriction base="xsd:token">
<xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
</xsd:restriction>
</xsd:simpleType>
+
+ <xsd:simpleType name="supported-versions-type">
+ <xsd:restriction base="orm:versionType">
+ <xsd:enumeration value="2.0"/>
+ <xsd:enumeration value="2.1"/>
+ <xsd:enumeration value="2.2"/>
+ <xsd:enumeration value="2.3"/>
+ </xsd:restriction>
+ </xsd:simpleType>
<!-- **************************************************** -->
@@ -680,8 +690,8 @@
<xsd:element name="embeddable" type="orm:embeddable"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="version" type="orm:versionType"
- fixed="2.3" use="required"/>
+ <xsd:attribute name="version" type="orm:supported-versions-type"
+ default="2.3" use="optional"/>
</xsd:complexType>
</xsd:element>
@@ -839,6 +849,7 @@
<xsd:sequence>
<xsd:element name="description" type="xsd:string" minOccurs="0"/>
<xsd:element name="access-methods" type="orm:access-methods" minOccurs="0"/>
+ <xsd:element name="multitenant" type="orm:multitenant" minOccurs="0"/>
<xsd:element name="additional-criteria" type="orm:additional-criteria" minOccurs="0"/>
<xsd:element name="customizer" type="orm:customizer" minOccurs="0"/>
<xsd:element name="change-tracking" type="orm:change-tracking" minOccurs="0"/>
@@ -2216,6 +2227,7 @@
<xsd:attribute name="fetch" type="orm:fetch-type"/>
<xsd:attribute name="access" type="orm:access-type"/>
<xsd:attribute name="attribute-type" type="xsd:string"/>
+ <xsd:attribute name="composite-member" type="xsd:string"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -4855,7 +4867,6 @@
<xsd:sequence>
<xsd:element name="unique-constraint" type="orm:unique-constraint"
minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="multitenant" type="orm:multitenant" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="catalog" type="xsd:string"/>
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_3.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_3.xsd
index 8206454e5e..74a4d55db5 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_3.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_3.xsd
@@ -54,6 +54,7 @@
<xs:attribute name="xml-mapping-metadata-complete" type="xs:boolean" default="false" />
<xs:attribute name="package-name" type="xs:string" default="##default" />
<xs:attribute name="xml-name-transformer" type="xs:string" />
+ <xs:attribute name="version" type="supported-versions" />
</xs:complexType>
</xs:element>
<xs:element name="xml-registry">
@@ -80,7 +81,7 @@
<xs:all>
<xs:element ref="xml-type" minOccurs="0"/>
<xs:element ref="xml-root-element" minOccurs="0"/>
- <xs:element ref="xml-extensible" minOccurs="0"/>
+ <xs:element ref="xml-virtual-access-methods" minOccurs="0"/>
<xs:element ref="xml-see-also" minOccurs="0"/>
<xs:element ref="xml-java-type-adapter" minOccurs="0"/>
<xs:element ref="xml-class-extractor" minOccurs="0"/>
@@ -111,8 +112,8 @@
</xs:complexType>
<xs:element name="xml-access-methods" type="xml-access-methods" />
<xs:complexType name="xml-access-methods">
- <xs:attribute name="get-method" type="xs:string" use="required"/>
- <xs:attribute name="set-method" type="xs:string" use="required"/>
+ <xs:attribute name="get-method" type="xs:string" />
+ <xs:attribute name="set-method" type="xs:string" />
</xs:complexType>
<xs:element name="xml-class-extractor" type="xml-class-extractor" />
<xs:complexType name="xml-class-extractor">
@@ -159,6 +160,14 @@
<xs:enumeration value="EMPTY_NODE" />
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="supported-versions">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="2.0"/>
+ <xs:enumeration value="2.1"/>
+ <xs:enumeration value="2.2"/>
+ <xs:enumeration value="2.3"/>
+ </xs:restriction>
+ </xs:simpleType>
<!-- @Target(value=PACKAGE) -->
<xs:element name="xml-schema">
@@ -256,12 +265,19 @@
<xs:list itemType="xs:string" />
</xs:simpleType>
</xs:element>
- <xs:element name="xml-extensible">
+ <xs:element name="xml-virtual-access-methods">
<xs:complexType>
<xs:attribute name="get-method" type="xs:string" default="get" />
<xs:attribute name="set-method" type="xs:string" default="set" />
+ <xs:attribute name="schema" type="xml-virtual-access-methods-schema" default="NODES" />
</xs:complexType>
</xs:element>
+ <xs:simpleType name="xml-virtual-access-methods-schema">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="NODES" />
+ <xs:enumeration value="ANY" />
+ </xs:restriction>
+ </xs:simpleType>
<!-- @Target(value={FIELD}) -->
<xs:element name="xml-enum-value">
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.3.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.3.xsd
index 69a39f0f74..12a97f0bd7 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.3.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.3.xsd
@@ -2974,6 +2974,11 @@
<xsd:documentation>The name of the stored procedure.</xsd:documentation>
</xsd:annotation>
</xsd:element>
+ <xsd:element minOccurs="0" name="cursor-output-procedure" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>Define the call to use a cursor output parameter to define the result set.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element minOccurs="0" name="arguments">
<xsd:annotation>
<xsd:documentation>The list of input and output arguments.</xsd:documentation>

Back to the top