You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/10/20 14:49:41 UTC

[6/7] cayenne git commit: Upgrade datamap schema version from 8 to 9;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/main/resources/org/apache/cayenne/schema/9/modelMap.xsd
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/resources/org/apache/cayenne/schema/9/modelMap.xsd b/cayenne-server/src/main/resources/org/apache/cayenne/schema/9/modelMap.xsd
new file mode 100644
index 0000000..2d40762
--- /dev/null
+++ b/cayenne-server/src/main/resources/org/apache/cayenne/schema/9/modelMap.xsd
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<!--
+	Cayenne entity map schema 
+	Defines format of Cayenne DataMap XML files (*.map.xml).  DataMap files contain
+	the metadata needed for Cayenne object-relational features. Multiple DataMaps
+	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/9/modelMap"
+	xmlns:cay="http://cayenne.apache.org/schema/9/modelMap"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="9">
+	<xs:element name="data-map">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:property"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:embeddable"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:procedure"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:db-entity"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:obj-entity"/>
+				<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:sequence>
+			<xs:attribute name="project-version" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="db-entity">
+		<xs:complexType>
+			<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"/>
+			<xs:attribute name="catalog" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="db-attribute">
+		<xs:annotation>
+			<xs:documentation>A database column.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:attribute name="isMandatory" type="xs:boolean"/>
+			<xs:attribute name="isPrimaryKey" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>If true, the value of attribute is unique and used as a primary key identifier.</xs:documentation>
+				</xs:annotation>
+			</xs:attribute>
+			<xs:attribute name="isGenerated" use="optional" type="xs:boolean"/>
+			<xs:attribute name="length" type="xs:integer"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="scale" type="xs:integer"/>
+			<xs:attribute name="type" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="obj-entity">
+		<xs:annotation>
+			<xs:documentation>A persistent Java class managed by Cayenne.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" ref="cay:qualifier"/>
+				<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"/>
+				
+				<!--  Callbacks -->
+				<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="className" use="optional" type="xs:string"/>
+			<xs:attribute name="abstract" use="optional" type="xs:string"/>
+			<xs:attribute name="readOnly" use="optional" type="xs:boolean"/>
+			<xs:attribute name="clientClassName" use="optional" type="xs:string"/>
+			<xs:attribute name="clientSuperClassName" use="optional" type="xs:string"/>
+			<xs:attribute name="dbEntityName" use="optional" type="xs:string"/>
+			<xs:attribute name="lock-type" type="xs:string"/>
+			<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="serverOnly" use="optional" type="xs:boolean"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="qualifier" type="xs:string"/>
+
+	<xs:element name="obj-attribute">
+		<xs:complexType>
+			<xs:attribute name="db-attribute-path" use="optional" type="xs:string"/>
+			<xs:attribute name="lock" use="optional" type="xs:boolean"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="type" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="attribute-override">
+		<xs:complexType>
+			<xs:attribute name="db-attribute-path" use="optional" type="xs:string"/>
+			<xs:attribute name="lock" use="optional" type="xs:boolean"/>
+			<xs:attribute name="name" use="optional" type="xs:string"/>
+			<xs:attribute name="type" use="optional" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="db-relationship">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="1" maxOccurs="unbounded" ref="cay:db-attribute-pair"/>
+			</xs:sequence>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="source" use="required" type="xs:string"/>
+			<xs:attribute name="target" use="required" type="xs:string"/>
+			<xs:attribute name="toDependentPK" type="xs:boolean"/>
+			<xs:attribute name="toMany" use="required" type="xs:boolean"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="db-attribute-pair">
+		<xs:complexType>
+			<xs:attribute name="source" use="required" type="xs:string"/>
+			<xs:attribute name="target" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="obj-relationship">
+		<xs:complexType>
+			<xs:attribute name="db-relationship-path" use="required" type="xs:string"/>
+			<xs:attribute name="deleteRule" type="xs:string"/>
+			<xs:attribute name="lock" type="xs:boolean"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="source" use="required" type="xs:string"/>
+			<xs:attribute name="target" use="required" type="xs:string"/>
+			<xs:attribute name="collection-type" use="optional" type="xs:string"/>
+			<xs:attribute name="map-key" use="optional" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="query">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:property"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:sql"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:ejbql"/>
+				<xs:element name="qualifier" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:ordering"/>
+				<xs:element name="prefetch" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+			</xs:sequence>
+			<xs:attribute name="type" use="required" type="xs:string"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="root" use="optional" type="xs:string"/>
+			<xs:attribute name="root-name" use="optional" type="xs:string"/>
+			<xs:attribute name="result-entity" use="optional" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="ordering">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="descending" type="xs:boolean"/>
+					<xs:attribute name="ignore-case" type="xs:boolean"/>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="sql">
+		<xs:annotation>
+			<xs:documentation>Defines arbitrary SQL statement. Note that SQL statement can be customized for different SQL dialects per DbAdapter class. If no adapter-specific statement is found, the one with no adapter label is used by default.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="adapter-class" type="xs:string"/>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="ejbql" type="xs:string"/>
+
+	<xs:element name="property">
+		<xs:annotation>
+			<xs:documentation>A generic property used by other elements.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="value" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="embeddable">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="embeddable-attribute" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" use="required" type="xs:string"/>
+						<xs:attribute name="type" use="required" type="xs:string"/>
+						<xs:attribute name="db-attribute-name" use="required" type="xs:string"/>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="className" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="embedded-attribute">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded"
+					ref="cay:embeddable-attribute-override"/>
+			</xs:sequence>
+			<xs:attribute name="type" use="required" type="xs:string"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="embeddable-attribute-override">
+		<xs:complexType>
+			<xs:attribute name="db-attribute-path" use="required" type="xs:string"/>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="procedure">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded" name="procedure-parameter">
+					<xs:complexType>
+						<xs:attribute name="name" use="required" type="xs:string"/>
+						<xs:attribute name="type" use="required" type="xs:string"/>
+						<xs:attribute name="length" use="optional" type="xs:integer"/>
+						<xs:attribute name="direction" use="required" type="xs:string"/>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="name" use="required" type="xs:string"/>
+			<xs:attribute name="schema" type="xs:string"/>
+			<xs:attribute name="catalog" type="xs:string"/>
+			<xs:attribute name="returningValue" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pre-update">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="post-persist">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="post-update">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="post-add">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pre-persist">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="post-remove">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="post-load">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pre-remove">
+		<xs:complexType>
+			<xs:attribute name="method-name" use="required" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="db-key-generator">
+		<xs:annotation>
+			<xs:documentation>Used to install the Automatic Sequence/Key Generation facility for db-entity. This feature is intended for use with simple (non-compound) integral primary keys.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="db-generator-type" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>Specifies the Key Generation Method that will be employed
+      'ORACLE'               - use Oracle's SEQUENCE
+      'NAMED_SEQUENCE_TABLE' - use USER designated SEQUENCE TABLE. User specifies the name of a DBMS Table with the schema (sequence INT) which will be used to hold sequence values (not supported yet)</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element minOccurs="0" name="db-generator-name" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>For db-generator-type ORACLE this is the name of the ORACLE SEQUENCE to use. The SEQUENCE is assumed to already exist in the Database.
+If this is db-generator-type NAMED_SEQUENCE_TABLE Key Generation, this specifies the name of the SEQUENCE TABLE to use. The NAMED_SEQUENCE_TABLE is assumed to already exist in the database.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element minOccurs="0" name="db-key-cache-size" type="xs:integer">
+					<xs:annotation>
+						<xs:documentation>Size of key cache. For db-generator-type ORACLE , this value MUST match the Oracle SEQUENCE  INCREMENT value.  If there is a mismatch between this value and the Oracle SEQUENCE INCREMENT value, then there will likely be duplicate key problems.
+For db-generator-type NAMED_SEQUENCE_TABLE , this tells how many keys the Container will fetch in a single DBMS call.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/array-type.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/array-type.map.xml b/cayenne-server/src/test/resources/array-type.map.xml
index dcceed0..8cc8f27 100644
--- a/cayenne-server/src/test/resources/array-type.map.xml
+++ b/cayenne-server/src/test/resources/array-type.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.array_type"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/binary-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/binary-pk.map.xml b/cayenne-server/src/test/resources/binary-pk.map.xml
index b4f6153..cd53ff2 100644
--- a/cayenne-server/src/test/resources/binary-pk.map.xml
+++ b/cayenne-server/src/test/resources/binary-pk.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.binary_pk"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
index 9c80f2a..5909898 100644
--- a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
+++ b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="map1"/>
 	<map name="map2"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cay743/map1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/map1.map.xml b/cayenne-server/src/test/resources/cay743/map1.map.xml
