db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject svn commit: r1694782 - in /db/jdo/trunk/api/src/schema/javax/jdo: jdo_3_2.xsd orm_3_2.dtd orm_3_2.xsd
Date Sat, 08 Aug 2015 09:37:17 GMT
Author: andyj
Date: Sat Aug  8 09:37:16 2015
New Revision: 1694782

URL: http://svn.apache.org/r1694782
Log:
bring XSD/DTD up to date with converter info

Modified:
    db/jdo/trunk/api/src/schema/javax/jdo/jdo_3_2.xsd
    db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.dtd
    db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.xsd

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=1694782&r1=1694781&r2=1694782&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 Sat Aug  8 09:37:16 2015
@@ -1100,15 +1100,6 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="converter"/>
-        <xs:attribute name="use-default-conversion" 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>

Modified: db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.dtd?rev=1694782&r1=1694781&r2=1694782&view=diff
==============================================================================
--- db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.dtd (original)
+++ db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.dtd Sat Aug  8 09:37:16 2015
@@ -44,6 +44,8 @@
 <!ATTLIST property indexed (true|false|unique) #IMPLIED>
 <!ATTLIST property unique (true|false) #IMPLIED>
 <!ATTLIST property mapped-by CDATA #IMPLIED>
+<!ATTLIST property converter CDATA #IMPLIED>
+<!ATTLIST property use-default-conversion (true|false) 'false'>
 
 <!ELEMENT class (extension*, datastore-identity?, primary-key?, inheritance?, version?,
join*, foreign-key*, index*, unique*, column*, field*, property*, query*, extension*)>
 <!ATTLIST class name CDATA #REQUIRED>
@@ -108,6 +110,8 @@
 <!ATTLIST field unique (true|false) #IMPLIED>
 <!ATTLIST field sequence CDATA #IMPLIED>
 <!ATTLIST field mapped-by CDATA #IMPLIED>
+<!ATTLIST field converter CDATA #IMPLIED>
+<!ATTLIST field use-default-conversion (true|false) 'false'>
 
 <!ELEMENT foreign-key (extension*, (column* | field* | property*), extension*)>
 <!ATTLIST foreign-key table CDATA #IMPLIED>
@@ -125,6 +129,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 use-default-conversion (true|false) 'false'>
 
 <!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
 <!ATTLIST value column CDATA #IMPLIED>
@@ -134,6 +140,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 use-default-conversion (true|false) 'false'>
 
 <!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
 <!ATTLIST element column CDATA #IMPLIED>
@@ -143,6 +151,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 use-default-conversion (true|false) 'false'>
 
 <!ELEMENT order (extension*, column*, index?, extension*)>
 <!ATTLIST order column CDATA #IMPLIED>

Modified: db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.xsd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.xsd?rev=1694782&r1=1694781&r2=1694782&view=diff
==============================================================================
--- db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.xsd (original)
+++ db/jdo/trunk/api/src/schema/javax/jdo/orm_3_2.xsd Sat Aug  8 09:37:16 2015
@@ -156,6 +156,15 @@
         <xs:attribute name="mapped-by"/>
         <xs:attribute name="recursion-depth"/>
         <xs:attribute name="field-name"/>
+        <xs:attribute name="converter"/>
+        <xs:attribute name="use-default-conversion" 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>
@@ -460,6 +469,15 @@
         </xs:attribute>
         <xs:attribute name="sequence"/>
         <xs:attribute name="mapped-by"/>
+        <xs:attribute name="converter"/>
+        <xs:attribute name="use-default-conversion" 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>
@@ -585,6 +603,15 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="mapped-by"/>
+        <xs:attribute name="converter"/>
+        <xs:attribute name="use-default-conversion" 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>
@@ -650,6 +677,15 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="mapped-by"/>
+        <xs:attribute name="converter"/>
+        <xs:attribute name="use-default-conversion" 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>
@@ -715,6 +751,15 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="mapped-by"/>
+        <xs:attribute name="converter"/>
+        <xs:attribute name="use-default-conversion" 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>



Mime
View raw message