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 [1/3] - /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/

Author: mgentry
Date: Mon Jul 17 06:35:21 2006
New Revision: 422712

URL: http://svn.apache.org/viewvc?rev=422712&view=rev
Log:
Changed namespace from objectstyle to apache.

Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextClientChannelEventsTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextNamedQueryCachingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextWithDataContextTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneDataObjectFlattenedRelTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/DataObjectUtilsTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/FlattenedRelationshipsTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/NestedCayenneContextOnDataContextTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/OneWayOneToManyTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/PersistentObjectInContextTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelQueryTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextExtrasTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNamedQueryCachingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNoPkTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextObjectTrackingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextPrefetchExtrasTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQualifiedEntityTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQueryCachingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextTestBase.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataRowUtilsTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DeleteObjectTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.FilteredPrefetchTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.FlattenedPrefetchTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.IncrementalFaultListDataRowsTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.IncrementalFaultListTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.InheritanceTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.JointPrefetchTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextReadTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NestedDataContextWriteTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.NumericTypesTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ObjectStoreDiffRetainingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.OptimisticLockingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/map.AshwoodEntitySorterTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/property.MixedPersistenceStrategyTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/query.SelectQueryFetchLimitOrderingTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/remote.RemoteIncrementalFaultListTst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_115Tst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_191Tst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_207Tst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.jira.CAY_218Tst.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/unit.util.SQLTemplateCustomizer.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/util.ObjectDetachOperationTst.xml

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextClientChannelEventsTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextClientChannelEventsTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextClientChannelEventsTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextClientChannelEventsTst.xml Mon Jul 17 06:35:21 2006
@@ -5,22 +5,22 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="O11" 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="O11" 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="O12" 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="O12" 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="O21" 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="O21" 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_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (1, 1, 'g1')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextNamedQueryCachingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextNamedQueryCachingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextNamedQueryCachingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextNamedQueryCachingTst.xml Mon Jul 17 06:35:21 2006
@@ -6,22 +6,22 @@
 	<!-- Named Queries -->
 	<!-- ======================================= -->
 	