index b82860f..d13c6d5 100644
--- a/cayenne-server/src/test/resources/cay743/map1.map.xml
+++ b/cayenne-server/src/test/resources/cay743/map1.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<obj-entity name="Entity11">
 	</obj-entity>
 	<obj-entity name="Entity12" superEntityName="Entity22">

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cay743/map2.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/map2.map.xml b/cayenne-server/src/test/resources/cay743/map2.map.xml
index d635364..43b5d19 100644
--- a/cayenne-server/src/test/resources/cay743/map2.map.xml
+++ b/cayenne-server/src/test/resources/cay743/map2.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<obj-entity name="Entity21" superEntityName="Entity11">
 	</obj-entity>
 	<obj-entity name="Entity22">

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-array-type.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-array-type.xml b/cayenne-server/src/test/resources/cayenne-array-type.xml
index 6b85e55..fdf8c4e 100644
--- a/cayenne-server/src/test/resources/cayenne-array-type.xml
+++ b/cayenne-server/src/test/resources/cayenne-array-type.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="array-type"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-binary-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-binary-pk.xml b/cayenne-server/src/test/resources/cayenne-binary-pk.xml
index 5ca0448..d6d21b2 100644
--- a/cayenne-server/src/test/resources/cayenne-binary-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-binary-pk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="binary-pk"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-compound.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-compound.xml b/cayenne-server/src/test/resources/cayenne-compound.xml
index 1dc56a5..b82d21f 100644
--- a/cayenne-server/src/test/resources/cayenne-compound.xml
+++ b/cayenne-server/src/test/resources/cayenne-compound.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="compound"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-date-time.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-date-time.xml b/cayenne-server/src/test/resources/cayenne-date-time.xml
index f8d47d1..3fda070 100644
--- a/cayenne-server/src/test/resources/cayenne-date-time.xml
+++ b/cayenne-server/src/test/resources/cayenne-date-time.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="date-time"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-delete-rules.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-delete-rules.xml
index 1d8e159..606e583 100644
--- a/cayenne-server/src/test/resources/cayenne-delete-rules.xml
+++ b/cayenne-server/src/test/resources/cayenne-delete-rules.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="delete-rules"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-embeddable.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-embeddable.xml b/cayenne-server/src/test/resources/cayenne-embeddable.xml
index 32ab708..8aa7459 100644
--- a/cayenne-server/src/test/resources/cayenne-embeddable.xml
+++ b/cayenne-server/src/test/resources/cayenne-embeddable.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="embeddable"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-empty.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-empty.xml b/cayenne-server/src/test/resources/cayenne-empty.xml
index e3ed459..3ee43c4 100644
--- a/cayenne-server/src/test/resources/cayenne-empty.xml
+++ b/cayenne-server/src/test/resources/cayenne-empty.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="empty"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-enum.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-enum.xml b/cayenne-server/src/test/resources/cayenne-enum.xml
index a62ba39..df69b89 100644
--- a/cayenne-server/src/test/resources/cayenne-enum.xml
+++ b/cayenne-server/src/test/resources/cayenne-enum.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="enum"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-extended-type.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-extended-type.xml b/cayenne-server/src/test/resources/cayenne-extended-type.xml
index 71ce19f..6c65720 100644
--- a/cayenne-server/src/test/resources/cayenne-extended-type.xml
+++ b/cayenne-server/src/test/resources/cayenne-extended-type.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="extended-type"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-generated.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-generated.xml b/cayenne-server/src/test/resources/cayenne-generated.xml
index e10820d..a880717 100644
--- a/cayenne-server/src/test/resources/cayenne-generated.xml
+++ b/cayenne-server/src/test/resources/cayenne-generated.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="generated"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-generic.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-generic.xml b/cayenne-server/src/test/resources/cayenne-generic.xml
index 4eaaf7b..7dff2a3 100644
--- a/cayenne-server/src/test/resources/cayenne-generic.xml
+++ b/cayenne-server/src/test/resources/cayenne-generic.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="generic"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
index 97c6a53..04b98f6 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="inheritance-single-table1"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
index 00e60dd..7edce8d 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="inheritance-vertical"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-inheritance.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance.xml b/cayenne-server/src/test/resources/cayenne-inheritance.xml
index f6fea51..818c9b2 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="inheritance"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
index b9191a4..79900f9 100644
--- a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
+++ b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="lifecycle-callbacks-order"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-lifecycles.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lifecycles.xml b/cayenne-server/src/test/resources/cayenne-lifecycles.xml
index bcaa2e3..ba6fc19 100644
--- a/cayenne-server/src/test/resources/cayenne-lifecycles.xml
+++ b/cayenne-server/src/test/resources/cayenne-lifecycles.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="lifecycles"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-lob.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lob.xml b/cayenne-server/src/test/resources/cayenne-lob.xml
index f575f1b..dde2a47 100644
--- a/cayenne-server/src/test/resources/cayenne-lob.xml
+++ b/cayenne-server/src/test/resources/cayenne-lob.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="lob"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-locking.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-locking.xml b/cayenne-server/src/test/resources/cayenne-locking.xml
index b58f8fd..1d4f2a5 100644
--- a/cayenne-server/src/test/resources/cayenne-locking.xml
+++ b/cayenne-server/src/test/resources/cayenne-locking.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="locking"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-map-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-map-to-many.xml b/cayenne-server/src/test/resources/cayenne-map-to-many.xml
index f15587b..10709e0 100644
--- a/cayenne-server/src/test/resources/cayenne-map-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-map-to-many.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="map-to-many"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
index 1326169..fe17e9e 100644
--- a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="meaningful-pk"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-misc-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-misc-types.xml b/cayenne-server/src/test/resources/cayenne-misc-types.xml
index 4821482..46adeb2 100644
--- a/cayenne-server/src/test/resources/cayenne-misc-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-misc-types.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="misc-types"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
index b68da04..0723809 100644
--- a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
+++ b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="mixed-persistence-strategy"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-multi-tier.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-multi-tier.xml b/cayenne-server/src/test/resources/cayenne-multi-tier.xml
index afd9699..65f4f51 100644
--- a/cayenne-server/src/test/resources/cayenne-multi-tier.xml
+++ b/cayenne-server/src/test/resources/cayenne-multi-tier.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="multi-tier"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-multinode.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-multinode.xml b/cayenne-server/src/test/resources/cayenne-multinode.xml
index 002aebd..7b23fb5 100644
--- a/cayenne-server/src/test/resources/cayenne-multinode.xml
+++ b/cayenne-server/src/test/resources/cayenne-multinode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="map-db1"/>
 	<map name="map-db2"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-no-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-no-pk.xml b/cayenne-server/src/test/resources/cayenne-no-pk.xml
