You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2006/07/17 15:35:25 UTC

svn commit: r422712 [3/3] - /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.JointPrefetchTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.JointPrefetchTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.JointPrefetchTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.JointPrefetchTst.xml Mon Jul 17 06:35:21 2006
@@ -6,54 +6,54 @@
 	<!-- Named Queries -->
 	<!-- ======================================= -->
 	
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'artist3')
 		</value></constructor-arg>
 	</bean>
 	
 	<!-- GALLERY -->
-	<bean id="G1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Gallery</value></constructor-arg>
+	<bean id="G1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Gallery</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO GALLERY (GALLERY_ID, GALLERY_NAME) VALUES (33001, 'G1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="G2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Gallery</value></constructor-arg>
+	<bean id="G2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Gallery</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO GALLERY (GALLERY_ID, GALLERY_NAME) VALUES (33002, 'G2')
 		</value></constructor-arg>
 	</bean>
 
 	<!-- PAINTING -->
-	<bean id="P11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID) VALUES (33001, 'P_artist11', 33001, 1000, 33001)
 		</value></constructor-arg>
 	</bean>
-	<bean id="P12" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P12" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID) VALUES (33002, 'P_artist12', 33001, 2000, 33001)
 		</value></constructor-arg>
 	</bean>
-	<bean id="P21" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P21" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID) VALUES (33003, 'P_artist21', 33002, 3000, 33002)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextReadTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextReadTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextReadTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextReadTst.xml Mon Jul 17 06:35:21 2006
@@ -7,71 +7,71 @@
 	<!-- ======================================= -->
 	
 	<!-- ARTIST -->
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'artist3')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'artist4')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33001, 'P_artist1', 33001, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33006, 'P_artist6', 33001, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33002, 'P_artist2', 33002, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33003, 'P_artist3', 33003, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33004, 'P_artist4', 33004, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P5" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33005, 'P_artist5', null, 3000)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextWriteTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextWriteTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextWriteTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextWriteTst.xml Mon Jul 17 06:35:21 2006
@@ -7,71 +7,71 @@
 	<!-- ======================================= -->
 	
 	<!-- ARTIST -->
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'artist1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'artist2')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'artist3')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'artist4')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33001, 'P_artist1', 33001, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33006, 'P_artist6', 33001, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33002, 'P_artist2', 33002, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33003, 'P_artist3', 33003, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33004, 'P_artist4', 33004, 3000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="P5" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ARTIST_ID, ESTIMATED_PRICE) VALUES (33005, 'P_artist5', null, 3000)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NumericTypesTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NumericTypesTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NumericTypesTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NumericTypesTst.xml Mon Jul 17 06:35:21 2006
@@ -5,26 +5,26 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="SI1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.SmallintTest</value></constructor-arg>
+	<bean id="SI1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.SmallintTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SMALLINT_TEST (ID, SMALLINT_COL) values (1, 9999)
 		</value></constructor-arg>
 	</bean>
-	<bean id="SI2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.SmallintTest</value></constructor-arg>
+	<bean id="SI2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.SmallintTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SMALLINT_TEST (ID, SMALLINT_COL) values (2, 3333)
 		</value></constructor-arg>
 	</bean>
-	<bean id="TI1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.TinyintTest</value></constructor-arg>
+	<bean id="TI1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.TinyintTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into TINYINT_TEST (ID, TINYINT_COL) values (1, 81)
 		</value></constructor-arg>
 	</bean>
-	<bean id="TI2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.TinyintTest</value></constructor-arg>
+	<bean id="TI2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.TinyintTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into TINYINT_TEST (ID, TINYINT_COL) values (2, 50)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ObjectStoreDiffRetainingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ObjectStoreDiffRetainingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ObjectStoreDiffRetainingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ObjectStoreDiffRetainingTst.xml Mon Jul 17 06:35:21 2006
@@ -5,14 +5,14 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) VALUES (2000, 'artist with one painting', null)
 		</value></constructor-arg>
 	</bean>
-	<bean id="P1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="P1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Painting</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO PAINTING (ARTIST_ID, ESTIMATED_PRICE, GALLERY_ID, PAINTING_ID, PAINTING_TITLE) VALUES (2000, null, null, 3000, 'p1')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.OptimisticLockingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.OptimisticLockingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.OptimisticLockingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.OptimisticLockingTst.xml Mon Jul 17 06:35:21 2006
@@ -7,64 +7,64 @@
 	<!-- ======================================= -->
 	
 	<!-- SIMPLE_LOCKING_TEST -->
-	<bean id="SimpleLockDelete" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockDelete" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>delete from SIMPLE_LOCKING_TEST</value></constructor-arg>
 	</bean>
