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 2010/06/13 00:45:43 UTC
svn commit: r954144 [9/9] - in /cayenne/main/trunk:
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/
build-tools/cayenne-test-utilities/src/main/jav...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.SimpleIdIncrementalFaultListTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.SimpleIdIncrementalFaultListTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.SimpleIdIncrementalFaultListTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.SimpleIdIncrementalFaultListTest.xml Sat Jun 12 22:45:31 2010
@@ -6,151 +6,151 @@
<!-- Named Queries -->
<!-- ======================================= -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
</value></constructor-arg>
</bean>
<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
</value></constructor-arg>
</bean>
<bean id="A3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'artist3')
</value></constructor-arg>
</bean>
<bean id="A4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'artist4')
</value></constructor-arg>
</bean>
<bean id="A5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33005, 'artist5')
</value></constructor-arg>
</bean>
<bean id="A6" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33006, 'artist6')
</value></constructor-arg>
</bean>
<bean id="A7" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33007, 'artist7')
</value></constructor-arg>
</bean>
<bean id="A8" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33008, 'artist8')
</value></constructor-arg>
</bean>
<bean id="A9" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33009, 'artist9')
</value></constructor-arg>
</bean>
<bean id="A10" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33010, 'artist10')
</value></constructor-arg>
</bean>
<bean id="A11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33011, 'artist11')
</value></constructor-arg>
</bean>
<bean id="A12" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33012, 'artist12')
</value></constructor-arg>
</bean>
<bean id="A13" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33013, 'artist13')
</value></constructor-arg>
</bean>
<bean id="A14" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33014, 'artist14')
</value></constructor-arg>
</bean>
<bean id="A15" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33015, 'artist15')
</value></constructor-arg>
</bean>
<bean id="A16" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33016, 'artist16')
</value></constructor-arg>
</bean>
<bean id="A17" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33017, 'artist17')
</value></constructor-arg>
</bean>
<bean id="A18" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33018, 'artist18')
</value></constructor-arg>
</bean>
<bean id="A19" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33019, 'artist19')
</value></constructor-arg>
</bean>
<bean id="A20" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33020, 'artist20')
</value></constructor-arg>
</bean>
<bean id="A21" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33021, 'artist21')
</value></constructor-arg>
</bean>
<bean id="A22" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33022, 'artist22')
</value></constructor-arg>
</bean>
<bean id="A23" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33023, 'artist23')
</value></constructor-arg>
</bean>
<bean id="A24" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33024, 'artist24')
</value></constructor-arg>
</bean>
<bean id="A25" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33025, 'artist25')
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/merge.MergeCase.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/merge.MergeCase.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/merge.MergeCase.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/merge.MergeCase.xml Sat Jun 12 22:45:31 2010
@@ -5,14 +5,14 @@
<!-- ARTIST -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
</value></constructor-arg>
</bean>
<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/query.SelectQueryFetchLimitOrderingTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/query.SelectQueryFetchLimitOrderingTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/query.SelectQueryFetchLimitOrderingTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/query.SelectQueryFetchLimitOrderingTest.xml Sat Jun 12 22:45:31 2010
@@ -8,42 +8,42 @@
<!-- ARTIST -->
<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'c')
</value></constructor-arg>
</bean>
<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'b')
</value></constructor-arg>
</bean>
<bean id="A3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'f')
</value></constructor-arg>
</bean>
<bean id="A4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'd')
</value></constructor-arg>
</bean>
<bean id="A5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33005, 'a')
</value></constructor-arg>
</bean>
<bean id="A6" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.Artist</value></constructor-arg>
<constructor-arg><value>
insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33006, 'e')
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/reflect.MixedPersistenceStrategyTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/reflect.MixedPersistenceStrategyTest.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/reflect.MixedPersistenceStrategyTest.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/reflect.MixedPersistenceStrategyTest.xml Sat Jun 12 22:45:31 2010
@@ -7,21 +7,21 @@
<!-- ======================================= -->
<bean id="M11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.MixedPersistenceStrategy</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy</value></constructor-arg>
<constructor-arg><value>
insert into MIXED_PERSISTENCE_STRATEGY (ID, DESCRIPTION, NAME) values (1, 'd1', 'n1')
</value></constructor-arg>
</bean>
<bean id="M21" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.MixedPersistenceStrategy2</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2</value></constructor-arg>
<constructor-arg><value>
insert into MIXED_PERSISTENCE_STRATEGY2 (ID, MASTER_ID, NAME) values (1, 1, 'dn1')
</value></constructor-arg>
</bean>
<bean id="M22" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
- <constructor-arg type="java.lang.Class"><value>org.apache.art.MixedPersistenceStrategy2</value></constructor-arg>
+ <constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2</value></constructor-arg>
<constructor-arg><value>
insert into MIXED_PERSISTENCE_STRATEGY2 (ID, MASTER_ID, NAME) values (2, 1, 'dn2')
</value></constructor-arg>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml Sat Jun 12 22:45:31 2010
@@ -3,7 +3,7 @@
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">
- <property name="defaultPackage" value="org.apache.art"/>
+ <property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="test.client"/>
@@ -277,23 +277,23 @@
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="UUID" type="VARCHAR" length="100"/>
</db-entity>
- <obj-entity name="ArraysEntity" className="org.apache.art.ArraysEntity" dbEntityName="ARRAYS_ENTITY">
+ <obj-entity name="ArraysEntity" className="org.apache.cayenne.testdo.testmap.ArraysEntity" dbEntityName="ARRAYS_ENTITY">
<obj-attribute name="byteArray" type="byte[]" db-attribute-path="BYTE_ARRAY"/>
<obj-attribute name="byteWrapperArray" type="java.lang.Byte[]" db-attribute-path="BYTE_WRAPPER_ARRAY"/>
<obj-attribute name="charArray" type="char[]" db-attribute-path="CHAR_ARRAY"/>
<obj-attribute name="charWrapperArray" type="java.lang.Character[]" db-attribute-path="CHAR_WRAPPER_ARRAY"/>
</obj-entity>
- <obj-entity name="ArtGroup" className="org.apache.art.ArtGroup" dbEntityName="ARTGROUP">
+ <obj-entity name="ArtGroup" className="org.apache.cayenne.testdo.testmap.ArtGroup" dbEntityName="ARTGROUP">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="Artist" className="org.apache.art.Artist" dbEntityName="ARTIST">
+ <obj-entity name="Artist" className="org.apache.cayenne.testdo.testmap.Artist" dbEntityName="ARTIST">
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
</obj-entity>
- <obj-entity name="ArtistCallbackTest" className="org.apache.art.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
+ <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
<obj-attribute name="artistName" type="java.lang.String"/>
<obj-attribute name="dateOfBirth" type="java.util.Date"/>
- <entity-listener class="org.apache.art.EntityListenerObjEntity">
+ <entity-listener class="org.apache.cayenne.testdo.testmap.EntityListenerObjEntity">
<post-add method-name="prePersistEntityListener"/>
<post-persist method-name="postPersistEntityListener"/>
<pre-update method-name="preUpdateEntityListener"/>
@@ -310,167 +310,167 @@
<post-remove method-name="postRemoveEntityObjEntity"/>
<post-load method-name="postLoadEntityObjEntity"/>
</obj-entity>
- <obj-entity name="ArtistExhibit" className="org.apache.art.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT">
+ <obj-entity name="ArtistExhibit" className="org.apache.cayenne.testdo.testmap.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT">
</obj-entity>
- <obj-entity name="BigDecimalEntity" className="org.apache.art.BigDecimalEntity" dbEntityName="BIGDECIMAL_ENTITY">
+ <obj-entity name="BigDecimalEntity" className="org.apache.cayenne.testdo.testmap.BigDecimalEntity" dbEntityName="BIGDECIMAL_ENTITY">
<obj-attribute name="bigDecimalField" type="java.math.BigDecimal" db-attribute-path="BIGDECIMAL_FIELD"/>
</obj-entity>
- <obj-entity name="BigIntegerEntity" className="org.apache.art.BigIntegerEntity" dbEntityName="BIGINTEGER_ENTITY">
+ <obj-entity name="BigIntegerEntity" className="org.apache.cayenne.testdo.testmap.BigIntegerEntity" dbEntityName="BIGINTEGER_ENTITY">
<obj-attribute name="bigIntegerField" type="java.math.BigInteger" db-attribute-path="BIG_INTEGER_FIELD"/>
</obj-entity>
- <obj-entity name="BinaryPKTest1" className="org.apache.art.BinaryPKTest1" dbEntityName="BINARY_PK_TEST1">
+ <obj-entity name="BinaryPKTest1" className="org.apache.cayenne.testdo.testmap.BinaryPKTest1" dbEntityName="BINARY_PK_TEST1">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="BinaryPKTest2" className="org.apache.art.BinaryPKTest2" dbEntityName="BINARY_PK_TEST2">
+ <obj-entity name="BinaryPKTest2" className="org.apache.cayenne.testdo.testmap.BinaryPKTest2" dbEntityName="BINARY_PK_TEST2">
<obj-attribute name="detailName" type="java.lang.String" db-attribute-path="DETAIL_NAME"/>
</obj-entity>
- <obj-entity name="BitNumberTestEntity" className="org.apache.art.BitNumberTestEntity" dbEntityName="BIT_TEST">
+ <obj-entity name="BitNumberTestEntity" className="org.apache.cayenne.testdo.testmap.BitNumberTestEntity" dbEntityName="BIT_TEST">
<obj-attribute name="bitColumn" type="java.lang.Integer" db-attribute-path="BIT_COLUMN"/>
</obj-entity>
- <obj-entity name="BitTestEntity" className="org.apache.art.BitTestEntity" dbEntityName="BIT_TEST">
+ <obj-entity name="BitTestEntity" className="org.apache.cayenne.testdo.testmap.BitTestEntity" dbEntityName="BIT_TEST">
<obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/>
</obj-entity>
- <obj-entity name="BlobTestEntity" className="org.apache.art.BlobTestEntity" dbEntityName="BLOB_TEST">
+ <obj-entity name="BlobTestEntity" className="org.apache.cayenne.testdo.testmap.BlobTestEntity" dbEntityName="BLOB_TEST">
<obj-attribute name="blobCol" type="byte[]" db-attribute-path="BLOB_COL"/>
</obj-entity>
- <obj-entity name="BooleanTestEntity" className="org.apache.art.BooleanTestEntity" dbEntityName="BOOLEAN_TEST">
+ <obj-entity name="BooleanTestEntity" className="org.apache.cayenne.testdo.testmap.BooleanTestEntity" dbEntityName="BOOLEAN_TEST">
<obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/>
</obj-entity>
- <obj-entity name="CalendarEntity" className="org.apache.art.CalendarEntity" dbEntityName="CALENDAR_TEST">
+ <obj-entity name="CalendarEntity" className="org.apache.cayenne.testdo.testmap.CalendarEntity" dbEntityName="CALENDAR_TEST">
<obj-attribute name="calendarField" type="java.util.Calendar" db-attribute-path="CALENDAR_FIELD"/>
</obj-entity>
- <obj-entity name="CharFkTestEntity" className="org.apache.art.CharFkTestEntity" dbEntityName="CHAR_FK_TEST">
+ <obj-entity name="CharFkTestEntity" className="org.apache.cayenne.testdo.testmap.CharFkTestEntity" dbEntityName="CHAR_FK_TEST">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="CharPkTestEntity" className="org.apache.art.CharPkTestEntity" dbEntityName="CHAR_PK_TEST">
+ <obj-entity name="CharPkTestEntity" className="org.apache.cayenne.testdo.testmap.CharPkTestEntity" dbEntityName="CHAR_PK_TEST">
<obj-attribute name="otherCol" type="java.lang.String" db-attribute-path="OTHER_COL"/>
<obj-attribute name="pkCol" type="java.lang.String" db-attribute-path="PK_COL"/>
</obj-entity>
- <obj-entity name="CharacterEntity" className="org.apache.art.CharacterEntity" dbEntityName="CHARACTER_ENTITY">
+ <obj-entity name="CharacterEntity" className="org.apache.cayenne.testdo.testmap.CharacterEntity" dbEntityName="CHARACTER_ENTITY">
<obj-attribute name="characterField" type="java.lang.Character" db-attribute-path="CHARACTER_FIELD"/>
</obj-entity>
- <obj-entity name="ClobTestEntity" className="org.apache.art.ClobTestEntity" dbEntityName="CLOB_TEST">
+ <obj-entity name="ClobTestEntity" className="org.apache.cayenne.testdo.testmap.ClobTestEntity" dbEntityName="CLOB_TEST">
<obj-attribute name="clobCol" type="java.lang.String" db-attribute-path="CLOB_COL"/>
</obj-entity>
- <obj-entity name="ClobTestRelation" className="org.apache.art.ClobTestRelation" dbEntityName="CLOB_TEST_RELATION">
+ <obj-entity name="ClobTestRelation" className="org.apache.cayenne.testdo.testmap.ClobTestRelation" dbEntityName="CLOB_TEST_RELATION">
<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="ID"/>
<obj-attribute name="value" type="java.lang.Integer" db-attribute-path="VALUE"/>
</obj-entity>
- <obj-entity name="CompoundFkTestEntity" className="org.apache.art.CompoundFkTestEntity" dbEntityName="COMPOUND_FK_TEST">
+ <obj-entity name="CompoundFkTestEntity" className="org.apache.cayenne.testdo.testmap.CompoundFkTestEntity" dbEntityName="COMPOUND_FK_TEST">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="CompoundPainting" className="org.apache.art.CompoundPainting" dbEntityName="PAINTING">
+ <obj-entity name="CompoundPainting" className="org.apache.cayenne.testdo.testmap.CompoundPainting" dbEntityName="PAINTING">
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="toArtist.ARTIST_NAME"/>
<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="galleryName" type="java.lang.String" db-attribute-path="toGallery.GALLERY_NAME"/>
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
<obj-attribute name="textReview" type="java.lang.String" db-attribute-path="toPaintingInfo.TEXT_REVIEW"/>
</obj-entity>
- <obj-entity name="CompoundPkTestEntity" className="org.apache.art.CompoundPkTestEntity" dbEntityName="COMPOUND_PK_TEST">
+ <obj-entity name="CompoundPkTestEntity" className="org.apache.cayenne.testdo.testmap.CompoundPkTestEntity" dbEntityName="COMPOUND_PK_TEST">
<obj-attribute name="key1" type="java.lang.String" db-attribute-path="KEY1"/>
<obj-attribute name="key2" type="java.lang.String" db-attribute-path="KEY2"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="DateTestEntity" className="org.apache.art.DateTestEntity" dbEntityName="DATE_TEST">
+ <obj-entity name="DateTestEntity" className="org.apache.cayenne.testdo.testmap.DateTestEntity" dbEntityName="DATE_TEST">
<obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/>
<obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/>
<obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/>
</obj-entity>
- <obj-entity name="DecimalPKTest1" className="org.apache.art.DecimalPKTest1" dbEntityName="DECIMAL_PK_TST">
+ <obj-entity name="DecimalPKTest1" className="org.apache.cayenne.testdo.testmap.DecimalPKTest1" dbEntityName="DECIMAL_PK_TST">
<obj-attribute name="decimalPK" type="java.lang.Double" db-attribute-path="DECIMAL_PK"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="DecimalPKTestEntity" className="org.apache.art.DecimalPKTestEntity" dbEntityName="DECIMAL_PK_TST">
+ <obj-entity name="DecimalPKTestEntity" className="org.apache.cayenne.testdo.testmap.DecimalPKTestEntity" dbEntityName="DECIMAL_PK_TST">
<obj-attribute name="decimalPK" type="java.math.BigDecimal" db-attribute-path="DECIMAL_PK"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="EnumEntity" className="org.apache.art.EnumEntity" dbEntityName="ENUM_ENTITY">
- <obj-attribute name="enumAttribute" type="org.apache.art.Enum1" db-attribute-path="ENUM_ATTRIBUTE"/>
+ <obj-entity name="EnumEntity" className="org.apache.cayenne.testdo.testmap.EnumEntity" dbEntityName="ENUM_ENTITY">
+ <obj-attribute name="enumAttribute" type="org.apache.cayenne.testdo.testmap.Enum1" db-attribute-path="ENUM_ATTRIBUTE"/>
</obj-entity>
- <obj-entity name="Exhibit" className="org.apache.art.Exhibit" dbEntityName="EXHIBIT">
+ <obj-entity name="Exhibit" className="org.apache.cayenne.testdo.testmap.Exhibit" dbEntityName="EXHIBIT">
<obj-attribute name="closingDate" type="java.util.Date" db-attribute-path="CLOSING_DATE"/>
<obj-attribute name="openingDate" type="java.util.Date" db-attribute-path="OPENING_DATE"/>
</obj-entity>
- <obj-entity name="ExtendedTypeEntity" className="org.apache.art.ExtendedTypeEntity" dbEntityName="EXTENDED_TYPE_TEST">
- <obj-attribute name="name" type="org.apache.art.StringET1" db-attribute-path="NAME"/>
+ <obj-entity name="ExtendedTypeEntity" className="org.apache.cayenne.testdo.testmap.ExtendedTypeEntity" dbEntityName="EXTENDED_TYPE_TEST">
+ <obj-attribute name="name" type="org.apache.cayenne.testdo.testmap.StringET1" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="Gallery" className="org.apache.art.Gallery" dbEntityName="GALLERY">
+ <obj-entity name="Gallery" className="org.apache.cayenne.testdo.testmap.Gallery" dbEntityName="GALLERY">
<obj-attribute name="galleryName" type="java.lang.String" db-attribute-path="GALLERY_NAME"/>
</obj-entity>
- <obj-entity name="GeneratedColumnCompKey" className="org.apache.art.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY">
+ <obj-entity name="GeneratedColumnCompKey" className="org.apache.cayenne.testdo.testmap.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedColumnCompMaster" className="org.apache.art.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M">
+ <obj-entity name="GeneratedColumnCompMaster" className="org.apache.cayenne.testdo.testmap.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedColumnDep" className="org.apache.art.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP">
+ <obj-entity name="GeneratedColumnDep" className="org.apache.cayenne.testdo.testmap.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedColumnTest2" className="org.apache.art.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2">
+ <obj-entity name="GeneratedColumnTest2" className="org.apache.cayenne.testdo.testmap.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedColumnTestEntity" className="org.apache.art.GeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST">
+ <obj-entity name="GeneratedColumnTestEntity" className="org.apache.cayenne.testdo.testmap.GeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedF1" className="org.apache.art.GeneratedF1" clientClassName="test.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
+ <obj-entity name="GeneratedF1" className="org.apache.cayenne.testdo.testmap.GeneratedF1" clientClassName="test.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
</obj-entity>
- <obj-entity name="GeneratedF2" className="org.apache.art.GeneratedF2" clientClassName="test.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
+ <obj-entity name="GeneratedF2" className="org.apache.cayenne.testdo.testmap.GeneratedF2" clientClassName="test.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
</obj-entity>
- <obj-entity name="LongEntity" className="org.apache.art.LongEntity" dbEntityName="LONG_ENTITY">
+ <obj-entity name="LongEntity" className="org.apache.cayenne.testdo.testmap.LongEntity" dbEntityName="LONG_ENTITY">
<obj-attribute name="longField" type="java.lang.Long" db-attribute-path="LONG_FIELD"/>
</obj-entity>
- <obj-entity name="MeaningfulGeneratedColumnTestEntity" className="org.apache.art.MeaningfulGeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST">
+ <obj-entity name="MeaningfulGeneratedColumnTestEntity" className="org.apache.cayenne.testdo.testmap.MeaningfulGeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST">
<obj-attribute name="generatedColumn" type="java.lang.Integer" db-attribute-path="GENERATED_COLUMN"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="MeaningfulPKDep" className="org.apache.art.MeaningfulPKDep" dbEntityName="MEANINGFUL_PK_DEP">
+ <obj-entity name="MeaningfulPKDep" className="org.apache.cayenne.testdo.testmap.MeaningfulPKDep" dbEntityName="MEANINGFUL_PK_DEP">
<obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/>
</obj-entity>
- <obj-entity name="MeaningfulPKTest1" className="org.apache.art.MeaningfulPKTest1" dbEntityName="MEANINGFUL_PK_TEST1">
+ <obj-entity name="MeaningfulPKTest1" className="org.apache.cayenne.testdo.testmap.MeaningfulPKTest1" dbEntityName="MEANINGFUL_PK_TEST1">
<obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/>
<obj-attribute name="pkAttribute" type="java.lang.Integer" db-attribute-path="PK_ATTRIBUTE"/>
</obj-entity>
- <obj-entity name="MixedPersistenceStrategy" className="org.apache.art.MixedPersistenceStrategy" dbEntityName="MIXED_PERSISTENCE_STRATEGY">
+ <obj-entity name="MixedPersistenceStrategy" className="org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy" dbEntityName="MIXED_PERSISTENCE_STRATEGY">
<obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="MixedPersistenceStrategy2" className="org.apache.art.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2">
+ <obj-entity name="MixedPersistenceStrategy2" className="org.apache.cayenne.testdo.testmap.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="NoPkTestEntity" className="org.apache.art.NoPkTestEntity" dbEntityName="NO_PK_TEST">
+ <obj-entity name="NoPkTestEntity" className="org.apache.cayenne.testdo.testmap.NoPkTestEntity" dbEntityName="NO_PK_TEST">
<obj-attribute name="attribute1" type="java.lang.Integer" db-attribute-path="ATTRIBUTE1"/>
</obj-entity>
- <obj-entity name="Painting" className="org.apache.art.Painting" dbEntityName="PAINTING" superClassName="org.apache.art.ArtDataObject">
+ <obj-entity name="Painting" className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING" superClassName="org.apache.cayenne.testdo.testmap.ArtDataObject">
<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingDescription" type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/>
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
</obj-entity>
- <obj-entity name="Painting1" className="org.apache.art.Painting1" dbEntityName="PAINTING1">
+ <obj-entity name="Painting1" className="org.apache.cayenne.testdo.testmap.Painting1" dbEntityName="PAINTING1">
<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
</obj-entity>
- <obj-entity name="PaintingInfo" className="org.apache.art.PaintingInfo" dbEntityName="PAINTING_INFO">
+ <obj-entity name="PaintingInfo" className="org.apache.cayenne.testdo.testmap.PaintingInfo" dbEntityName="PAINTING_INFO">
<obj-attribute name="imageBlob" type="byte[]" db-attribute-path="IMAGE_BLOB"/>
<obj-attribute name="textReview" type="java.lang.String" db-attribute-path="TEXT_REVIEW"/>
</obj-entity>
- <obj-entity name="PrimitivesTestEntity" className="org.apache.art.PrimitivesTestEntity" dbEntityName="PRIMITIVES_TEST">
+ <obj-entity name="PrimitivesTestEntity" className="org.apache.cayenne.testdo.testmap.PrimitivesTestEntity" dbEntityName="PRIMITIVES_TEST">
<obj-attribute name="booleanColumn" type="boolean" db-attribute-path="BOOLEAN_COLUMN"/>
<obj-attribute name="intColumn" type="int" db-attribute-path="INT_COLUMN"/>
</obj-entity>
- <obj-entity name="ROArtist" className="org.apache.art.ROArtist" readOnly="true" dbEntityName="ARTIST">
+ <obj-entity name="ROArtist" className="org.apache.cayenne.testdo.testmap.ROArtist" readOnly="true" dbEntityName="ARTIST">
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
<obj-attribute name="dateOfBirth" type="java.sql.Date" db-attribute-path="DATE_OF_BIRTH"/>
</obj-entity>
- <obj-entity name="ROPainting" className="org.apache.art.ROPainting" readOnly="true" dbEntityName="PAINTING">
+ <obj-entity name="ROPainting" className="org.apache.cayenne.testdo.testmap.ROPainting" readOnly="true" dbEntityName="PAINTING">
<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
</obj-entity>
- <obj-entity name="RWCompoundPainting" className="org.apache.art.RWCompoundPainting" dbEntityName="PAINTING">
+ <obj-entity name="RWCompoundPainting" className="org.apache.cayenne.testdo.testmap.RWCompoundPainting" dbEntityName="PAINTING">
<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
<obj-attribute name="textReview" type="java.lang.String" db-attribute-path="toPaintingInfo.TEXT_REVIEW"/>
</obj-entity>
- <obj-entity name="ReturnTypesMap1" className="org.apache.art.ReturnTypesMap1" clientClassName="test.client.ReturnTypesMap1" dbEntityName="TYPES_MAPPING_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
+ <obj-entity name="ReturnTypesMap1" className="org.apache.cayenne.testdo.testmap.ReturnTypesMap1" clientClassName="test.client.ReturnTypesMap1" dbEntityName="TYPES_MAPPING_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
<obj-attribute name="bigintColumn" type="java.lang.Long" db-attribute-path="BIGINT_COLUMN"/>
<obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/>
<obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/>
@@ -490,25 +490,25 @@
<obj-attribute name="tinyintColumn" type="java.lang.Byte" db-attribute-path="TINYINT_COLUMN"/>
<obj-attribute name="varcharColumn" type="java.lang.String" db-attribute-path="VARCHAR_COLUMN"/>
</obj-entity>
- <obj-entity name="ReturnTypesMap2" className="org.apache.art.ReturnTypesMap2" clientClassName="test.client.ReturnTypesMap2" dbEntityName="TYPES_MAPPING_TEST2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
+ <obj-entity name="ReturnTypesMap2" className="org.apache.cayenne.testdo.testmap.ReturnTypesMap2" clientClassName="test.client.ReturnTypesMap2" dbEntityName="TYPES_MAPPING_TEST2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
<obj-attribute name="binaryColumn" type="byte[]" db-attribute-path="BINARY_COLUMN"/>
<obj-attribute name="blobColumn" type="byte[]" db-attribute-path="BLOB_COLUMN"/>
<obj-attribute name="longvarbinaryColumn" type="byte[]" db-attribute-path="LONGVARBINARY_COLUMN"/>
<obj-attribute name="varbinaryColumn" type="byte[]" db-attribute-path="VARBINARY_COLUMN"/>
</obj-entity>
- <obj-entity name="SerializableEntity" className="org.apache.art.SerializableEntity" dbEntityName="SERIALIZABLE_ENTITY">
+ <obj-entity name="SerializableEntity" className="org.apache.cayenne.testdo.testmap.SerializableEntity" dbEntityName="SERIALIZABLE_ENTITY">
<obj-attribute name="serializableField" type="org.apache.cayenne.MockSerializable" db-attribute-path="SERIALIZABLE_FIELD"/>
</obj-entity>
- <obj-entity name="SmallintTestEntity" className="org.apache.art.SmallintTestEntity" dbEntityName="SMALLINT_TEST">
+ <obj-entity name="SmallintTestEntity" className="org.apache.cayenne.testdo.testmap.SmallintTestEntity" dbEntityName="SMALLINT_TEST">
<obj-attribute name="smallintCol" type="java.lang.Short" db-attribute-path="SMALLINT_COL"/>
</obj-entity>
- <obj-entity name="SubPainting" className="org.apache.art.SubPainting" dbEntityName="PAINTING">
+ <obj-entity name="SubPainting" className="org.apache.cayenne.testdo.testmap.SubPainting" dbEntityName="PAINTING">
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
</obj-entity>
- <obj-entity name="TinyintTestEntity" className="org.apache.art.TinyintTestEntity" dbEntityName="TINYINT_TEST">
+ <obj-entity name="TinyintTestEntity" className="org.apache.cayenne.testdo.testmap.TinyintTestEntity" dbEntityName="TINYINT_TEST">
<obj-attribute name="tinyintCol" type="java.lang.Byte" db-attribute-path="TINYINT_COL"/>
</obj-entity>
- <obj-entity name="UuidTestEntity" className="org.apache.art.UuidTestEntity" dbEntityName="UUID_TEST">
+ <obj-entity name="UuidTestEntity" className="org.apache.cayenne.testdo.testmap.UuidTestEntity" dbEntityName="UUID_TEST">
<obj-attribute name="uuid" type="java.util.UUID" db-attribute-path="UUID"/>
</obj-entity>
<db-relationship name="artistGroupArray" source="ARTGROUP" target="ARTIST_GROUP" toMany="true">
@@ -741,7 +741,7 @@ VALUES (#bind($id), #bind($title), #bind
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <entity-listener class="org.apache.art.EntityListenerDataMap">
+ <entity-listener class="org.apache.cayenne.testdo.testmap.EntityListenerDataMap">
<post-add method-name="prePersistDataMap1"/>
<post-add method-name="prePersistDataMap2"/>
<post-persist method-name="postPersistDataMap"/>
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/DataMapGeneratedQueryRunTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/DataMapGeneratedQueryRunTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/DataMapGeneratedQueryRunTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/DataMapGeneratedQueryRunTest.java Sat Jun 12 22:45:31 2010
@@ -21,10 +21,10 @@ package org.apache.cayenne.gen;
import java.sql.SQLException;
import java.util.List;
-import org.apache.art.Artist;
-import org.apache.art.Testmap;
-import org.apache.cayenne.test.DBHelper;
-import org.apache.cayenne.test.TableHelper;
+import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.test.jdbc.TableHelper;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.apache.cayenne.testdo.testmap.Testmap;
import org.apache.cayenne.unit.CayenneCase;
public class DataMapGeneratedQueryRunTest extends CayenneCase {
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java Sat Jun 12 22:45:31 2010
@@ -79,21 +79,21 @@ public class CayenneGeneratorTaskCrossMa
task.setMode("entity");
task.setIncludeEntities("MyArtGroup");
task.setDestDir(destDir);
- task.setSuperpkg("org.apache.art2.auto");
+ task.setSuperpkg("org.apache.cayenne.testdo.cgen2.auto");
task.setUsepkgpath(true);
// run task
task.execute();
// check results
- File a = new File(destDir, convertPath("org/apache/art2/MyArtGroup.java"));
+ File a = new File(destDir, convertPath("org/apache/cayenne/testdo/cgen2/MyArtGroup.java"));
assertTrue(a.isFile());
- assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
+ assertContents(a, "MyArtGroup", "org.apache.cayenne.testdo.cgen2", "_MyArtGroup");
- File _a = new File(destDir, convertPath("org/apache/art2/auto/_MyArtGroup.java"));
+ File _a = new File(destDir, convertPath("org/apache/cayenne/testdo/cgen2/auto/_MyArtGroup.java"));
assertTrue(_a.exists());
- assertContents(_a, "_MyArtGroup", "org.apache.art2.auto", "CayenneDataObject");
- assertContents(_a, "import org.apache.art.ArtGroup;");
+ assertContents(_a, "_MyArtGroup", "org.apache.cayenne.testdo.cgen2.auto", "CayenneDataObject");
+ assertContents(_a, "import org.apache.cayenne.testdo.testmap.ArtGroup;");
assertContents(_a, " ArtGroup getToParentGroup()");
assertContents(_a, "setToParentGroup(ArtGroup toParentGroup)");
}
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java Sat Jun 12 22:45:31 2010
@@ -85,11 +85,19 @@ public class CayenneGeneratorTaskTest ex
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist", "org.apache.art", "CayenneDataObject");
+ assertContents(
+ a,
+ "Artist",
+ "org.apache.cayenne.testdo.testmap",
+ "CayenneDataObject");
- File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
+ File _a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/_Artist.java"));
assertFalse(_a.exists());
}
@@ -109,11 +117,19 @@ public class CayenneGeneratorTaskTest ex
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist", "org.apache.art", "CayenneDataObject");
+ assertContents(
+ a,
+ "Artist",
+ "org.apache.cayenne.testdo.testmap",
+ "CayenneDataObject");
- File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
+ File _a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/_Artist.java"));
assertFalse(_a.exists());
}
@@ -135,12 +151,18 @@ public class CayenneGeneratorTaskTest ex
// check results
File a = new File(mapDir, convertPath("Artist.java"));
assertTrue(a.exists());
- assertContents(a, "Artist", "org.apache.art", "CayenneDataObject");
+ assertContents(
+ a,
+ "Artist",
+ "org.apache.cayenne.testdo.testmap",
+ "CayenneDataObject");
File _a = new File(mapDir, convertPath("_Artist.java"));
assertFalse(_a.exists());
- File pkga = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File pkga = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertFalse(pkga.exists());
}
@@ -160,13 +182,21 @@ public class CayenneGeneratorTaskTest ex
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist", "org.apache.art", "_Artist");
+ assertContents(a, "Artist", "org.apache.cayenne.testdo.testmap", "_Artist");
- File _a = new File(mapDir, convertPath("org/apache/art/_Artist.java"));
+ File _a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/_Artist.java"));
assertTrue(_a.exists());
- assertContents(_a, "_Artist", "org.apache.art", "CayenneDataObject");
+ assertContents(
+ _a,
+ "_Artist",
+ "org.apache.cayenne.testdo.testmap",
+ "CayenneDataObject");
}
/** Test pairs generation in the same directory. */
@@ -187,13 +217,19 @@ public class CayenneGeneratorTaskTest ex
// check results
File a = new File(mapDir, convertPath("Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist", "org.apache.art", "_Artist");
+ assertContents(a, "Artist", "org.apache.cayenne.testdo.testmap", "_Artist");
File _a = new File(mapDir, convertPath("_Artist.java"));
assertTrue(_a.exists());
- assertContents(_a, "_Artist", "org.apache.art", "CayenneDataObject");
+ assertContents(
+ _a,
+ "_Artist",
+ "org.apache.cayenne.testdo.testmap",
+ "CayenneDataObject");
- File pkga = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File pkga = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertFalse(pkga.exists());
}
@@ -211,19 +247,27 @@ public class CayenneGeneratorTaskTest ex
task.setMap(map);
task.setMakepairs(true);
task.setUsepkgpath(true);
- task.setSuperpkg("org.apache.superart");
+ task.setSuperpkg("org.apache.cayenne.testdo.testmap.superart");
// run task
task.execute();
// check results
- File a = new File(mapDir, convertPath("org/apache/art/Artist.java"));
+ File a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist", "org.apache.art", "_Artist");
+ assertContents(a, "Artist", "org.apache.cayenne.testdo.testmap", "_Artist");
- File _a = new File(mapDir, convertPath("org/apache/superart/_Artist.java"));
+ File _a = new File(
+ mapDir,
+ convertPath("org/apache/cayenne/testdo/testmap/superart/_Artist.java"));
assertTrue(_a.exists());
- assertContents(_a, "_Artist", "org.apache.superart", "CayenneDataObject");
+ assertContents(
+ _a,
+ "_Artist",
+ "org.apache.cayenne.testdo.testmap.superart",
+ "CayenneDataObject");
}
public void testPairsEmbeddable3() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml Sat Jun 12 22:45:31 2010
@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap ../../main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd"
project-version="1.1">
- <property name="defaultPackage" value="org.apache.art2"/>
+ <property name="defaultPackage" value="org.apache.cayenne.testdo.cgen2"/>
<db-entity name="MYARTGROUP">
<db-attribute name="MY_GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="CUSTOM" type="VARCHAR" isMandatory="true" length="100"/>
<db-attribute name="MY_PARENT_GROUP_ID" type="INTEGER"/>
</db-entity>
- <obj-entity name="MyArtGroup" className="org.apache.art2.MyArtGroup" dbEntityName="MYARTGROUP">
+ <obj-entity name="MyArtGroup" className="org.apache.cayenne.testdo.cgen2.MyArtGroup" dbEntityName="MYARTGROUP">
<obj-attribute name="custom" type="java.lang.String" db-attribute-path="CUSTOM"/>
</obj-entity>
<db-relationship name="toParentArtGroup" source="MYARTGROUP" target="ARTGROUP" toMany="false">
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen.map.xml?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/resources/org/apache/cayenne/tools/cgen.map.xml Sat Jun 12 22:45:31 2010
@@ -9,7 +9,7 @@
<db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/>
<db-attribute name="PARENT_GROUP_ID" type="INTEGER"/>
</db-entity>
- <obj-entity name="ArtGroup" className="org.apache.art.ArtGroup" dbEntityName="ARTGROUP">
+ <obj-entity name="ArtGroup" className="org.apache.cayenne.testdo.testmap.ArtGroup" dbEntityName="ARTGROUP">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
</data-map>
Modified: cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeCase.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeCase.java (original)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeCase.java Sat Jun 12 22:45:31 2010
@@ -28,8 +28,8 @@ import org.apache.cayenne.access.DataNod
import org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.apache.cayenne.test.DBHelper;
-import org.apache.cayenne.test.TableHelper;
+import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.test.jdbc.TableHelper;
public abstract class ServerRuntimeCase extends TestCase {
Modified: cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeIntegrationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeIntegrationTest.java?rev=954144&r1=954143&r2=954144&view=diff
==============================================================================
--- cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeIntegrationTest.java (original)
+++ cayenne/main/trunk/itests/cayenne-di-stack/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeIntegrationTest.java Sat Jun 12 22:45:31 2010
@@ -27,7 +27,7 @@ import org.apache.cayenne.event.DefaultE
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.itest.di_stack.Table1;
import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.test.DBHelper;
+import org.apache.cayenne.test.jdbc.DBHelper;
public class ServerRuntimeIntegrationTest extends ServerRuntimeCase {