index 523a90b..2905c89 100644
--- a/cayenne-server/src/test/resources/cayenne-no-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-no-pk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="no-pk"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-numeric-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-numeric-types.xml b/cayenne-server/src/test/resources/cayenne-numeric-types.xml
index 9bc5084..3376ad1 100644
--- a/cayenne-server/src/test/resources/cayenne-numeric-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-numeric-types.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="numeric-types"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
index 74f1cbe..1c23877 100644
--- a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
+++ b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="oneway-rels"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
index 431d9af..19c38f0 100644
--- a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
+++ b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-people.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-people.xml b/cayenne-server/src/test/resources/cayenne-people.xml
index 2909c65..26629b4 100644
--- a/cayenne-server/src/test/resources/cayenne-people.xml
+++ b/cayenne-server/src/test/resources/cayenne-people.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="people"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-persistent.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-persistent.xml b/cayenne-server/src/test/resources/cayenne-persistent.xml
index 4411149..e368c57 100644
--- a/cayenne-server/src/test/resources/cayenne-persistent.xml
+++ b/cayenne-server/src/test/resources/cayenne-persistent.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="persistent"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-primitive.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-primitive.xml b/cayenne-server/src/test/resources/cayenne-primitive.xml
index 8940525..026c75c 100644
--- a/cayenne-server/src/test/resources/cayenne-primitive.xml
+++ b/cayenne-server/src/test/resources/cayenne-primitive.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="primitive"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-qualified.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-qualified.xml b/cayenne-server/src/test/resources/cayenne-qualified.xml
index d82657f..f930615 100644
--- a/cayenne-server/src/test/resources/cayenne-qualified.xml
+++ b/cayenne-server/src/test/resources/cayenne-qualified.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="qualified"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
index 642885a..91cfec5 100644
--- a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
+++ b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="quoted-identifiers"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-reflexive.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-reflexive.xml b/cayenne-server/src/test/resources/cayenne-reflexive.xml
index 389cdcf..e178d26 100644
--- a/cayenne-server/src/test/resources/cayenne-reflexive.xml
+++ b/cayenne-server/src/test/resources/cayenne-reflexive.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="reflexive"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
index 36b039c..4eb8f9a 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="relationships-activity"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
index 4c59d65..d14f075 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-child-master"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
index 88196ad..abaa23d 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-clob"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
index 0398dc7..6df5be0 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-collection-to-many"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
index 6cea4e1..0d9b1e8 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-delete-rules"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
index 7cdccc6..1283c12 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-flattened"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
index 7e92d95..a5331ce 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-set-to-many"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
index d9e563c..b1e77d1 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-to-many-fk"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
index 82dcd6e..c6884b8 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="relationships-to-one-fk"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-relationships.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships.xml b/cayenne-server/src/test/resources/cayenne-relationships.xml
index 24f0c37..a709d2b 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="relationships"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-return-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-return-types.xml b/cayenne-server/src/test/resources/cayenne-return-types.xml
index 95d67fb..b346de0 100644
--- a/cayenne-server/src/test/resources/cayenne-return-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-return-types.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="return-types"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-small-testmap.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-small-testmap.xml b/cayenne-server/src/test/resources/cayenne-small-testmap.xml
index d11cf45..6c7d55b 100644
--- a/cayenne-server/src/test/resources/cayenne-small-testmap.xml
+++ b/cayenne-server/src/test/resources/cayenne-small-testmap.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="small-testmap"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-soft-delete.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-soft-delete.xml b/cayenne-server/src/test/resources/cayenne-soft-delete.xml
index f4a4bdc..860278a 100644
--- a/cayenne-server/src/test/resources/cayenne-soft-delete.xml
+++ b/cayenne-server/src/test/resources/cayenne-soft-delete.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="soft-delete"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-sus.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-sus.xml b/cayenne-server/src/test/resources/cayenne-sus.xml
index b830baf..7031593 100644
--- a/cayenne-server/src/test/resources/cayenne-sus.xml
+++ b/cayenne-server/src/test/resources/cayenne-sus.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="sus-map"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-table-primitives.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-table-primitives.xml b/cayenne-server/src/test/resources/cayenne-table-primitives.xml
index d87ef95..b03ffb9 100644
--- a/cayenne-server/src/test/resources/cayenne-table-primitives.xml
+++ b/cayenne-server/src/test/resources/cayenne-table-primitives.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="table-primitives"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-testmap.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-testmap.xml b/cayenne-server/src/test/resources/cayenne-testmap.xml
index 8253020..3c44022 100644
--- a/cayenne-server/src/test/resources/cayenne-testmap.xml
+++ b/cayenne-server/src/test/resources/cayenne-testmap.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="testmap"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-things.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-things.xml b/cayenne-server/src/test/resources/cayenne-things.xml
index a5e13c0..10f6104 100644
--- a/cayenne-server/src/test/resources/cayenne-things.xml
+++ b/cayenne-server/src/test/resources/cayenne-things.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="things"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-toone.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-toone.xml b/cayenne-server/src/test/resources/cayenne-toone.xml
index f46c8ac..f71983a 100644
--- a/cayenne-server/src/test/resources/cayenne-toone.xml
+++ b/cayenne-server/src/test/resources/cayenne-toone.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="toone"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
index 6de977f..3a6ce3b 100644
--- a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
 	<map name="unsupported-distinct-types"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/cayenne-uuid.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-uuid.xml b/cayenne-server/src/test/resources/cayenne-uuid.xml
