openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dez...@apache.org
Subject svn commit: r930357 [8/8] - 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/jdbc/annotations/ openjpa-persistence-jdbc/sr...
Date Fri, 02 Apr 2010 19:38:58 GMT
Propchange: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=930357&r1=930356&r2=930357&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
Fri Apr  2 19:38:58 2010
@@ -534,11 +534,13 @@ 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 detach(T pc);
+    public <T> T detachCopy(T pc);
 
     /**
      * Detach the specified objects from the entity manager.

Propchange: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=930357&r1=930356&r2=930357&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
Fri Apr  2 19:38:58 2010
@@ -35,8 +35,16 @@ public interface OpenJPAEntityManagerFac
 
     /**
      * Return properties describing this runtime.
+     * Although the name has changed, this method
+     * returns the same type as the old getProperties method.
      */
-    public Properties getProperties();
+    public Properties getPropertiesAsProperties();
+
+    /**
+     * Returns properties describing this runtime
+     * using new signature to avoid conflict with JPA 2.0 API
+    */
+    public Map<String, Object> getProperties();
 
     /**
      * Put the specified key-value pair into the map of user objects.

Propchange: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message