cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1164788 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/ framework/cayenne-jdk1.5-unp...
Date Sat, 03 Sep 2011 02:00:03 GMT
Author: aadamchik
Date: Sat Sep  3 02:00:00 2011
New Revision: 1164788

URL: http://svn.apache.org/viewvc?rev=1164788&view=rev
Log:
CAY-1610 ObjectContext API to use varargs

cleaning up refs to deprecated 'deleteObject'
release notes

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/NestedCayenneContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SingleTableInheritance1Test.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/VerticalInheritanceTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/LightSuperClassTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteCallbacksTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteRollbackTest.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sat Sep  3 02:00:00 2011
@@ -33,6 +33,7 @@ CAY-1598 Per DataMap listeners are calle
 CAY-1599 Annotation-based global listeners registration
 CAY-1605 Switch Cayenne to use unified Maven repository
 CAY-1606 Change CayenneModeler new object naming strategy
+CAY-1610 ObjectContext API to use varargs
 
 Bug Fixes Since 3.1M2:
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java Sat Sep  3 02:00:00 2011
@@ -124,7 +124,7 @@ public class ChildDiffLoader implements 
         setExternalChange(Boolean.TRUE);
 
         try {
-            context.deleteObject(findObject(nodeId));
+            context.deleteObjects(findObject(nodeId));
         }
         finally {
             setExternalChange(Boolean.FALSE);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOneToOneFKTest.java Sat Sep  3 02:00:00 2011
@@ -183,7 +183,7 @@ public class CDOOneToOneFKTest extends S
         context.commitChanges();
 
         src.setToOneToFK(null);
-        context.deleteObject(target);
+        context.deleteObjects(target);
         context.commitChanges();
 
         // test database data

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelDeleteTest.java Sat Sep  3 02:00:00 2011
@@ -62,34 +62,34 @@ public class CDOReflexiveRelDeleteTest e
     // encompass the various orders that might be a problem. Add more if additional
     // problems come to light
     public void testReflexiveRelationshipDelete1() {
-        context.deleteObject(parentGroup);
-        context.deleteObject(childGroup1);
-        context.deleteObject(childGroup2);
-        context.deleteObject(childGroup3);
+        context.deleteObjects(parentGroup);
+        context.deleteObjects(childGroup1);
+        context.deleteObjects(childGroup2);
+        context.deleteObjects(childGroup3);
         context.commitChanges();
     }
 
     public void testReflexiveRelationshipDelete2() {
-        context.deleteObject(childGroup1);
-        context.deleteObject(parentGroup);
-        context.deleteObject(childGroup2);
-        context.deleteObject(childGroup3);
+        context.deleteObjects(childGroup1);
+        context.deleteObjects(parentGroup);
+        context.deleteObjects(childGroup2);
+        context.deleteObjects(childGroup3);
         context.commitChanges();
     }
 
     public void testReflexiveRelationshipDelete3() {
-        context.deleteObject(childGroup1);
-        context.deleteObject(childGroup3);
-        context.deleteObject(parentGroup);
-        context.deleteObject(childGroup2);
+        context.deleteObjects(childGroup1);
+        context.deleteObjects(childGroup3);
+        context.deleteObjects(parentGroup);
+        context.deleteObjects(childGroup2);
         context.commitChanges();
     }
 
     public void testReflexiveRelationshipDelete4() {
-        context.deleteObject(childGroup3);
-        context.deleteObject(parentGroup);
-        context.deleteObject(childGroup1);
-        context.deleteObject(childGroup2);
+        context.deleteObjects(childGroup3);
+        context.deleteObjects(parentGroup);
+        context.deleteObjects(childGroup1);
+        context.deleteObjects(childGroup2);
         context.commitChanges();
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOReflexiveRelTest.java Sat Sep  3 02:00:00 2011
@@ -42,7 +42,7 @@ public class CDOReflexiveRelTest extends
         childGroup1.setName("child1");
         childGroup1.setToParentGroup(parentGroup);
 
-        context.deleteObject(parentGroup);
+        context.deleteObjects(parentGroup);
     }
 
     public void testAddDeleteWithCommit() {
@@ -54,7 +54,7 @@ public class CDOReflexiveRelTest extends
         childGroup1.setToParentGroup(parentGroup);
         context.commitChanges();
 
-        context.deleteObject(parentGroup);
+        context.deleteObjects(parentGroup);
         context.commitChanges();
     }
 
@@ -70,8 +70,8 @@ public class CDOReflexiveRelTest extends
 
         childGroup1.setToParentGroup(parentGroup2);
 
-        context.deleteObject(parentGroup1);
-        context.deleteObject(parentGroup2);
+        context.deleteObjects(parentGroup1);
+        context.deleteObjects(parentGroup2);
     }
 
     public void testReplaceDeleteWithCommit() {
@@ -86,8 +86,8 @@ public class CDOReflexiveRelTest extends
         childGroup1.setToParentGroup(parentGroup2);
         context.commitChanges();
 
-        context.deleteObject(parentGroup1);
-        context.deleteObject(parentGroup2);
+        context.deleteObjects(parentGroup1);
+        context.deleteObjects(parentGroup2);
         context.commitChanges();
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsTest.java Sat Sep  3 02:00:00 2011
@@ -112,7 +112,7 @@ public class CayenneContextClientChannel
         // insert, then delete - this shouldn't propagate via an event.
         ClientMtTable1 o1 = c1.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("X");
-        c1.deleteObject(o1);
+        c1.deleteObjects(o1);
 
         // introduce some other change so that commit can go ahead...
         ClientMtTable1 o1x = c1.newObject(ClientMtTable1.class);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesTest.java Sat Sep  3 02:00:00 2011
@@ -44,7 +44,7 @@ public class CayenneContextDeleteRulesTe
         object.setNullify(related);
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         assertFalse(related.getFromNullify().contains(object));
         assertNull(object.getNullify());
 
@@ -60,7 +60,7 @@ public class CayenneContextDeleteRulesTe
         context.commitChanges();
 
         try {
-            context.deleteObject(object);
+            context.deleteObjects(object);
             fail("Should have thrown an exception");
         }
         catch (DeleteDenyException e) {
@@ -68,7 +68,7 @@ public class CayenneContextDeleteRulesTe
         }
 
         object.setDeny(null);
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
     }
 