index a821d12..f654de9 100644
--- a/cayenne-server/src/test/resources/cayenne-uuid.xml
+++ b/cayenne-server/src/test/resources/cayenne-uuid.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="8">
+<domain project-version="9">
     <map name="uuid"/>
 </domain>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/compound.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/compound.map.xml b/cayenne-server/src/test/resources/compound.map.xml
index f53832b..d4210ab 100644
--- a/cayenne-server/src/test/resources/compound.map.xml
+++ b/cayenne-server/src/test/resources/compound.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/date-time.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/date-time.map.xml b/cayenne-server/src/test/resources/date-time.map.xml
index 69fd0ff..b2d825d 100644
--- a/cayenne-server/src/test/resources/date-time.map.xml
+++ b/cayenne-server/src/test/resources/date-time.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.date_time"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/delete-rules.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/delete-rules.map.xml b/cayenne-server/src/test/resources/delete-rules.map.xml
index 85cf165..62f47aa 100644
--- a/cayenne-server/src/test/resources/delete-rules.map.xml
+++ b/cayenne-server/src/test/resources/delete-rules.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/>
     <property name="clientSupported" value="true"/>
     <property name="defaultClientPackage" value="org.apache.cayenne.testdo.deleterules"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/embeddable.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/embeddable.map.xml b/cayenne-server/src/test/resources/embeddable.map.xml
