Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: jdo-dev@db.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r693241 - in /db/jdo/trunk:
 api2/src/java/javax/jdo/PersistenceManagerFactory.java
 tck2/src/conf/jdo-2_2-signatures.txt
Date: Mon, 08 Sep 2008 20:21:44 -0000
To: jdo-commits@db.apache.org
From: clr@apache.org
Message-Id: <20080908202145.9F2AD238899F@eris.apache.org>

Author: clr
Date: Mon Sep  8 13:21:44 2008
New Revision: 693241

URL: http://svn.apache.org/viewvc?rev=693241&view=rev
Log:
JDO-607 Add getPMF methods to PMF interface

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
    db/jdo/trunk/tck2/src/conf/jdo-2_2-signatures.txt

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=693241&r1=693240&r2=693241&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Mon Sep  8 13:21:44 2008
@@ -27,6 +27,7 @@
 import javax.jdo.spi.JDOPermission; // for getFetchGroups javadoc
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
@@ -52,7 +53,7 @@
  * <P>Operational state (<code>PersistenceManager</code> pooling, connection 
  * pooling, operational parameters) must not be serialized.
  *
- * @version 2.1
+ * @version 2.2
  */
 
 public interface PersistenceManagerFactory extends Serializable {
@@ -664,4 +665,33 @@
      * @since 2.2
      */
     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);
 }

Modified: db/jdo/trunk/tck2/src/conf/jdo-2_2-signatures.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdo-2_2-signatures.txt?rev=693241&r1=693240&r2=693241&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/jdo-2_2-signatures.txt (original)
+++ db/jdo/trunk/tck2/src/conf/jdo-2_2-signatures.txt Mon Sep  8 13:21:44 2008
@@ -813,6 +813,8 @@
     void removeAllFetchGroups();
     javax.jdo.FetchGroup getFetchGroup(Class cls, String name);
     java.util.Set getFetchGroups();
+    public javax.jdo.PersistenceManagerFactory getPersistenceManagerFactory(java.util.Map, java.util.Map);
+    public javax.jdo.PersistenceManagerFactory getPersistenceManagerFactory(java.util.Map);
 }
 
 public interface javax.jdo.Query extends java.io.Serializable {