@@ -83,7 +83,7 @@ public class CayenneContextDeleteRulesTe
         object.setCascade(related);
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         assertEquals(PersistenceState.DELETED, related.getPersistenceState());
         assertTrue(context.deletedObjects().contains(related));
 
@@ -100,7 +100,7 @@ public class CayenneContextDeleteRulesTe
         object.setName("object");
         object.setCascade(related);
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         assertEquals(PersistenceState.TRANSIENT, object.getPersistenceState());
         assertEquals(PersistenceState.DELETED, related.getPersistenceState());
         assertFalse(context.deletedObjects().contains(object));

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorTest.java Sat Sep  3 02:00:00 2011
@@ -79,7 +79,7 @@ public class CayenneContextGraphDiffComp
 
         ClientMtTable1 o1 = context.newObject(ClientMtTable1.class);
         o1.setGlobalAttribute1("v1");
-        context.deleteObject(o1);
+        context.deleteObjects(o1);
 
         DataChannelSyncStats stats = clientServerInterceptor
                 .runWithSyncStatsCollection(new UnitTestClosure() {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextTest.java Sat Sep  3 02:00:00 2011
@@ -251,14 +251,14 @@ public class CayenneContextTest extends 
 
         // TRANSIENT ... should quietly ignore it
         Persistent transientObject = new MockPersistentObject();
-        context.deleteObject(transientObject);
+        context.deleteObjects(transientObject);
         assertEquals(PersistenceState.TRANSIENT, transientObject.getPersistenceState());
 
         // NEW ... should make it TRANSIENT
         // create via context to make sure that object store would register it
         Persistent newObject = context.newObject(MockPersistentObject.class);
         assertNotNull(newObject.getObjectContext());
-        context.deleteObject(newObject);
+        context.deleteObjects(newObject);
         assertNull(newObject.getObjectContext());
         assertEquals(PersistenceState.TRANSIENT, newObject.getPersistenceState());
         assertFalse(context.internalGraphManager().dirtyNodes().contains(
@@ -272,7 +272,7 @@ public class CayenneContextTest extends 
         committed.setPersistenceState(PersistenceState.COMMITTED);
         committed.setObjectId(new ObjectId("test_entity", "key", "value1"));
         committed.setObjectContext(context);
-        context.deleteObject(committed);
+        context.deleteObjects(committed);
         assertEquals(PersistenceState.DELETED, committed.getPersistenceState());
 
         // MODIFIED
@@ -280,7 +280,7 @@ public class CayenneContextTest extends 
         modified.setPersistenceState(PersistenceState.MODIFIED);
         modified.setObjectId(new ObjectId("test_entity", "key", "value2"));
         modified.setObjectContext(context);
-        context.deleteObject(modified);
+        context.deleteObjects(modified);
         assertEquals(PersistenceState.DELETED, modified.getPersistenceState());
 
         // DELETED
@@ -288,7 +288,7 @@ public class CayenneContextTest extends 
         deleted.setPersistenceState(PersistenceState.DELETED);
         deleted.setObjectId(new ObjectId("test_entity", "key", "value3"));
         deleted.setObjectContext(context);
-        context.deleteObject(deleted);
+        context.deleteObjects(deleted);
         assertEquals(PersistenceState.DELETED, committed.getPersistenceState());
     }
 
@@ -393,7 +393,7 @@ public class CayenneContextTest extends 
         assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
 
         // testing this...
-        context.deleteObject(hollow);
+        context.deleteObjects(hollow);
         assertSame(hollow, context.getGraphManager().getNode(gid));
         assertEquals(inflated.getGlobalAttribute1Direct(), hollow
                 .getGlobalAttribute1Direct());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextValidationTest.java Sat Sep  3 02:00:00 2011
@@ -66,8 +66,8 @@ public class CayenneContextValidationTes
         assertTrue(o1.isValidatedForUpdate());
 
         o1.resetValidation(false);
-        context.deleteObject(o1);
-        context.deleteObject(o2);
+        context.deleteObjects(o1);
+        context.deleteObjects(o2);
 
         context.commitChanges();
         assertFalse(o1.isValidatedForInsert());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Sat Sep  3 02:00:00 2011
@@ -270,7 +270,7 @@ public class CayenneContextWithDataConte
             clientContext.commitChanges();
             assertFalse(flag[0]);
 
-            clientContext.deleteObject(object);
+            clientContext.deleteObjects(object);
             clientContext.commitChanges();
             assertTrue(flag[0]);
         }
@@ -322,8 +322,8 @@ public class CayenneContextWithDataConte
             o2.setToParent(o1);
             clientContext.commitChanges();
 
-            clientContext.deleteObject(o1);
-            clientContext.deleteObject(o2);
+            clientContext.deleteObjects(o1);
+            clientContext.deleteObjects(o2);
             clientContext.commitChanges();
             // per CAY-830 an exception is thrown here
         }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelTest.java Sat Sep  3 02:00:00 2011
@@ -210,7 +210,7 @@ public class CayenneDataObjectFlattenedR
         ArtGroup group = a1.getGroupArray().get(0);
         a1.removeFromGroupArray(group); // Cause the delete of the link record
 
-        context.deleteObject(a1); // Cause the deletion of the artist
+        context.deleteObjects(a1); // Cause the deletion of the artist
 
         try {
             context.commitChanges();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInContextTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectInContextTest.java Sat Sep  3 02:00:00 2011
@@ -188,7 +188,7 @@ public class CayenneDataObjectInContextT
         context.commitChanges();
         assertEquals(PersistenceState.COMMITTED, o1.getPersistenceState());
 
-        context.deleteObject(o1);
+        context.deleteObjects(o1);
         assertEquals(PersistenceState.DELETED, o1.getPersistenceState());
     }
 
@@ -198,7 +198,7 @@ public class CayenneDataObjectInContextT
         o1.setArtistName("qY");
         context.commitChanges();
 
-        context.deleteObject(o1);
+        context.deleteObjects(o1);
         assertEquals(PersistenceState.DELETED, o1.getPersistenceState());
 
         context.commitChanges();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsTest.java Sat Sep  3 02:00:00 2011
@@ -274,7 +274,7 @@ public class CayenneDataObjectRelationsh
 
         context.commitChanges();
 
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/NestedCayenneContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/NestedCayenneContextTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/NestedCayenneContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/NestedCayenneContextTest.java Sat Sep  3 02:00:00 2011
@@ -81,7 +81,7 @@ public class NestedCayenneContextTest ex
 
         clientContext.commitChanges();
 
-        clientContext.deleteObject(deleted);
+        clientContext.deleteObjects(deleted);
         modified.setGlobalAttribute1("a");
 
         final ClientMtTable1 _new = clientContext.newObject(ClientMtTable1.class);
@@ -205,7 +205,7 @@ public class NestedCayenneContextTest ex
 
         // test how different object states appear in the child on select
 
-        clientContext.deleteObject(deleted);
+        clientContext.deleteObjects(deleted);
         modified.setGlobalAttribute1("a");
 
         ClientMtTable1 _new = clientContext.newObject(ClientMtTable1.class);
@@ -335,7 +335,7 @@ public class NestedCayenneContextTest ex
 
         child.commitChangesToParent();
 
-        child.deleteObject(p);
+        child.deleteObjects(p);
         aChild.removeFromTable2Array(p);
 
         child.commitChangesToParent();
@@ -554,7 +554,7 @@ public class NestedCayenneContextTest ex
 
         // delete AND modify
         ClientMtTable1 childDeleted = (ClientMtTable1) objects.get(2);
-        child.deleteObject(childDeleted);
+        child.deleteObjects(childDeleted);
         childDeleted.setGlobalAttribute1("DDD");
 
         // don't block queries - on delete Cayenne may need to resolve delete rules via
@@ -601,7 +601,7 @@ public class NestedCayenneContextTest ex
 
         // delete AND modify
         ClientMtTable1 childDeleted = (ClientMtTable1) objects.get(2);
-        child.deleteObject(childDeleted);
+        child.deleteObjects(childDeleted);
         childDeleted.setGlobalAttribute1("DDD");
 
         ClientMtTable1 childHollow = (ClientMtTable1) objects.get(3);
@@ -663,7 +663,7 @@ public class NestedCayenneContextTest ex
         a.removeFromTable2Array(p2);
 
         // this causes an error on commit
-        child.deleteObject(p2);
+        child.deleteObjects(p2);
 
         child.commitChangesToParent();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java Sat Sep  3 02:00:00 2011
@@ -140,7 +140,7 @@ public class DataContextCallbacksTest ex
         Artist a1 = context.newObject(Artist.class);
         a1.setArtistName("XX");
         context.commitChanges();
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
         assertFalse(a1.isPostAdded());
         assertFalse(a1.isPreRemoved());
 
@@ -150,7 +150,7 @@ public class DataContextCallbacksTest ex
         Artist a2 = context.newObject(Artist.class);
         a2.setArtistName("XX");
         context.commitChanges();
-        context.deleteObject(a2);
+        context.deleteObjects(a2);
         assertFalse(a2.isPostAdded());
         assertTrue(a2.isPreRemoved());
 
@@ -164,7 +164,7 @@ public class DataContextCallbacksTest ex
         Artist a3 = context.newObject(Artist.class);
         a3.setArtistName("XX");
         context.commitChanges();
-        context.deleteObject(a3);
+        context.deleteObjects(a3);
         assertFalse(a3.isPostAdded());
         assertTrue(a3.isPreRemoved());
 
@@ -173,7 +173,7 @@ public class DataContextCallbacksTest ex
         Painting p3 = context.newObject(Painting.class);
         p3.setPaintingTitle("XX");
         context.commitChanges();
-        context.deleteObject(p3);
+        context.deleteObjects(p3);
         assertFalse(p3.isPostAdded());
         assertFalse(p3.isPreRemoved());
         assertSame(a3, listener2.getPublicCalledbackEntity());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCharPKTest.java Sat Sep  3 02:00:00 2011
@@ -80,7 +80,7 @@ public class DataContextCharPKTest exten
         object.setPkCol("PK1");
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
 
         SQLTemplate q = new SQLTemplate(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheTest.java Sat Sep  3 02:00:00 2011
@@ -156,7 +156,7 @@ public class DataContextDelegateSharedCa
         assertEquals(PersistenceState.COMMITTED, altArtist.getPersistenceState());
 
         // Update and save artist in peer context
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // assert that delegate was consulted when an object store
@@ -199,7 +199,7 @@ public class DataContextDelegateSharedCa
         assertEquals(PersistenceState.COMMITTED, altArtist.getPersistenceState());
 
         // Update and save artist in peer context
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // assert that delegate was consulted when an object store

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesTest.java Sat Sep  3 02:00:00 2011
@@ -77,7 +77,7 @@ public class DataContextDeleteRulesTest 
         // Always good to commit before deleting... bad things happen otherwise
         context.commitChanges();
 
-        context.deleteObject(childGroup);
+        context.deleteObjects(childGroup);
 
         // The things we are testing.
         assertFalse(parentGroup.getChildGroupsArray().contains(childGroup));
@@ -110,7 +110,7 @@ public class DataContextDeleteRulesTest 
         List<?> joins1 = context.performQuery(checkQuery);
         assertEquals(1, joins1.size());
 
-        context.deleteObject(anArtist);
+        context.deleteObjects(anArtist);
 
         assertEquals(PersistenceState.DELETED, aGroup.getPersistenceState());
         assertFalse(anArtist.getGroupArray().contains(aGroup));
@@ -145,7 +145,7 @@ public class DataContextDeleteRulesTest 
         List<?> joins1 = context.performQuery(checkQuery);
         assertEquals(1, joins1.size());
 
-        context.deleteObject(aGroup);
+        context.deleteObjects(aGroup);
         assertFalse(anArtist.getGroupArray().contains(aGroup));
         context.commitChanges();
 
@@ -168,7 +168,7 @@ public class DataContextDeleteRulesTest 
 
         context.commitChanges();
 
-        context.deleteObject(parentGroup);
+        context.deleteObjects(parentGroup);
 
         // The things we are testing.
         assertNull(childGroup.getToParentGroup());
@@ -190,7 +190,7 @@ public class DataContextDeleteRulesTest 
         // and everything must be committed for certain things to work
         context.commitChanges();
 
-        context.deleteObject(painting);
+        context.deleteObjects(painting);
 
         // info must also be deleted
         assertEquals(PersistenceState.DELETED, info.getPersistenceState());
@@ -219,7 +219,7 @@ public class DataContextDeleteRulesTest 
         artistExhibit.setToExhibit(anExhibit);
         context.commitChanges();
 
-        context.deleteObject(anArtist);
+        context.deleteObjects(anArtist);
 
         // Test that the link record was deleted, and removed from the relationship
         assertEquals(PersistenceState.DELETED, artistExhibit.getPersistenceState());
@@ -237,7 +237,7 @@ public class DataContextDeleteRulesTest 
         context.commitChanges();
 
         try {
-            context.deleteObject(gallery);
+            context.deleteObjects(gallery);
             fail("Should have thrown an exception");
         }
         catch (Exception e) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesTest.java Sat Sep  3 02:00:00 2011
@@ -349,7 +349,7 @@ public class DataContextFlattenedAttribu
 
         context.commitChanges();
 
-        context.deleteObject(o1);
+        context.deleteObjects(o1);
         context.commitChanges();
 
         Number artistCount = (Number) Cayenne.objectForQuery(context, new EJBQLQuery(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingTest.java Sat Sep  3 02:00:00 2011
@@ -177,7 +177,7 @@ public class DataContextObjectTrackingTe
                         "Artist",
                         Artist.ARTIST_ID_PK_COLUMN,
                         33004)));
-        context.deleteObject(deleted);
+        context.deleteObjects(deleted);
 
         assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
         assertEquals(PersistenceState.COMMITTED, committed.getPersistenceState());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextRollbackTest.java Sat Sep  3 02:00:00 2011
@@ -174,8 +174,8 @@ public class DataContextRollbackTest ext
         Artist artist = (Artist) context.newObject("Artist");
         artist.setArtistName(artistName);
         context.commitChanges();
-        // Save... cayenne doesn't yet handle deleting objects that are uncommitted
-        context.deleteObject(artist);
+       
+        context.deleteObjects(artist);
         context.rollbackChanges();
 
         // Now check everything is as it should be

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java Sat Sep  3 02:00:00 2011
@@ -244,7 +244,7 @@ public class DataContextSharedCacheTest 
         assertEquals(PersistenceState.COMMITTED, altArtist.getPersistenceState());
 
         // Update Artist
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // check underlying cache
@@ -280,7 +280,7 @@ public class DataContextSharedCacheTest 
         assertEquals(PersistenceState.HOLLOW, altArtist.getPersistenceState());
 
         // Update Artist
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // check underlying cache
@@ -319,7 +319,7 @@ public class DataContextSharedCacheTest 
         assertEquals(PersistenceState.MODIFIED, altArtist.getPersistenceState());
 
         // Update Artist
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // check underlying cache
@@ -366,10 +366,10 @@ public class DataContextSharedCacheTest 
         assertFalse(altArtist == artist);
 
         // delete peer
-        context1.deleteObject(altArtist);
+        context1.deleteObjects(altArtist);
 
         // Update Artist
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         context.commitChanges();
 
         // check underlying cache
@@ -434,7 +434,7 @@ public class DataContextSharedCacheTest 
         assertSame(altArtist, altPainting2.readPropertyDirectly("toArtist"));
 
         // delete painting
-        context.deleteObject(painting1);
+        context.deleteObjects(painting1);
         context.commitChanges();
 
         // check underlying cache
@@ -703,7 +703,7 @@ public class DataContextSharedCacheTest 
         assertEquals(PersistenceState.COMMITTED, artist.getPersistenceState());
 
         // delete object PRIOR to killing the snapshot
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
 
         context.getObjectStore().getDataRowCache().forgetSnapshot(id);
         assertNull(context.getObjectStore().getDataRowCache().getCachedSnapshot(id));

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java Sat Sep  3 02:00:00 2011
@@ -565,7 +565,7 @@ public class DataContextTest extends Ser
                 Artist.ARTIST_NAME_PROPERTY,
                 "artist1"));
         ROArtist a1 = (ROArtist) context.performQuery(query).get(0);
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
 
         try {
             context.commitChanges();
@@ -717,7 +717,7 @@ public class DataContextTest extends Ser
         assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
 
         // testing this...
-        context.deleteObject(hollow);
+        context.deleteObjects(hollow);
         assertSame(hollow, context.getGraphManager().getNode(gid));
         assertEquals(inflated.getArtistName(), hollow.getArtistName());
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java Sat Sep  3 02:00:00 2011
@@ -321,7 +321,7 @@ public class DataDomainCallbacksTest ext
                 listener2,
                 "publicCallback");
 
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
         context.commitChanges();
 
         assertTrue(a1.isPostRemoved());