index 62c245d..84bb4b0 100644
--- a/cayenne-server/src/test/resources/embeddable.map.xml
+++ b/cayenne-server/src/test/resources/embeddable.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
 	<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
 		<embeddable-attribute name="embedded10" type="java.lang.String" db-attribute-name="EMBEDDED10"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/empty.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/empty.map.xml b/cayenne-server/src/test/resources/empty.map.xml
index 7b88c75..89734f3 100644
--- a/cayenne-server/src/test/resources/empty.map.xml
+++ b/cayenne-server/src/test/resources/empty.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <db-entity name="EMPTY">
         <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
     </db-entity>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/enum.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/enum.map.xml b/cayenne-server/src/test/resources/enum.map.xml
index 8f6197c..9a1e9c9 100644
--- a/cayenne-server/src/test/resources/enum.map.xml
+++ b/cayenne-server/src/test/resources/enum.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.enum"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/extended-type.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/extended-type.map.xml b/cayenne-server/src/test/resources/extended-type.map.xml
index e743d0b..3cfea21 100644
--- a/cayenne-server/src/test/resources/extended-type.map.xml
+++ b/cayenne-server/src/test/resources/extended-type.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/generated.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/generated.map.xml b/cayenne-server/src/test/resources/generated.map.xml
index 958a1d0..c3ddf35 100644
--- a/cayenne-server/src/test/resources/generated.map.xml
+++ b/cayenne-server/src/test/resources/generated.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/generic.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/generic.map.xml b/cayenne-server/src/test/resources/generic.map.xml
index 184a91d..a95bbcc 100644
--- a/cayenne-server/src/test/resources/generic.map.xml
+++ b/cayenne-server/src/test/resources/generic.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/>
 	<db-entity name="GENERIC1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