-	<bean id="SimpleLockInsert" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockInsert" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SIMPLE_LOCKING_TEST (LOCKING_TEST_ID, NAME, DESCRIPTION) values (1, 'LockTest1', null)
 		</value></constructor-arg>
 	</bean>
-	<bean id="SimpleLockInsertNull" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockInsertNull" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SIMPLE_LOCKING_TEST (LOCKING_TEST_ID, NAME, DESCRIPTION) values (1, null, null)
 		</value></constructor-arg>
 	</bean>
-	<bean id="SimpleLockInsert2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockInsert2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SIMPLE_LOCKING_TEST (LOCKING_TEST_ID, NAME, DESCRIPTION) values (2, 'LockTest2', null)
 		</value></constructor-arg>
 	</bean>
-	<bean id="SimpleLockInsert3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockInsert3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into SIMPLE_LOCKING_TEST (LOCKING_TEST_ID, NAME, DESCRIPTION) values (3, 'LockTest3', 'Another Lock Test')
 		</value></constructor-arg>
 	</bean>
-	<bean id="SimpleLockUpdate" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="SimpleLockUpdate" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		update SIMPLE_LOCKING_TEST set NAME = 'LockTest1Updated' where LOCKING_TEST_ID = 1
 		</value></constructor-arg>
 	</bean>
 	
 	<!-- REL_LOCKING_TEST -->
-	<bean id="LockHelperDelete" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.LockingHelper</value></constructor-arg>
+	<bean id="LockHelperDelete" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.LockingHelper</value></constructor-arg>
 		<constructor-arg><value>delete from LOCKING_HELPER</value></constructor-arg>
 	</bean>
-	<bean id="RelLockDelete" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.RelLockingTest</value></constructor-arg>
+	<bean id="RelLockDelete" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.RelLockingTest</value></constructor-arg>
 		<constructor-arg><value>delete from REL_LOCKING_TEST</value></constructor-arg>
 	</bean>
