Author: clr
Date: Sun Sep 14 11:27:24 2008
New Revision: 695261

URL: http://svn.apache.org/viewvc?rev=695261&view=rev
Log:
JDO-607 Revert change that causes a conflict between static and non-static methods

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java?rev=695261&r1=695260&r2=695261&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Sun Sep 14 11:27:24 2008
@@ -702,32 +702,4 @@
      */
     Set getFetchGroups();
 
-    /** 
-     * Create a PersistenceManagerFactory from the properties in the
-     * parameter props. 
-     * This method behaves as a static method: none of the
-     * properties of the instance on which the method is called are used
-     * to construct the new PersistenceManagerFactory.
-     * @param props a Map of configuration properties
-     * @return an unconfigurable PersistenceManagerFactory based on the
-     * properties in the parameter Map
-     * @since 2.2
-     */
-    PersistenceManagerFactory getPersistenceManagerFactory (Map props);
-
-    /** 
-     * Create a PersistenceManagerFactory from the properties in the
-     * parameters props and overrides. 
-     * This method behaves as a static method: none of the
-     * properties of the instance on which the method is called are used
-     * to construct the new PersistenceManagerFactory.
-     * @param overrides a Map of configuration properties that override the 
-     * properties in the props parameter
-     * @param props a Map of configuration properties
-     * @return an unconfigurable PersistenceManagerFactory based on the
-     * properties in the parameter Map
-     * @since 2.2
-     */
-    PersistenceManagerFactory getPersistenceManagerFactory (
-            Map overrides, Map props);
 }