@@ -352,7 +352,7 @@ public class DataDomainCallbacksTest ext
 
         // change before removing
         a1.setArtistName("YY");
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
         context.commitChanges();
 
         assertNull(listener2.getPublicCalledbackEntity());
@@ -386,7 +386,7 @@ public class DataDomainCallbacksTest ext
 
         Artist a1 = context.newObject(Artist.class);
         a1.setArtistName("XX");
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
         context.commitChanges();
 
         assertNull(listener0.getPublicCalledbackEntity());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteObjectTest.java Sat Sep  3 02:00:00 2011
@@ -89,7 +89,7 @@ public class DeleteObjectTest extends Se
 
         Artist artist = Cayenne.objectForPK(context, Artist.class, 1);
         assertEquals(PersistenceState.COMMITTED, artist.getPersistenceState());
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         assertEquals(PersistenceState.DELETED, artist.getPersistenceState());
         context.commitChanges();
         assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
@@ -187,7 +187,7 @@ public class DeleteObjectTest extends Se
         while (deleteIt.hasNext()) {
             Painting object = deleteIt.next();
             deleteIt.remove();
-            context.deleteObject(object);
+            context.deleteObjects(object);
         }
 
         // relationship list has to be cleaned up,
@@ -208,7 +208,7 @@ public class DeleteObjectTest extends Se
         Artist a = p.getToArtist();
 
         assertEquals(PersistenceState.HOLLOW, a.getPersistenceState());
