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 2014/04/05 15:27:05 UTC
svn commit: r1585093 - in
/cayenne/main/trunk/cayenne-server/src/test/resources: ./ cay743/
Author: aadamchik
Date: Sat Apr 5 13:27:04 2014
New Revision: 1585093
URL: http://svn.apache.org/r1585093
Log:
upgrading test project to v7
Modified:
cayenne/main/trunk/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map1.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map2.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-default.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-locking.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-multinode.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-small-testmap.xml
cayenne/main/trunk/cayenne-server/src/test/resources/embeddable.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/generic.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-vertical.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/map-db1.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/map-db2.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/qualified.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/quoted-identifiers.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/small-testmap.map.xml
cayenne/main/trunk/cayenne-server/src/test/resources/sus-map.map.xml
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cay743/cayenne-domain.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cay743/cayenne-domain.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cay743/cayenne-domain.xml Sat Apr 5 13:27:04 2014
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="map1"/>
<map name="map2"/>
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map1.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map1.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map1.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<obj-entity name="Entity11">
</obj-entity>
<obj-entity name="Entity12" superEntityName="Entity22">
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map2.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map2.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map2.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cay743/map2.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<obj-entity name="Entity21" superEntityName="Entity11">
</obj-entity>
<obj-entity name="Entity22">
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-default.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-default.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-default.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-default.xml Sat Apr 5 13:27:04 2014
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="embeddable"/>
<map name="generic"/>
<map name="qualified"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml Sat Apr 5 13:27:04 2014
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="inheritance-single-table1"/>
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml Sat Apr 5 13:27:04 2014
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="inheritance-vertical"/>
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-locking.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-locking.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-locking.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-locking.xml Sat Apr 5 13:27:04 2014
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="locking"/>
</domain>
-
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-multinode.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-multinode.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-multinode.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-multinode.xml Sat Apr 5 13:27:04 2014
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="map-db1"/>
<map name="map-db2"/>
</domain>
-
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml Sat Apr 5 13:27:04 2014
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
-
+<domain project-version="7">
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml Sat Apr 5 13:27:04 2014
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="quoted-identifiers"/>
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-small-testmap.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-small-testmap.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-small-testmap.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-small-testmap.xml Sat Apr 5 13:27:04 2014
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
<map name="small-testmap"/>
</domain>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/embeddable.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/embeddable.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/embeddable.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/embeddable.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<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"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/generic.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/generic.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/generic.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/generic.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/>
<db-entity name="GENERIC1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-single-table1.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-single-table1.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-single-table1.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/>
<db-entity name="GROUP_MEMBERS">
<db-attribute name="group_id" type="BIGINT" isMandatory="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-vertical.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-vertical.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-vertical.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/inheritance-vertical.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance.vertical"/>
<db-entity name="IV1_ROOT">
<db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/locking.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/>
<db-entity name="DATE_LOCKING_TEST">
<db-attribute name="DATE_LOCK" type="DATE"/>
@@ -26,8 +26,8 @@
</db-entity>
<db-entity name="SOFT_DELETE">
<db-attribute name="DELETED" type="BOOLEAN"/>
- <db-attribute name="NAME" type="VARCHAR" length="100"/>
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="NAME" type="VARCHAR" length="100"/>
<qualifier><![CDATA[DELETED = false]]></qualifier>
</db-entity>
<db-entity name="TIME_LOCKING_TEST">
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/map-db1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/map-db1.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/map-db1.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/map-db1.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/>
<db-entity name="CROSSDB_M1E1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/map-db2.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/map-db2.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/map-db2.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/map-db2.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/>
<db-entity name="CROSSDB_M2E1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/qualified.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/qualified.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/qualified.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/qualified.map.xml Sat Apr 5 13:27:04 2014
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.qualified"/>
- <property name="quoteSqlIdentifiers" value="true"/>
+ <property name="quoteSqlIdentifiers" value="true"/>
<db-entity name="TEST_QUALIFIED1">
<db-attribute name="DELETED" type="BOOLEAN"/>
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/quoted-identifiers.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/quoted-identifiers.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/quoted-identifiers.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/quoted-identifiers.map.xml Sat Apr 5 13:27:04 2014
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.quotemap"/>
<property name="quoteSqlIdentifiers" value="true"/>
- <property name="quoteSqlIdentifiers" value="true"/>
<db-entity name="QUOTED_ADDRESS">
<db-attribute name="ADDRESS ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="City" type="VARCHAR" length="200"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/small-testmap.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/small-testmap.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/small-testmap.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/small-testmap.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
Modified: cayenne/main/trunk/cayenne-server/src/test/resources/sus-map.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/sus-map.map.xml?rev=1585093&r1=1585092&r2=1585093&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/sus-map.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/sus-map.map.xml Sat Apr 5 13:27:04 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
<db-entity name="SUS1">
<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="strNoMandatory" type="VARCHAR" length="200"/>