You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/06/11 10:33:41 UTC
svn commit: r783691 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd
Author: andrey
Date: Thu Jun 11 08:33:41 2009
New Revision: 783691
URL: http://svn.apache.org/viewvc?rev=783691&view=rev
Log:
CAY-1238. Modeler-generated XMLs validation fails in Eclipse. Fixing schema (and adding DBEntity's qualifier)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd?rev=783691&r1=783690&r2=783691&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd Thu Jun 11 08:33:41 2009
@@ -49,6 +49,9 @@
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="cay:db-attribute"/>
<xs:element minOccurs="0" ref="cay:db-key-generator"/>
+
+ <!-- Qualifier for DB Entity -->
+ <xs:element minOccurs="0" ref="cay:qualifier"/>
</xs:sequence>
<xs:attribute name="name" use="required" type="xs:string"/>
<xs:attribute name="schema" type="xs:string"/>
@@ -83,16 +86,16 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:embedded-attribute"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:obj-attribute"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:attribute-override"/>
- <xs:sequence minOccurs="0">
- <xs:element ref="cay:entity-listener"/>
- <xs:element ref="cay:pre-persist"/>
- <xs:element ref="cay:post-persist"/>
- <xs:element ref="cay:pre-update"/>
- <xs:element ref="cay:post-update"/>
- <xs:element ref="cay:pre-remove"/>
- <xs:element ref="cay:post-remove"/>
- <xs:element ref="cay:post-load"/>
- </xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:entity-listener"/>
+
+ <!-- Callbacks -->
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:pre-persist"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-persist"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:pre-update"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-update"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:pre-remove"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-remove"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-load"/>
</xs:sequence>
<xs:attribute name="className" use="optional" type="xs:string"/>
<xs:attribute name="abstract" use="optional" type="xs:string"/>