-        context.deleteObject(a);
+        context.deleteObjects(a);
         assertEquals(PersistenceState.DELETED, a.getPersistenceState());
     }
 
@@ -217,7 +217,7 @@ public class DeleteObjectTest extends Se
         artist.setArtistName("a");
 
         assertEquals(PersistenceState.NEW, artist.getPersistenceState());
-        context.deleteObject(artist);
+        context.deleteObjects(artist);
         assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());
         context.rollbackChanges();
         assertEquals(PersistenceState.TRANSIENT, artist.getPersistenceState());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DeleteRulesTest.java Sat Sep  3 02:00:00 2011
@@ -66,7 +66,7 @@ public class DeleteRulesTest extends Ser
         context.commitChanges();
 
         try {
-            context.deleteObject(test1);
+            context.deleteObjects(test1);
             fail("Should have thrown an exception");
         }
         catch (Exception e) {
@@ -83,7 +83,7 @@ public class DeleteRulesTest extends Ser
         context.commitChanges();
 
         // must go on without exceptions...
-        context.deleteObject(test3);
+        context.deleteObjects(test3);
         context.commitChanges();
     }
 
@@ -94,7 +94,7 @@ public class DeleteRulesTest extends Ser
         context.commitChanges();
 
         // must go on without exceptions...