-	<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>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE12" 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_TABLE12" 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="INSERT_MT_TABLE13" 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_TABLE13" 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>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextWithDataContextTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextWithDataContextTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextWithDataContextTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneContextWithDataContextTst.xml Mon Jul 17 06:35:21 2006
@@ -6,87 +6,87 @@
 	<!-- 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>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE12" 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_TABLE12" 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="INSERT_MT_TABLE13" 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_TABLE13" 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="INSERT_MT_TABLE14" 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_TABLE14" 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="INSERT_MT_TABLE15" 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_TABLE15" 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="INSERT_MT_TABLE16" 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_TABLE16" 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="INSERT_MT_TABLE17" 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_TABLE17" 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="INSERT_MT_TABLE18" 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_TABLE18" 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="INSERT_MT_TABLE21" 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="INSERT_MT_TABLE21" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (1, 1, 'g1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE22" 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="INSERT_MT_TABLE22" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (2, 1, 'g2')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE23" 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="INSERT_MT_TABLE23" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (3, null, 'g3')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneDataObjectFlattenedRelTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneDataObjectFlattenedRelTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneDataObjectFlattenedRelTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/CayenneDataObjectFlattenedRelTst.xml Mon Jul 17 06:35:21 2006
@@ -7,23 +7,23 @@
 	<!-- ======================================= -->
 	
 	<!-- 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>
 	
 	<!-- ARTGROUP -->
-	<bean id="AG1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.ArtGroup</value></constructor-arg>
+	<bean id="AG1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO ARTGROUP (GROUP_ID, NAME) VALUES (1,'g1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="AG2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.ArtGroup</value></constructor-arg>
+	<bean id="AG2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO ARTGROUP (GROUP_ID, NAME) VALUES (2,'g2')
 		</value></constructor-arg>
@@ -31,8 +31,8 @@
 	
 	
 	<!-- ARTIST_GROUP -->
-	<bean id="AGG1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.ArtGroup</value></constructor-arg>
+	<bean id="AGG1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.ArtGroup</value></constructor-arg>
 		<constructor-arg><value>
 		INSERT INTO ARTIST_GROUP (ARTIST_ID, GROUP_ID) VALUES (33001,1)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/DataObjectUtilsTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/DataObjectUtilsTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/DataObjectUtilsTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/DataObjectUtilsTst.xml Mon Jul 17 06:35:21 2006
@@ -7,31 +7,31 @@
 	<!-- ======================================= -->
 	
 	<!-- 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>
 
 	<!-- COMPOUND_PK_TEST -->
-	<bean id="C1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundPkTest</value></constructor-arg>
+	<bean id="C1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_PK_TEST (KEY1, KEY2, NAME) values ('PK1', 'PK2', 'BBB')
 		</value></constructor-arg>
 	</bean>
 
 	<!-- CHAR_PK_TEST -->
-	<bean id="CH1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharPkTest</value></constructor-arg>
+	<bean id="CH1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_PK_TEST (PK_COL, OTHER_COL) values ('CPK', 'AAAA')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/FlattenedRelationshipsTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/FlattenedRelationshipsTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/FlattenedRelationshipsTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/FlattenedRelationshipsTst.xml Mon Jul 17 06:35:21 2006
@@ -5,56 +5,56 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<bean id="FT11" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
+	<bean id="FT11" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_1 (FT1_ID, NAME) values (1, 'ft1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="FT12" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
+	<bean id="FT12" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_1 (FT1_ID, NAME) values (2, 'ft12')
 		</value></constructor-arg>
 	</bean>
-	<bean id="FT2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest2</value></constructor-arg>
+	<bean id="FT2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest2</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_2 (FT2_ID, FT1_ID, NAME) values (1, 1, 'ft2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="FT31" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
+	<bean id="FT31" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_3 (FT3_ID, FT2_ID, NAME) values (1, 1, 'ft3')
 		</value></constructor-arg>
 	</bean>
-	<bean id="FT32" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
+	<bean id="FT32" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_3 (FT3_ID, NAME) values (2, 'ft3-a')
 		</value></constructor-arg>
 	</bean>
-	<bean id="FT33" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
+	<bean id="FT33" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest3</value></constructor-arg>
 		<constructor-arg><value>
 		insert into FLATTENED_TEST_3 (FT3_ID, NAME) values (3, 'ft3-b')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CJ1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
+	<bean id="CJ1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPLEX_JOIN (PK, FT1_FK, FT3_FK, EXTRA_COLUMN) values (2000, 2, 2, 'A')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CJ2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
+	<bean id="CJ2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPLEX_JOIN (PK, FT1_FK, FT3_FK, EXTRA_COLUMN) values (2001, 2, 3, 'B')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CJ3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
+	<bean id="CJ3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.relationship.FlattenedTest1</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPLEX_JOIN (PK, FT1_FK, FT3_FK, EXTRA_COLUMN) values (2002, 2, 3, 'C')
 		</value></constructor-arg>

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

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/PersistentObjectInContextTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/PersistentObjectInContextTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/PersistentObjectInContextTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/PersistentObjectInContextTst.xml Mon Jul 17 06:35:21 2006
@@ -6,43 +6,43 @@
 	<!-- 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>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE12" 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_TABLE12" 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="INSERT_MT_TABLE21" 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="INSERT_MT_TABLE21" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (1, 1, 'g1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE22" 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="INSERT_MT_TABLE22" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (2, 1, 'g2')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelQueryTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelQueryTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelQueryTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelQueryTst.xml Mon Jul 17 06:35:21 2006
@@ -6,43 +6,43 @@
 	<!-- 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>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE12" 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_TABLE12" 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="INSERT_MT_TABLE21" 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="INSERT_MT_TABLE21" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (1, 1, 'g1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE22" 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="INSERT_MT_TABLE22" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (2, 1, 'g2')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.ClientServerChannelTst.xml Mon Jul 17 06:35:21 2006
@@ -6,72 +6,72 @@
 	<!-- 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="DELETE_MT_TABLE3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable3</value></constructor-arg>
+	<bean id="DELETE_MT_TABLE3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable3</value></constructor-arg>
 		<constructor-arg><value>
 		delete from MT_TABLE3
 		</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 (55, 'g1', 's1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE12" 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_TABLE12" 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 (65, #bind($GLOBAL_ATTRIBUTE1), #bind($SERVER_ATTRIBUTE1))
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLE31" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.cayenne.testdo.mt.MtTable3</value></constructor-arg>
+	<bean id="INSERT_MT_TABLE31" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.mt.MtTable3</value></constructor-arg>
 		<constructor-arg><value>
 		insert into MT_TABLE3 (TABLE3_ID, BINARY_COLUMN, CHAR_COLUMN, INT_COLUMN) values (1, #bind($bytes), #bind($chars), 4)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLEP11" 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_TABLEP11" 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="INSERT_MT_TABLEP12" 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_TABLEP12" 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="INSERT_MT_TABLEP21" 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="INSERT_MT_TABLEP21" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (1, 1, 'g1')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERT_MT_TABLEP22" 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="INSERT_MT_TABLEP22" 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>
 		insert into MT_TABLE2 (TABLE2_ID, TABLE1_ID, GLOBAL_ATTRIBUTE) values (2, 1, 'g2')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextExtrasTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextExtrasTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextExtrasTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextExtrasTst.xml Mon Jul 17 06:35:21 2006
@@ -7,20 +7,20 @@
 	<!-- ======================================= -->
 	
 	<!-- 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="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 (33001, 'P1', 33001, 3000)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNamedQueryCachingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNamedQueryCachingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNamedQueryCachingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNamedQueryCachingTst.xml Mon Jul 17 06:35:21 2006
@@ -7,29 +7,29 @@
 	<!-- ======================================= -->
 	
 	<!-- 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, 'AA1')
 		</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, 'AA2')
 		</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, 'BB1')
 		</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, 'BB2')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNoPkTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNoPkTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNoPkTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextNoPkTst.xml Mon Jul 17 06:35:21 2006
@@ -6,20 +6,20 @@
 	<!-- Named Queries -->
 	<!-- ======================================= -->
 	
-	<bean id="NPK_DELETE" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.NoPkTest</value></constructor-arg>
+	<bean id="NPK_DELETE" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.NoPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		delete from NO_PK_TEST
 		</value></constructor-arg>
 	</bean>
-	<bean id="NPK1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.NoPkTest</value></constructor-arg>
+	<bean id="NPK1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.NoPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into NO_PK_TEST (ATTRIBUTE1) values (1)
 		</value></constructor-arg>
 	</bean>
-	<bean id="NPK2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.NoPkTest</value></constructor-arg>
+	<bean id="NPK2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.NoPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into NO_PK_TEST (ATTRIBUTE1) values (2)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextObjectTrackingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextObjectTrackingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextObjectTrackingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextObjectTrackingTst.xml Mon Jul 17 06:35:21 2006
@@ -7,36 +7,36 @@
 	<!-- ======================================= -->
 	
 	<!-- 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="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>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextPrefetchExtrasTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextPrefetchExtrasTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextPrefetchExtrasTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextPrefetchExtrasTst.xml Mon Jul 17 06:35:21 2006
@@ -7,86 +7,86 @@
 	<!-- ======================================= -->
 	
 	<!-- Char PK -->
-	<bean id="CPK1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharPkTest</value></constructor-arg>
+	<bean id="CPK1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_PK_TEST (PK_COL, OTHER_COL) values ('k1', 'n1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CPK2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharPkTest</value></constructor-arg>
+	<bean id="CPK2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_PK_TEST (PK_COL, OTHER_COL) values ('k2', 'n2')
 		</value></constructor-arg>
 	</bean>
 	
 	<!-- Char FK -->
-	<bean id="CFK1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharFkTest</value></constructor-arg>
+	<bean id="CFK1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_FK_TEST (PK, FK_COL, NAME) values (1, 'k1', 'fn1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CFK2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharFkTest</value></constructor-arg>
+	<bean id="CFK2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_FK_TEST (PK, FK_COL, NAME) values (2, 'k1', 'fn2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CFK3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharFkTest</value></constructor-arg>
+	<bean id="CFK3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_FK_TEST (PK, FK_COL, NAME) values (3, 'k2', 'fn3')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CFK4" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharFkTest</value></constructor-arg>
+	<bean id="CFK4" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_FK_TEST (PK, FK_COL, NAME) values (4, 'k2', 'fn4')
 		</value></constructor-arg>
 	</bean>
-	<bean id="CFK5" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CharFkTest</value></constructor-arg>
+	<bean id="CFK5" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CharFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into CHAR_FK_TEST (PK, FK_COL, NAME) values (5, 'k1', 'fn5')
 		</value></constructor-arg>
 	</bean>
 	
 	<!-- COMPOUND PK -->
-	<bean id="COMPK1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundPkTest</value></constructor-arg>
+	<bean id="COMPK1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_PK_TEST (KEY1, KEY2, NAME) values ('101', '201', 'CPK1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="COMPK2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundPkTest</value></constructor-arg>
+	<bean id="COMPK2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_PK_TEST (KEY1, KEY2, NAME) values ('102', '202', 'CPK2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="COMPK3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundPkTest</value></constructor-arg>
+	<bean id="COMPK3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundPkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_PK_TEST (KEY1, KEY2, NAME) values ('103', '203', 'CPK3')
 		</value></constructor-arg>
 	</bean>
 	
 	<!-- COMPOUND FK -->
-	<bean id="COMFK1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundFkTest</value></constructor-arg>
+	<bean id="COMFK1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_FK_TEST (PKEY, F_KEY1, F_KEY2, NAME) values (301, '102', '202', 'CFK1')
 		</value></constructor-arg>
 	</bean>
-	<bean id="COMFK2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundFkTest</value></constructor-arg>
+	<bean id="COMFK2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_FK_TEST (PKEY, F_KEY1, F_KEY2, NAME) values (302, '102', '202', 'CFK2')
 		</value></constructor-arg>
 	</bean>
-	<bean id="COMFK3" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.CompoundFkTest</value></constructor-arg>
+	<bean id="COMFK3" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.CompoundFkTest</value></constructor-arg>
 		<constructor-arg><value>
 		insert into COMPOUND_FK_TEST (PKEY, F_KEY1, F_KEY2, NAME) values (303, '101', '201', 'CFK3')
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQualifiedEntityTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQualifiedEntityTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQualifiedEntityTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQualifiedEntityTst.xml Mon Jul 17 06:35:21 2006
@@ -5,38 +5,38 @@
 	<!-- ======================================= -->
 	<!-- Named Queries -->
 	<!-- ======================================= -->
-	<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 (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'e1', 1, 'EE', 20000)
 		</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 (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'e2', 2, 'EE', 25000)
 		</value></constructor-arg>
 	</bean>
-	<bean id="E3" 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="E3" 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, 'e3', 3, 'EE', 28000)
 		</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 (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'm1', 4, 'EM', 30000)
 		</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, null, null, 'm2', 5, 'EM', 40000)
 		</value></constructor-arg>
 	</bean>
