You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by de...@apache.org on 2010/07/19 21:20:13 UTC
svn commit: r965591 - in /openjpa/branches/1.1.x:
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/
openjpa-persistence-jdbc/src/test/java/org/...
Author: dezzio
Date: Mon Jul 19 19:20:12 2010
New Revision: 965591
URL: http://svn.apache.org/viewvc?rev=965591&view=rev
Log:
Reverting revisions 930357 and 930378 (except for the line ending changes). These changes were premature.
Modified:
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/ref_guide_remote.xml
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java Mon Jul 19 19:20:12 2010
@@ -1387,7 +1387,7 @@ public abstract class CacheTest extends
CacheObjectA a = (CacheObjectA) c.iterator().next();
if (related)
a.getRelatedArray();
- em.detachCopy(a);
+ em.detach(a);
assertEquals(ORIG_NAME, a.getName());
q.closeAll();
}
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java Mon Jul 19 19:20:12 2010
@@ -92,7 +92,7 @@ public class TestCalendarFields extends
pm = getPM();
c2 = (CalendarFields) pm.find(CalendarFields.class, id2);
assertTimeZonesEquals(c1, c2);
- assertTimeZonesEquals(c1, (CalendarFields) pm.detachCopy(c2));
+ assertTimeZonesEquals(c1, (CalendarFields) pm.detach(c2));
endEm(pm);
}
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java Mon Jul 19 19:20:12 2010
@@ -531,7 +531,7 @@ public class TestDependentFields2 extend
assertEquals(2, owner.getDependentMappedList().size());
else
assertEquals(2, owner.getDependentInverseKeyList().size());
- DependentFieldsPC detached = (DependentFieldsPC) pm.detachCopy(owner);
+ DependentFieldsPC detached = (DependentFieldsPC) pm.detach(owner);
endEm(pm);
if (mapped) {
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java Mon Jul 19 19:20:12 2010
@@ -104,7 +104,7 @@ public class TestDetachedStateManager ex
assertNotNull("b is null in testDetach", b);
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
assertTrue(pm.isDetached(b));
@@ -147,7 +147,7 @@ public class TestDetachedStateManager ex
assertNotNull("b is null in testDetachWithGroups", b);
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
assertTrue(pm.isDetached(b));
@@ -186,7 +186,7 @@ public class TestDetachedStateManager ex
public void testDetachNoOverwrite() {
OpenJPAEntityManager pm = getPM();
AttachB b = (AttachB) pm.find(AttachB.class, oid);
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
b.setBstr("12");
@@ -216,7 +216,7 @@ public class TestDetachedStateManager ex
assertNotNull("b is null in testOptimisticLock", b);
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
b.setAint(12);
@@ -251,7 +251,7 @@ public class TestDetachedStateManager ex
assertNotNull("d is null in testEmbedded", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detachCopy(d);
+ d = (AttachD) pm.detach(d);
endEm(pm);
d.getEmbeddedE().setEstr("E12");
@@ -280,7 +280,7 @@ public class TestDetachedStateManager ex
assertNotNull("d is null in testNullEmbedded", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detachCopy(d);
+ d = (AttachD) pm.detach(d);
endEm(pm);
d.setEmbeddedE(null);
@@ -310,7 +310,7 @@ public class TestDetachedStateManager ex
assertNotNull("d is null in testNullEmbeddedRelated", d);
d.getEmbeddedE().getEstr();
- d = (AttachD) pm.detachCopy(d);
+ d = (AttachD) pm.detach(d);
endEm(pm);
d.getEmbeddedE().setEstr(null);
@@ -337,7 +337,7 @@ public class TestDetachedStateManager ex
OpenJPAEntityManager pm = getPM();
AttachB b = (AttachB) pm.find(AttachB.class, oid);
b.getDs();
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
assertEquals(1, b.getDs().size());
@@ -370,7 +370,7 @@ public class TestDetachedStateManager ex
assertNotNull("b is null in doCollectionTest", b);
b.getDs();
- b = (AttachB) pm.detachCopy(b);
+ b = (AttachB) pm.detach(b);
endEm(pm);
assertEquals("b is null in doCollectionTest", 1, b.getDs().size());
@@ -465,7 +465,7 @@ public class TestDetachedStateManager ex
pc.getRelSet();
pc.getStringIntMap();
if (!auto) {
- pc = (DetachSMPC) pm.detachCopy(pc);
+ pc = (DetachSMPC) pm.detach(pc);
assertDetachedSM(pc);
}
pc = (DetachSMPC) roundtrip(pc, false);
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java Mon Jul 19 19:20:12 2010
@@ -431,7 +431,7 @@ public class TestFetchPlan extends BaseK
PCCompany company1 =
(PCCompany) pm.find(PCCompany.class, _rootCompanyId);
- PCCompany company = (PCCompany) pm.detachCopy(company1);
+ PCCompany company = (PCCompany) pm.detach(company1);
assertTrue("company is equal company1", company != company1);
Set departments = (Set) PCCompany.reflect(company, "departments");
assertNotNull("department is null", departments);
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java Mon Jul 19 19:20:12 2010
@@ -224,7 +224,7 @@ public class TestOptimisticLockGroups ex
throws Exception {
OpenJPAEntityManager pm1 = getPM(false, false);
LockGroupPC pc1 = (LockGroupPC) pm1.find(LockGroupPC.class, oid);
- Object detached = pm1.detachCopy(pc1);
+ Object detached = pm1.detach(pc1);
startTx(pm1);
pc1.setLockGroup0IntField(1);
pc1.setUnlockedStringField("pm1 changed value");
@@ -259,7 +259,7 @@ public class TestOptimisticLockGroups ex
throws Exception {
OpenJPAEntityManager pm1 = getPM(false, false);
LockGroupPC pc1 = (LockGroupPC) pm1.find(LockGroupPC.class, oid);
- Object detached = pm1.detachCopy(pc1);
+ Object detached = pm1.detach(pc1);
startTx(pm1);
pc1.setLockGroup0IntField(1);
endTx(pm1);
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java Mon Jul 19 19:20:12 2010
@@ -187,7 +187,7 @@ public class TestPersistenceManagerFacto
public void testPlatform() {
OpenJPAEntityManagerFactory pmf =
(OpenJPAEntityManagerFactory) getEmf();
- assertNotNull(pmf.getProperties().get("Platform"));
+ assertNotNull(pmf.getProperties().getProperty("Platform"));
}
protected OpenJPAEntityManagerFactory getEmf(Map props) {
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java Mon Jul 19 19:20:12 2010
@@ -437,7 +437,7 @@ public class TestManagedInterfaces exten
em = emf.createEntityManager();
ManagedIface pcx = em.find(ManagedIface.class, oid);
- pc = em.detachCopy(pcx);
+ pc = em.detach(pcx);
em.close();
assertTrue(em.isDetached(pc));
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java Mon Jul 19 19:20:12 2010
@@ -301,8 +301,8 @@ public class TestValueStrategies
endTx(pm);
assertEquals(2, pc.getVersion());
assertEquals(2, pc2.getVersion());
- ValueStrategyPC detached = (ValueStrategyPC) pm.detachCopy(pc);
- ValueStrategyPC detached2 = (ValueStrategyPC) pm.detachCopy(pc2);
+ ValueStrategyPC detached = (ValueStrategyPC) pm.detach(pc);
+ ValueStrategyPC detached2 = (ValueStrategyPC) pm.detach(pc2);
endEm(pm);
// clean attach
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java Mon Jul 19 19:20:12 2010
@@ -79,7 +79,7 @@ public class TestLRS
OpenJPAEntityManager em = emf.createEntityManager();
LRSEntity lrs = em.find(LRSEntity.class, id);
assertLRS(lrs, "lrs");
- lrs = em.detachCopy(lrs);
+ lrs = em.detach(lrs);
assertEquals("lrs", lrs.getName());
assertNull(lrs.getLRSList());
em.close();
Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java Mon Jul 19 19:20:12 2010
@@ -73,7 +73,7 @@ public class TestFlushBeforeDetach exten
i.setItemData("EFGH");
- OpenJPAPersistence.cast(em).detachCopy(i);
+ OpenJPAPersistence.cast(em).detach(i);
em.getTransaction().rollback();
assertNotSQL("UPDATE ITEM SET.*");
em.close();
Modified: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java Mon Jul 19 19:20:12 2010
@@ -97,17 +97,10 @@ public class EntityManagerFactoryImpl
return _factory.getConfiguration();
}
- public Properties getPropertiesAsProperties() {
+ public Properties getProperties() {
return _factory.getProperties();
}
- public Map<String, Object> getProperties() {
- @SuppressWarnings("unchecked")
- HashMap<String, Object> retv =
- new HashMap<String, Object>((Map) getPropertiesAsProperties());
- return retv;
- }
-
public Object putUserObject(Object key, Object val) {
return _factory.putUserObject(key, val);
}
Modified: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Mon Jul 19 19:20:12 2010
@@ -748,7 +748,7 @@ public class EntityManagerImpl
}
@SuppressWarnings("unchecked")
- public <T> T detachCopy(T entity) {
+ public <T> T detach(T entity) {
assertNotCloseInvoked();
return (T) _broker.detach(entity, this);
}
Modified: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java Mon Jul 19 19:20:12 2010
@@ -535,12 +535,10 @@ public interface OpenJPAEntityManager
/**
* Detach the specified object from the entity manager.
*
- * Note: renamed from detach to avoid conflict with JPA 2.0 EntityManager.detach method
- *
* @param pc the instance to detach
* @return the detached instance
*/
- public <T> T detachCopy(T pc);
+ public <T> T detach(T pc);
/**
* Detach the specified objects from the entity manager.
Modified: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java (original)
+++ openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java Mon Jul 19 19:20:12 2010
@@ -34,17 +34,9 @@ public interface OpenJPAEntityManagerFac
extends EntityManagerFactory, Serializable {
/**
- * Return properties describing this runtime.
- * Although the name has changed, this method
- * returns the same type as the old getProperties method.
- */
- public Properties getPropertiesAsProperties();
-
- /**
* Returns properties describing this runtime
- * using new signature to avoid conflict with JPA 2.0 API
*/
- public Map<String, Object> getProperties();
+ public Properties getProperties();
/**
* Put the specified key-value pair into the map of user objects.
Modified: openjpa/branches/1.1.x/openjpa-project/src/doc/manual/ref_guide_remote.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-project/src/doc/manual/ref_guide_remote.xml?rev=965591&r1=965590&r2=965591&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/ref_guide_remote.xml (original)
+++ openjpa/branches/1.1.x/openjpa-project/src/doc/manual/ref_guide_remote.xml Mon Jul 19 19:20:12 2010
@@ -97,7 +97,7 @@ The extended
explicitly detach objects at any time.
</para>
<programlisting>
-public Object detachCopy(Object pc):
+public Object detach(Object pc):
public Object[] detachAll(Object... pcs):
public Collection detachAll(Collection pcs):
</programlisting>