index 865cced..144e407 100644
--- a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/>
 	<db-entity name="GROUP_MEMBERS">
 		<db-attribute name="group_id" type="BIGINT" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/inheritance-vertical.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
index ad8fba4..27b9c9b 100644
--- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_vertical"/>
 	<db-entity name="IV1_ROOT">
 		<db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/inheritance.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance.map.xml b/cayenne-server/src/test/resources/inheritance.map.xml
index a23d40e..df054be 100644
--- a/cayenne-server/src/test/resources/inheritance.map.xml
+++ b/cayenne-server/src/test/resources/inheritance.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/>
     <db-entity name="BASE_ENTITY">
         <db-attribute name="BASE_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
index 78d2594..1afdc32 100644
--- a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
+++ b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/>
     <property name="clientSupported" value="true"/>
     <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/lifecycles.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lifecycles.map.xml b/cayenne-server/src/test/resources/lifecycles.map.xml
index 62c902a..098b4c5 100644
--- a/cayenne-server/src/test/resources/lifecycles.map.xml
+++ b/cayenne-server/src/test/resources/lifecycles.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/>
     <property name="clientSupported" value="true"/>
     <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycles"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/lob.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lob.map.xml b/cayenne-server/src/test/resources/lob.map.xml
index 3ae8644..e797df7 100644
--- a/cayenne-server/src/test/resources/lob.map.xml
+++ b/cayenne-server/src/test/resources/lob.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/locking.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/locking.map.xml b/cayenne-server/src/test/resources/locking.map.xml
index 9b84cf3..9092352 100644
--- a/cayenne-server/src/test/resources/locking.map.xml
+++ b/cayenne-server/src/test/resources/locking.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/>
 	<db-entity name="LOCKING_HELPER">
 		<db-attribute name="LOCKING_HELPER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/map-db1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-db1.map.xml b/cayenne-server/src/test/resources/map-db1.map.xml
