You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/07/23 21:37:12 UTC
svn commit: r1506241 - in
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main:
java/org/apache/cayenne/map/ resources/org/apache/cayenne/schema/3.0/
resources/org/apache/cayenne/schema/7/
Author: aadamchik
Date: Tue Jul 23 19:37:11 2013
New Revision: 1506241
URL: http://svn.apache.org/r1506241
Log:
CAY-1843 Stop saving listeners in DataMap, add upgrade handler
trying to fix the schemas
Added:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd
- copied, changed from r1506227, cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd
Removed:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java?rev=1506241&r1=1506240&r2=1506241&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java Tue Jul 23 19:37:11 2013
@@ -117,7 +117,7 @@ public class DataMap implements Serializ
* The namespace in which the data map XML file will be created. This is
* also the URI to locate a copy of the schema document.
*/
- public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/3.0/modelMap";
+ public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/7/modelMap";
protected String name;
protected String location;
@@ -316,7 +316,7 @@ public class DataMap implements Serializ
* @since 1.1
*/
public void encodeAsXML(XMLEncoder encoder) {
- encoder.println("<data-map xmlns=\"http://cayenne.apache.org/schema/3.0/modelMap\"");
+ encoder.println("<data-map xmlns=\"http://cayenne.apache.org/schema/7/modelMap\"");
encoder.indent(1);
encoder.println(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
Copied: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd (from r1506227, cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd?p2=cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd&p1=cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd&r1=1506227&r2=1506241&rev=1506241&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd Tue Jul 23 19:37:11 2013
@@ -25,9 +25,9 @@
are usually combined in one shared namespace, so the elements of the DataMap
may reference objects from other DataMaps.
-->
-<xs:schema targetNamespace="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:cay="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3">
+<xs:schema targetNamespace="http://cayenne.apache.org/schema/7/modelMap"
+ xmlns:cay="http://cayenne.apache.org/schema/7/modelMap"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="7">
<xs:element name="data-map">
<xs:complexType>
<xs:sequence>
@@ -39,7 +39,6 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:db-relationship"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:obj-relationship"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:query"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:entity-listener"/>
</xs:sequence>
<xs:attribute name="project-version" use="required" type="xs:string"/>
</xs:complexType>
@@ -87,7 +86,6 @@
<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:element minOccurs="0" maxOccurs="unbounded" ref="cay:entity-listener"/>
<!-- Callbacks -->
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-add"/>
@@ -109,8 +107,6 @@
<xs:attribute name="name" use="required" type="xs:string"/>
<xs:attribute name="superClassName" use="optional" type="xs:string"/>
<xs:attribute name="superEntityName" use="optional" type="xs:string"/>
- <xs:attribute name="exclude-superclass-listeners" use="optional" type="xs:boolean"/>
- <xs:attribute name="exclude-default-listeners" use="optional" type="xs:boolean"/>
<xs:attribute name="serverOnly" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
@@ -268,21 +264,6 @@
<xs:attribute name="schema" type="xs:string"/>
</xs:complexType>
</xs:element>
- <xs:element name="entity-listener">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:post-add"/>
- <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="class" use="required" type="xs:string"/>
- </xs:complexType>
- </xs:element>
<xs:element name="pre-update">
<xs:complexType>
<xs:attribute name="method-name" use="required" type="xs:string"/>