-        context.deleteObject(test2);
+        context.deleteObjects(test2);
 
         // don't commit, since this will cause a constraint exception
     }
@@ -111,7 +111,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -139,7 +139,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -164,7 +164,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -190,7 +190,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -215,7 +215,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -241,7 +241,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             // must go on without exceptions...
-            context.deleteObject(a);
+            context.deleteObjects(a);
 
             // assert that join is deleted
             assertJoinDeleted(a, b);
@@ -266,7 +266,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             try {
-                context.deleteObject(a);
+                context.deleteObjects(a);
                 fail("Must have thrown a deny exception..");
             }
             catch (DeleteDenyException ex) {
@@ -291,7 +291,7 @@ public class DeleteRulesTest extends Ser
             context.commitChanges();
 
             try {
-                context.deleteObject(a);
+                context.deleteObjects(a);
                 fail("Must have thrown a deny exception..");
             }
             catch (DeleteDenyException ex) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java Sat Sep  3 02:00:00 2011
@@ -165,7 +165,7 @@ public class NestedDataContextReadTest e
                         "Artist",
                         Artist.ARTIST_ID_PK_COLUMN,
                         33004)));
-        context.deleteObject(deleted);
+        context.deleteObjects(deleted);
 
         assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
         assertEquals(PersistenceState.COMMITTED, committed.getPersistenceState());
