cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1584674 - in /cayenne/main/trunk/cayenne-server/src/test/resources: cayenne-relationships.xml cayenne-testmap.xml relationships.map.xml relationships1.map.xml tstmap.map.xml
Date Fri, 04 Apr 2014 13:41:27 GMT
Author: aadamchik
Date: Fri Apr  4 13:41:26 2014
New Revision: 1584674

URL: http://svn.apache.org/r1584674
Log:
upgrading map to v7.. additional cleanup

Modified:
    cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-relationships.xml
    cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml
    cayenne/main/trunk/cayenne-server/src/test/resources/relationships.map.xml
    cayenne/main/trunk/cayenne-server/src/test/resources/relationships1.map.xml
    cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-relationships.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-relationships.xml?rev=1584674&r1=1584673&r2=1584674&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-relationships.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-relationships.xml Fri Apr
 4 13:41:26 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
 	<map name="relationships"/>
 	<map name="relationships1"/>
 </domain>

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml?rev=1584674&r1=1584673&r2=1584674&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/cayenne-testmap.xml Fri Apr  4 13:41:26
2014
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="7">
 	<map name="tstmap"/>
 </domain>

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/relationships.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/relationships.map.xml?rev=1584674&r1=1584673&r2=1584674&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/relationships.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/relationships.map.xml Fri Apr  4
13:41:26 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.relationship"/>
 	<db-entity name="CHILD">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/relationships1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/relationships1.map.xml?rev=1584674&r1=1584673&r2=1584674&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/relationships1.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/relationships1.map.xml Fri Apr  4
13:41:26 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.r1"/>
 	<db-entity name="ACTIVITY">
 		<db-attribute name="ACTIVITY_ID" type="VARCHAR" isPrimaryKey="true" isMandatory="true"
length="50"/>

Modified: cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml?rev=1584674&r1=1584673&r2=1584674&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml (original)
+++ cayenne/main/trunk/cayenne-server/src/test/resources/tstmap.map.xml Fri Apr  4 13:41:26
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"/>
@@ -127,9 +127,9 @@
 		<db-attribute name="CLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 	</db-entity>
 	<db-entity name="CLOB_TEST_RELATION">
+		<db-attribute name="CVALUE" type="INTEGER"/>
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="ID_CLOB" type="INTEGER" isMandatory="true"/>
-		<db-attribute name="CVALUE" type="INTEGER"/>
 	</db-entity>
 	<db-entity name="COMPOUND_FK_TEST">
 		<db-attribute name="F_KEY1" type="VARCHAR" length="20"/>
@@ -795,7 +795,7 @@
 		<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
 		<ejbql><![CDATA[select a from Artist a]]></ejbql>
 	</query>
-	<query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="testmap">
+	<query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="tstmap">
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
 		<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
 VALUES (512, 'No Painting Like This', 12.5)]]></sql>
@@ -805,7 +805,7 @@ VALUES (512, 'No Painting Like This', 12
 		<qualifier><![CDATA[toArtist = $artist]]></qualifier>
 		<ordering><![CDATA[paintingTitle]]></ordering>
 	</query>
-	<query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="testmap">
+	<query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="tstmap">
 		<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
 VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
 		<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO
PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title),
#bind($price))]]></sql>
@@ -836,31 +836,31 @@ VALUES (#bind($id), #bind($title), #bind
 	<query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder"
root="obj-entity" root-name="Artist">
 		<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
 	</query>
-	<query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="testmap">
+	<query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
 		<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
 	</query>
-	<query name="SelectReturnTypesLobsMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="testmap">
+	<query name="SelectReturnTypesLobsMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<sql><![CDATA[SELECT * FROM TYPES_MAPPING_LOBS_TEST1]]></sql>
 	</query>
-	<query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="testmap">
+	<query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
 		<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
 	</query>
-	<query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="testmap">
+	<query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder"
root="data-map" root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
 		<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
 	</query>
-	<query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="testmap">
+	<query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
 		<sql><![CDATA[select * from ARTIST]]></sql>
 	</query>
-	<query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="testmap">
+	<query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map"
root-name="tstmap">
 		<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
 		<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
 		<sql><![CDATA[select * from ARTIST]]></sql>



Mime
View raw message