-	<bean id="C1" 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="C1" 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, 'c1', 6, 'C', null)
 		</value></constructor-arg>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQueryCachingTst.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQueryCachingTst.xml?rev=422712&r1=422711&r2=422712&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQueryCachingTst.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/dml/access.DataContextQueryCachingTst.xml Mon Jul 17 06:35:21 2006
@@ -3,29 +3,29 @@
 
 <beans default-lazy-init="true">	
 
-	<bean id="INSERT" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<bean id="INSERT" 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, 'aaa')
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="INSERTP" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Painting</value></constructor-arg>
+	<bean id="INSERTP" 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', 33001, 4000)
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="UPDATE1" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<bean id="UPDATE1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
 		<constructor-arg><value>
 		update ARTIST set ARTIST_NAME = 'bbb' where ARTIST_ID = 33001
 		</value></constructor-arg>
 	</bean>
 	
-	<bean id="UPDATE2" class="org.objectstyle.cayenne.unit.util.UpdatingSQLTemplate">
-		<constructor-arg type="java.lang.Class"><value>org.objectstyle.art.Artist</value></constructor-arg>
+	<bean id="UPDATE2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.art.Artist</value></constructor-arg>
 		<constructor-arg><value>
 		update ARTIST set ARTIST_NAME = 'ccc' where ARTIST_ID = 33001
 		</value></constructor-arg>