index eb0f60e..7d1ef52 100644
--- a/cayenne-server/src/test/resources/map-db1.map.xml
+++ b/cayenne-server/src/test/resources/map-db1.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/>
 	<db-entity name="CROSSDB_M1E1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/map-db2.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-db2.map.xml b/cayenne-server/src/test/resources/map-db2.map.xml
index fa3fcc8..ebe3163 100644
--- a/cayenne-server/src/test/resources/map-db2.map.xml
+++ b/cayenne-server/src/test/resources/map-db2.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/>
 	<db-entity name="CROSSDB_M2E1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/map-to-many.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-to-many.map.xml b/cayenne-server/src/test/resources/map-to-many.map.xml
index d3099da..99dce4d 100644
--- a/cayenne-server/src/test/resources/map-to-many.map.xml
+++ b/cayenne-server/src/test/resources/map-to-many.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/>
     <property name="clientSupported" value="true"/>
     <property name="defaultClientPackage" value="org.apache.cayenne.testdo.map_to_many"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/meaningful-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/meaningful-pk.map.xml b/cayenne-server/src/test/resources/meaningful-pk.map.xml
index 3172f04..ca41207 100644
--- a/cayenne-server/src/test/resources/meaningful-pk.map.xml
+++ b/cayenne-server/src/test/resources/meaningful-pk.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/>
     <property name="clientSupported" value="true"/>
     <property name="defaultClientPackage" value="org.apache.cayenne.testdo.meaningful_pk"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/misc-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/misc-types.map.xml b/cayenne-server/src/test/resources/misc-types.map.xml
index be79dd6..616ab44 100644
--- a/cayenne-server/src/test/resources/misc-types.map.xml
+++ b/cayenne-server/src/test/resources/misc-types.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.misc_types"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
index ca9045e..d800e13 100644
--- a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
+++ b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.mixed_persistence_strategy"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/multi-tier.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/multi-tier.map.xml b/cayenne-server/src/test/resources/multi-tier.map.xml
index 7511ab8..016fc58 100644
--- a/cayenne-server/src/test/resources/multi-tier.map.xml
+++ b/cayenne-server/src/test/resources/multi-tier.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.mt"/>
 	<property name="clientSupported" value="true"/>
 	<property name="defaultClientPackage" value="org.apache.cayenne.testdo.mt"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/no-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/no-pk.map.xml b/cayenne-server/src/test/resources/no-pk.map.xml
index 618cbfc..37f913a 100644
--- a/cayenne-server/src/test/resources/no-pk.map.xml
+++ b/cayenne-server/src/test/resources/no-pk.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.no_pk"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/numeric-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/numeric-types.map.xml b/cayenne-server/src/test/resources/numeric-types.map.xml
index 4e44409..179add2 100644
--- a/cayenne-server/src/test/resources/numeric-types.map.xml
+++ b/cayenne-server/src/test/resources/numeric-types.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-          project-version="8">
+          xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+          project-version="9">
     <property name="defaultPackage" value="org.apache.cayenne.testdo.numeric_types"/>
     <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
     <property name="clientSupported" value="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/oneway-rels.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/oneway-rels.map.xml b/cayenne-server/src/test/resources/oneway-rels.map.xml
index 626fa8b..9ce6d58 100644
--- a/cayenne-server/src/test/resources/oneway-rels.map.xml
+++ b/cayenne-server/src/test/resources/oneway-rels.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.oneway"/>
 	<db-entity name="oneway_table1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/f72210cc/cayenne-server/src/test/resources/people.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/people.map.xml b/cayenne-server/src/test/resources/people.map.xml
index 68fcb7b..c62eeed 100644
--- a/cayenne-server/src/test/resources/people.map.xml
+++ b/cayenne-server/src/test/resources/people.map.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
-	 project-version="8">
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+	 project-version="9">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_people"/>
 	<db-entity name="ADDRESS">
 		<db-attribute name="ADDRESS_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>