-	<bean id="RelLockInsert" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="RelLockInsert" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into REL_LOCKING_TEST (REL_LOCKING_TEST_ID, SIMPLE_LOCKING_TEST_ID, NAME) values (5, 1, 'Rel Test 1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="LockHelperInsert" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="LockHelperInsert" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into LOCKING_HELPER (LOCKING_HELPER_ID, REL_LOCKING_TEST_ID, NAME) values (1, 5, 'Locking Helper 1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="RelLockUpdate" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
+	<bean id="RelLockUpdate" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.locking.SimpleLockingTest</value></constructor-arg>
 		<constructor-arg><value>
 		update REL_LOCKING_TEST set SIMPLE_LOCKING_TEST_ID = 1 where REL_LOCKING_TEST_ID = 5
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/map.AshwoodEntitySorterTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/map.AshwoodEntitySorterTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/map.AshwoodEntitySorterTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/map.AshwoodEntitySorterTst.xml Mon Jul 17 06:35:21 2006
@@ -5,26 +5,26 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="RH1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.RelationshipHelper</value></constructor-arg>
+	<bean id="RH1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.RelationshipHelper</value></constructor-arg>
 		<constructor-arg><value>
 		insert into RELATIONSHIP_HELPER (RELATIONSHIP_HELPER_ID, NAME) values (1, 'rh1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="RATO1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
+	<bean id="RATO1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
 		<constructor-arg><value>
 		insert into REFLEXIVE_AND_TO_ONE (REFLEXIVE_AND_TO_ONE_ID, PARENT_ID, RELATIONSHIP_HELPER_ID, NAME) values (1, null, 1, 'r1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="RATO2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
+	<bean id="RATO2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
 		<constructor-arg><value>
 		insert into REFLEXIVE_AND_TO_ONE (REFLEXIVE_AND_TO_ONE_ID, PARENT_ID, RELATIONSHIP_HELPER_ID, NAME) values (2, 1, 1, 'r2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="RATO3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
+	<bean id="RATO3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ReflexiveAndToOne</value></constructor-arg>
 		<constructor-arg><value>
 		insert into REFLEXIVE_AND_TO_ONE (REFLEXIVE_AND_TO_ONE_ID, PARENT_ID, RELATIONSHIP_HELPER_ID, NAME) values (3, 2, 1, 'r3')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/property.MixedPersistenceStrategyTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/property.MixedPersistenceStrategyTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/property.MixedPersistenceStrategyTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/property.MixedPersistenceStrategyTst.xml Mon Jul 17 06:35:21 2006
@@ -6,22 +6,22 @@
 	<!-- Named Queries -->
 	<!-- ======================================= -->
 	
-	<bean id="M11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.MixedPersistenceStrategy</value></constructor-arg>
+	<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><value>
 		insert into MIXED_PERSISTENCE_STRATEGY (ID, DESCRIPTION, NAME) values (1, 'd1', 'n1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="M21" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.MixedPersistenceStrategy2</value></constructor-arg>
+	<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><value>
 		insert into MIXED_PERSISTENCE_STRATEGY2 (ID, MASTER_ID, NAME) values (1, 1, 'dn1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="M22" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.MixedPersistenceStrategy2</value></constructor-arg>
+	<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><value>
 		insert into MIXED_PERSISTENCE_STRATEGY2 (ID, MASTER_ID, NAME) values (2, 1, 'dn2')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/query.SelectQueryFetchLimitOrderingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/query.SelectQueryFetchLimitOrderingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/query.SelectQueryFetchLimitOrderingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/query.SelectQueryFetchLimitOrderingTst.xml Mon Jul 17 06:35:21 2006
@@ -7,43 +7,43 @@
 	<!-- ======================================= -->
 	
 	<!-- ARTIST -->
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33001, 'c')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33002, 'b')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33003, 'f')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33004, 'd')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A5" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33005, 'a')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="A6" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<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><value>
 		insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (33006, 'e')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/remote.RemoteIncrementalFaultListTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/remote.RemoteIncrementalFaultListTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/remote.RemoteIncrementalFaultListTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/remote.RemoteIncrementalFaultListTst.xml Mon Jul 17 06:35:21 2006
@@ -5,152 +5,152 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="A1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (1, 'g1', 's1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (2, 'g2', 's2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (3, 'g3', 's3')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (4, 'g4', 's4')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A5" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (5, 'g5', 's5')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A6" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A6" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (6, 'g6', 's6')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A7" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A7" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (7, 'g7', 's7')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A8" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A8" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (8, 'g8', 's8')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A9" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A9" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (9, 'g9', 's9')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A10" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A10" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (10, 'g10', 's10')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (11, 'g11', 's11')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A12" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A12" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (12, 'g12', 's12')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A13" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A13" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (13, 'g13', 's13')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A14" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A14" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (14, 'g14', 's14')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A15" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A15" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (15, 'g15', 's15')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A16" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A16" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (16, 'g16', 's16')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A17" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A17" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (17, 'g17', 's17')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A18" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A18" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (18, 'g18', 's18')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A19" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A19" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (19, 'g19', 's19')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A20" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A20" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (20, 'g20', 's20')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A21" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A21" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (21, 'g21', 's21')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A22" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A22" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (22, 'g22', 's22')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A23" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A23" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (23, 'g23', 's23')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A24" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A24" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (24, 'g24', 's24')
 		</value></constructor-arg>
 	</bean>
-	<bean id="A25" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="A25" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (25, 'g25', 's25')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_115Tst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_115Tst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_115Tst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_115Tst.xml Mon Jul 17 06:35:21 2006
@@ -3,35 +3,35 @@
 
 <beans default-lazy-init="true">
 	
-	<bean id="CMInsert1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
+	<bean id="CMInsert1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_MASTER (CLOB_MASTER_ID, CLOB_COLUMN, NAME) values (1, 'cm1 clob', 'cm1')</value></constructor-arg>
 	</bean>
 
-	<bean id="CMInsert2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
+	<bean id="CMInsert2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_MASTER (CLOB_MASTER_ID, CLOB_COLUMN, NAME) values (2, 'cm2 clob', 'cm2')</value></constructor-arg>
 	</bean>
 
-	<bean id="CMInsert3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
+	<bean id="CMInsert3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobMaster</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_MASTER (CLOB_MASTER_ID, CLOB_COLUMN, NAME) values (3, 'cm3 clob', 'cm3')</value></constructor-arg>
 	</bean>
 
-	<bean id="CDInsert1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
+	<bean id="CDInsert1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_DETAIL (CLOB_DETAIL_ID, CLOB_MASTER_ID, NAME) values (1, 1, 'cd11')</value></constructor-arg>
 	</bean>
-	<bean id="CDInsert2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
+	<bean id="CDInsert2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_DETAIL (CLOB_DETAIL_ID, CLOB_MASTER_ID, NAME) values (2, 2, 'cd21')</value></constructor-arg>
 	</bean>
-	<bean id="CDInsert3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
+	<bean id="CDInsert3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_DETAIL (CLOB_DETAIL_ID, CLOB_MASTER_ID, NAME) values (3, 2, 'cd22')</value></constructor-arg>
 	</bean>
-	<bean id="CDInsert4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
+	<bean id="CDInsert4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.ClobDetail</value></constructor-arg>
 		<constructor-arg><value>insert into CLOB_DETAIL (CLOB_DETAIL_ID, CLOB_MASTER_ID, NAME) values (4, 3, 'cd31')</value></constructor-arg>
 	</bean>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_191Tst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_191Tst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_191Tst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_191Tst.xml Mon Jul 17 06:35:21 2006
@@ -5,15 +5,15 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="RH1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FkOfDifferentType</value></constructor-arg>
+	<bean id="RH1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FkOfDifferentType</value></constructor-arg>
 		<constructor-arg><value>
 		insert into RELATIONSHIP_HELPER (NAME, RELATIONSHIP_HELPER_ID) values ('RH1', 1)
 		</value></constructor-arg>
 	</bean>
 
-	<bean id="FD1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FkOfDifferentType</value></constructor-arg>
+	<bean id="FD1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FkOfDifferentType</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FK_OF_DIFFERENT_TYPE (ID, RELATIONSHIP_HELPER_FK) values (1, 1)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_207Tst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_207Tst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_207Tst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_207Tst.xml Mon Jul 17 06:35:21 2006
@@ -5,20 +5,20 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="M1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+	<bean id="M1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, 'T1:a', null, 'Manager Type 1', 1, 'M1', 50000)
 		</value></constructor-arg>
 	</bean>
-   <bean id="M2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+   <bean id="M2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, 'T2:b', null, 'Manager Type 2', 2, 'M2', 60000)
 		</value></constructor-arg>
 	</bean>