@@ -315,7 +315,7 @@ public class NestedDataContextReadTest e
                         "Artist",
                         Artist.ARTIST_ID_PK_COLUMN,
                         33004)));
-        context.deleteObject(deleted);
+        context.deleteObjects(deleted);
 
         assertEquals(PersistenceState.HOLLOW, hollow.getPersistenceState());
         assertEquals(PersistenceState.COMMITTED, committed.getPersistenceState());
@@ -370,7 +370,7 @@ public class NestedDataContextReadTest e
                 deletedTargetSrcId);
         Artist deletedTarget = deletedTargetSrc.getToArtist();
         deletedTargetSrc.setToArtist(null);
-        context.deleteObject(deletedTarget);
+        context.deleteObjects(deletedTarget);
 
         Painting committedTargetSrc = Cayenne.objectForPK(
                 context,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java Sat Sep  3 02:00:00 2011
@@ -139,7 +139,7 @@ public class NestedDataContextWriteTest 
 
         childContext.commitChangesToParent();
 
-        childContext.deleteObject(p);
+        childContext.deleteObjects(p);
         a.removeFromPaintingArray(p);
 
         childContext.commitChangesToParent();
@@ -266,7 +266,7 @@ public class NestedDataContextWriteTest 
 
         // delete AND modify
         Artist childDeleted = (Artist) objects.get(2);
-        childContext.deleteObject(childDeleted);
+        childContext.deleteObjects(childDeleted);
         childDeleted.setArtistName("DDD");
 
         // don't block queries - on delete Cayenne may need to resolve delete rules via
@@ -310,7 +310,7 @@ public class NestedDataContextWriteTest 
 
         // delete AND modify
         Artist childDeleted = (Artist) objects.get(2);
-        childContext.deleteObject(childDeleted);
+        childContext.deleteObjects(childDeleted);
         childDeleted.setArtistName("DDD");
 
         Artist childHollow = (Artist) objects.get(3);
@@ -639,7 +639,7 @@ public class NestedDataContextWriteTest 
         a.removeFromPaintingArray(p2);
 
         // this causes an error on commit
-        child.deleteObject(p2);
+        child.deleteObjects(p2);
 
         child.commitChangesToParent();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NumericTypesTest.java Sat Sep  3 02:00:00 2011
@@ -278,7 +278,7 @@ public class NumericTypesTest extends Se
         ObjectId syntheticId = new ObjectId("DecimalPKTestEntity", map);
         assertSame(object, context.localObject(syntheticId, null));
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/OptimisticLockingTest.java Sat Sep  3 02:00:00 2011
@@ -131,7 +131,7 @@ public class OptimisticLockingTest exten
         object.setDescription("first update");
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
     }
 
