You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2015/05/17 09:02:11 UTC
svn commit: r1679820 - in /db/jdo/trunk/api/src/schema/javax/jdo:
jdo_3_2.dtd jdo_3_2.xsd
Author: andyj
Date: Sun May 17 07:02:10 2015
New Revision: 1679820
URL: http://svn.apache.org/r1679820
Log:
JDO-709 Updates to XML for type converter specification
Modified:
db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.dtd
db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd
Modified: db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.dtd?rev=1679820&r1=1679819&r2=1679820&view=diff
==============================================================================
--- db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.dtd (original)
+++ db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.dtd Sun May 17 07:02:10 2015
@@ -40,6 +40,7 @@
<!ATTLIST interface schema CDATA #IMPLIED>
<!ATTLIST interface cacheable (true|false) 'true'>
<!ATTLIST interface serialize-read (true|false) 'false'>
+<!ATTLIST interface disable-all-converters (true|false) 'false'>
<!ELEMENT property (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST property name CDATA #REQUIRED>
@@ -63,6 +64,8 @@
<!ATTLIST property recursion-depth CDATA #IMPLIED>
<!ATTLIST property field-name CDATA #IMPLIED>
<!ATTLIST property cacheable (true|false) 'true'>
+<!ATTLIST property converter CDATA #IMPLIED>
+<!ATTLIST property disable-converter (true|false) 'false'>
<!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, fetch-group*, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
@@ -78,6 +81,7 @@
<!ATTLIST class schema CDATA #IMPLIED>
<!ATTLIST class cacheable (true|false) 'true'>
<!ATTLIST class serialize-read (true|false) 'false'>
+<!ATTLIST class disable-all-converters (true|false) 'false'>
<!ELEMENT primary-key (extension*, column*, extension*)>
<!ATTLIST primary-key name CDATA #IMPLIED>
@@ -147,6 +151,8 @@
<!ATTLIST field recursion-depth CDATA #IMPLIED>
<!ATTLIST field mapped-by CDATA #IMPLIED>
<!ATTLIST field cacheable (true|false) 'true'>
+<!ATTLIST field converter CDATA #IMPLIED>
+<!ATTLIST field disable-converter (true|false) 'false'>
<!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
<!ATTLIST foreign-key table CDATA #IMPLIED>
@@ -180,6 +186,8 @@
<!ATTLIST key indexed (true|false|unique) #IMPLIED>
<!ATTLIST key unique (true|false) #IMPLIED>
<!ATTLIST key mapped-by CDATA #IMPLIED>
+<!ATTLIST key converter CDATA #IMPLIED>
+<!ATTLIST key disable-converter (true|false) 'false'>
<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST value column CDATA #IMPLIED>
@@ -189,6 +197,8 @@
<!ATTLIST value indexed (true|false|unique) #IMPLIED>
<!ATTLIST value unique (true|false) #IMPLIED>
<!ATTLIST value mapped-by CDATA #IMPLIED>
+<!ATTLIST value converter CDATA #IMPLIED>
+<!ATTLIST value disable-converter (true|false) 'false'>
<!ELEMENT array (extension*)>
<!ATTLIST array element-type CDATA #IMPLIED>
@@ -204,6 +214,8 @@
<!ATTLIST element indexed (true|false|unique) #IMPLIED>
<!ATTLIST element unique (true|false) #IMPLIED>
<!ATTLIST element mapped-by CDATA #IMPLIED>
+<!ATTLIST element converter CDATA #IMPLIED>
+<!ATTLIST element disable-converter (true|false) 'false'>
<!ELEMENT order (extension*, column*, index?, extension*)>
<!ATTLIST order column CDATA #IMPLIED>
Modified: db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd?rev=1679820&r1=1679819&r2=1679820&view=diff
==============================================================================
--- db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd (original)
+++ db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd Sun May 17 07:02:10 2015
@@ -145,6 +145,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="disable-all-converters" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="property">
<xs:complexType>
@@ -287,6 +295,15 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="class">
<xs:complexType>
@@ -383,6 +400,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="disable-all-converters" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="primary-key">
<xs:complexType>
@@ -728,6 +753,15 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="foreign-key">
<xs:complexType>
@@ -948,6 +982,15 @@
</xs:simpleType>
</xs:attribute>
<xs:attribute name="mapped-by"/>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="value">
<xs:complexType>
@@ -1013,6 +1056,15 @@
</xs:simpleType>
</xs:attribute>
<xs:attribute name="mapped-by"/>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="array">
<xs:complexType>
@@ -1048,6 +1100,15 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="element">
<xs:complexType>
@@ -1113,6 +1174,15 @@
</xs:simpleType>
</xs:attribute>
<xs:attribute name="mapped-by"/>
+ <xs:attribute name="converter"/>
+ <xs:attribute name="disable-converter" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="order">
<xs:complexType>