-   <bean id="M3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+   <bean id="M3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'Regular Manager', 3, 'EM', 70000)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_218Tst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_218Tst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_218Tst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_218Tst.xml Mon Jul 17 06:35:21 2006
@@ -5,55 +5,55 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="D1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.Department</value></constructor-arg>
+	<bean id="D1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.Department</value></constructor-arg>
 		<constructor-arg><value>
 		insert into DEPARTMENT (DEPARTMENT_ID, NAME) values (1, 'Accounting')
 		</value></constructor-arg>
 	</bean>
 
-	<bean id="E1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+	<bean id="E1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (1, 'John', 1, 'EE', 25000)
 		</value></constructor-arg>
 	</bean>
-	<bean id="E2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+	<bean id="E2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (1, 'Susan', 2, 'EE', 50000)
 		</value></constructor-arg>
 	</bean>
-	<bean id="M1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+	<bean id="M1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
 		<constructor-arg><value>
 		insert into PERSON (DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (1, 'Kelly', 3, 'EM', 100000)
 		</value></constructor-arg>
 	</bean>
 
-	<bean id="AE11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.Address</value></constructor-arg>
+	<bean id="AE11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.Address</value></constructor-arg>
 		<constructor-arg><value>
 		insert into ADDRESS (ADDRESS_ID, CITY, PERSON_ID) values (1, 'New York', 1)
 		</value></constructor-arg>
 	</bean>
 
- 	<bean id="AE12" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.Address</value></constructor-arg>
+ 	<bean id="AE12" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.Address</value></constructor-arg>
 		<constructor-arg><value>
 		insert into ADDRESS (ADDRESS_ID, CITY, PERSON_ID) values (2, 'San Fran', 1)
 		</value></constructor-arg>
 	</bean>
 
-	<bean id="AE21" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.Address</value></constructor-arg>
+	<bean id="AE21" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.Address</value></constructor-arg>
 		<constructor-arg><value>
 		insert into ADDRESS (ADDRESS_ID, CITY, PERSON_ID) values (3, 'Boston', 2)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="AM11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.inherit.Address</value></constructor-arg>
+	<bean id="AM11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.Address</value></constructor-arg>
 		<constructor-arg><value>
 		insert into ADDRESS (ADDRESS_ID, CITY, PERSON_ID) values (4, 'LA', 3)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.util.SQLTemplateCustomizer.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.util.SQLTemplateCustomizer.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.util.SQLTemplateCustomizer.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.util.SQLTemplateCustomizer.xml Mon Jul 17 06:35:21 2006
@@ -5,7 +5,7 @@
 	<!-- ======================================= -->
 	<!-- Customizer -->
 	<!-- ======================================= -->
-	<bean id="SQLTemplateCustomizer" class="org.objectstyle.cayenne.unit.util.SQLTemplateCustomizer">
+	<bean id="SQLTemplateCustomizer" class="org.apache.cayenne.unit.util.SQLTemplateCustomizer">
 		<constructor-arg>
 			<map>
 				<entry key="SELECT * FROM ARTIST ORDER BY ARTIST_ID"><ref bean="Q1"/></entry>
@@ -21,13 +21,13 @@
 	<bean id="Q1" class="java.util.HashMap">
 		<constructor-arg>
 			<map>
-				<entry key="org.objectstyle.cayenne.dba.postgres.PostgresAdapter">
+				<entry key="org.apache.cayenne.dba.postgres.PostgresAdapter">
 					<value>SELECT #result('ARTIST_ID'), RTRIM(#result('ARTIST_NAME')), #result('DATE_OF_BIRTH') FROM ARTIST ORDER BY ARTIST_ID</value>
 				</entry>
-				<entry key="org.objectstyle.cayenne.dba.ingres.IngresAdapter">
+				<entry key="org.apache.cayenne.dba.ingres.IngresAdapter">
 					<value>SELECT #result('ARTIST_ID'), TRIM(#result('ARTIST_NAME')), #result('DATE_OF_BIRTH') FROM ARTIST ORDER BY ARTIST_ID</value>
 				</entry>
-				<entry key="org.objectstyle.cayenne.dba.openbase.OpenBaseAdapter">
+				<entry key="org.apache.cayenne.dba.openbase.OpenBaseAdapter">
 					<value>SELECT #result('ARTIST_ID'), #result('ARTIST_NAME'), #result('DATE_OF_BIRTH') FROM ARTIST ORDER BY ARTIST_ID</value>
 				</entry>
 			</map>
@@ -36,13 +36,13 @@
 	<bean id="Q2" class="java.util.HashMap">
 		<constructor-arg>
 			<map>
-				<entry key="org.objectstyle.cayenne.dba.postgres.PostgresAdapter">
+				<entry key="org.apache.cayenne.dba.postgres.PostgresAdapter">
 					<value>SELECT #result('ARTIST_ID'), RTRIM(#result('ARTIST_NAME')), #result('DATE_OF_BIRTH') FROM ARTIST WHERE ARTIST_ID = #bind($id)</value>
 				</entry>
-				<entry key="org.objectstyle.cayenne.dba.ingres.IngresAdapter">
+				<entry key="org.apache.cayenne.dba.ingres.IngresAdapter">
 					<value>SELECT #result('ARTIST_ID'), TRIM(#result('ARTIST_NAME')), #result('DATE_OF_BIRTH') FROM ARTIST WHERE ARTIST_ID = #bind($id)</value>
 				</entry>
-				<entry key="org.objectstyle.cayenne.dba.openbase.OpenBaseAdapter">
+				<entry key="org.apache.cayenne.dba.openbase.OpenBaseAdapter">
 					<value>SELECT #result('ARTIST_ID'), #result('ARTIST_NAME'), #result('DATE_OF_BIRTH') FROM ARTIST WHERE ARTIST_ID = #bind($id)</value>
 				</entry>
 			</map>
@@ -51,10 +51,10 @@
 	<bean id="Q3" class="java.util.HashMap">
 		<constructor-arg>
 			<map>
-				<entry key="org.objectstyle.cayenne.dba.oracle.OracleAdapter">
+				<entry key="org.apache.cayenne.dba.oracle.OracleAdapter">
 					<value>UPDATE ARTIST SET ARTIST_NAME = #bind($newName) WHERE RTRIM(ARTIST_NAME) = #bind($oldName)</value>
 				</entry>
-				<entry key="org.objectstyle.cayenne.dba.oracle.Oracle8Adapter">
+				<entry key="org.apache.cayenne.dba.oracle.Oracle8Adapter">
 					<value>UPDATE ARTIST SET ARTIST_NAME = #bind($newName) WHERE RTRIM(ARTIST_NAME) = #bind($oldName)</value>
 				</entry>
 			</map>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/util.ObjectDetachOperationTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/util.ObjectDetachOperationTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/util.ObjectDetachOperationTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/util.ObjectDetachOperationTst.xml Mon Jul 17 06:35:21 2006
@@ -6,22 +6,22 @@
 	<!-- Named Queries -->
 	<!-- ======================================= -->
 	
-	<bean id="DELETE_MT_TABLE2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable2</value></constructor-arg>
+	<bean id="DELETE_MT_TABLE2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable2</value></constructor-arg>
 		<constructor-arg><value>
 		delete from MT_TABLE2
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="DELETE_MT_TABLE1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="DELETE_MT_TABLE1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		delete from MT_TABLE1
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable1</value></constructor-arg>
+	<bean id="INSERT_MT_TABLE11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE1 (TABLE1_ID, GLOBAL_ATTRIBUTE1, SERVER_ATTRIBUTE1) values (1, 'g1', 's1')
 		</value></constructor-arg>