@@ -148,7 +148,7 @@ public class OptimisticLockingTest exten
         object.setDescription("first update");
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.invalidateObjects(Collections.singletonList(object));
         context.commitChanges();
     }
@@ -167,7 +167,7 @@ public class OptimisticLockingTest exten
         object.setDescription("first update");
         context.commitChanges();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.getObjectStore().getDataRowCache().forgetSnapshot(object.getObjectId());
         context.commitChanges();
     }
@@ -186,7 +186,7 @@ public class OptimisticLockingTest exten
         context.commitChanges();
 
         context.invalidateObjects(Collections.singletonList(object));
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
     }
 
@@ -205,7 +205,7 @@ public class OptimisticLockingTest exten
         context.commitChanges();
 
         context.getObjectStore().getDataRowCache().forgetSnapshot(object.getObjectId());
-        context.deleteObject(object);
+        context.deleteObjects(object);
         context.commitChanges();
     }
 
@@ -225,7 +225,7 @@ public class OptimisticLockingTest exten
         // change row underneath, delete and save... optimistic lock failure expected
         createSimpleLockUpdate();
 
-        context.deleteObject(object);
+        context.deleteObjects(object);
 
         try {
             context.commitChanges();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListTest.java Sat Sep  3 02:00:00 2011
@@ -101,7 +101,7 @@ public class SimpleIdIncrementalFaultLis
         assertEquals(25, list.size());
 
         Artist a1 = list.get(0);
-        context.deleteObject(a1);
+        context.deleteObjects(a1);
         context.commitChanges();
 
         list.remove(0);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SingleTableInheritance1Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SingleTableInheritance1Test.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SingleTableInheritance1Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/SingleTableInheritance1Test.java Sat Sep  3 02:00:00 2011
@@ -74,9 +74,9 @@ public class SingleTableInheritance1Test
         context.performQuery(query);
         context.commitChanges();
 
-        context.deleteObject(group1);
-        context.deleteObject(group2);
-        context.deleteObject(user);
+        context.deleteObjects(group1);
+        context.deleteObjects(group2);
+        context.deleteObjects(user);
         context.commitChanges();
     }
 
@@ -89,14 +89,14 @@ public class SingleTableInheritance1Test
         group.addToGroupMembers(user);
         context.commitChanges();
 
-        context.deleteObject(user);
+        context.deleteObjects(user);
         assertTrue(group.getGroupMembers().isEmpty());
 
         context.commitChanges();
 
         // here Cayenne would throw per CAY-1378 on an attempt to delete a previously
         // related transient object
-        context.deleteObject(group);
+        context.deleteObjects(group);
         context.commitChanges();
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ToManyListTest.java Sat Sep  3 02:00:00 2011
@@ -173,7 +173,7 @@ public class ToManyListTest extends Serv
 
         // now delete p2 and resolve list
         ((Artist) list.getRelationshipOwner()).removeFromPaintingArray(p2);
-        context.deleteObject(p2);
+        context.deleteObjects(p2);
         context.commitChanges();
 
         assertTrue("List must be unresolved...", list.isFault());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/VerticalInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/VerticalInheritanceTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/VerticalInheritanceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/VerticalInheritanceTest.java Sat Sep  3 02:00:00 2011
@@ -186,7 +186,7 @@ public class VerticalInheritanceTest ext
         assertEquals("BdE2", subdata[1]);
         assertEquals("BUuT", subdata[2]);
 
-        sub21.getObjectContext().deleteObject(sub21);
+        sub21.getObjectContext().deleteObjects(sub21);
         sub21.getObjectContext().commitChanges();
 
         assertEquals(0, ivRootTable.getRowCount());
@@ -437,10 +437,10 @@ public class VerticalInheritanceTest ext
         assertEquals(4, resultTypes.size());
 
         IvRoot root = resultTypes.get(IvRoot.class.getName());
-        context.deleteObject(root);
+        context.deleteObjects(root);
 
         IvSub1 sub1 = (IvSub1) resultTypes.get(IvSub1.class.getName());
-        context.deleteObject(sub1);
+        context.deleteObjects(sub1);
 
         context.commitChanges();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java Sat Sep  3 02:00:00 2011
@@ -177,7 +177,7 @@ public class SoftDeleteBatchQueryBuilder
                 }
             }.assertWithTimeout(200);
 
-            context.deleteObject(test);
+            context.deleteObjects(test);
             assertEquals(test.getPersistenceState(), PersistenceState.DELETED);
             context.commitChanges();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionTest.java Sat Sep  3 02:00:00 2011
@@ -29,7 +29,7 @@ public class CayenneContextDeletionTest 
         ClientMtTable1 object = clientContext.newObject(ClientMtTable1.class);
         clientContext.commitChanges();
 
-        clientContext.deleteObject(object);
+        clientContext.deleteObjects(object);
 
         // now check that the object is unregistered
         clientContext.commitChanges();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/LightSuperClassTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/LightSuperClassTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/LightSuperClassTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/LightSuperClassTest.java Sat Sep  3 02:00:00 2011
@@ -82,7 +82,7 @@ public class LightSuperClassTest extends
 
         context.commitChanges();
 
-        context.deleteObject(country);
+        context.deleteObjects(country);
         assertEquals(continent.getCountries().size(), 0);
         continent.setName("Australia");
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteCallbacksTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteCallbacksTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteCallbacksTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteCallbacksTest.java Sat Sep  3 02:00:00 2011
@@ -64,7 +64,7 @@ public class RemoteCallbacksTest extends
         Thread.sleep(5); //until commit
         assertAll(1, 0, 1, 1, 1, 1, 0, 0);
         
-        context.deleteObject(l1);
+        context.deleteObjects(l1);
         assertAll(1, 0, 1, 1, 1, 1, 1, 0);
         
         context.commitChanges();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteRollbackTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteRollbackTest.java?rev=1164788&r1=1164787&r2=1164788&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteRollbackTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteRollbackTest.java Sat Sep  3 02:00:00 2011
@@ -122,7 +122,7 @@ public class RemoteRollbackTest extends 
         o1.setGlobalAttribute1(o1Name);
         clientContext.commitChanges();
         // Save... cayenne doesn't yet handle deleting objects that are uncommitted
-        clientContext.deleteObject(o1);
+        clientContext.deleteObjects(o1);
         clientContext.rollbackChanges();
 
         //TODO: The state is committed for Cayenne context, but Hollow for DataContext?!



Mime
View raw message