Index: src/java/javax/jdo/PersistenceManager.java
===================================================================
--- src/java/javax/jdo/PersistenceManager.java	(revision 497582)
+++ src/java/javax/jdo/PersistenceManager.java	(working copy)
@@ -23,6 +23,7 @@
 package javax.jdo;
 
 import java.util.Collection;
+import java.util.Date;
 
 import javax.jdo.datastore.JDOConnection;
 import javax.jdo.datastore.Sequence;
@@ -1084,4 +1085,16 @@
      * @since 2.0
      */
     void removeInstanceLifecycleListener (InstanceLifecycleListener listener);
+
+    /**
+     * Get the Date as seen by the server. 
+     * Clients using this method can order their operations according to 
+     * a single time source. Implementations use the setting of the 
+     * server time zone to prepare a Date instance that represents 
+     * UTC time on the server. 
+     * @return a Date instance corresponding to the UTC Date 
+     * as seen by the server
+     * @since 2.1
+     */
+    Date getServerDate();
 }
Index: src/java/javax/jdo/PersistenceManagerFactory.java
===================================================================
--- src/java/javax/jdo/PersistenceManagerFactory.java	(revision 497582)
+++ src/java/javax/jdo/PersistenceManagerFactory.java	(working copy)
@@ -51,7 +51,7 @@
  * <P>Operational state (<code>PersistenceManager</code> pooling, connection 
  * pooling, operational parameters) must not be serialized.
  *
- * @version 2.0
+ * @version 2.1
  */
 
 public interface PersistenceManagerFactory extends java.io.Serializable {
@@ -94,6 +94,29 @@
      */
     PersistenceManager getPersistenceManager();
 
+    /** Get a thread-safe instance of a proxy that dynamically binds 
+     * on each method call to an instance of <code>PersistenceManager</code>.
+     * <P>When used with a <code>PersistenceManagerFactory</code>
+     * that uses TransactionType JTA,
+     * the proxy can be used in a server to dynamically bind to an instance 
+     * from this factory associated with the thread's current transaction.
+     * In this case, the close method is ignored, as the 
+     * <code>PersistenceManager</code> is automatically closed when the
+     * transaction completes.
+     * <P>When used with a <code>PersistenceManagerFactory</code>
+     * that uses TransactionType RESOURCE_LOCAL, the proxy uses a
+     * ThreadLocal to bind to an instance of <code>PersistenceManager</code>
+     * associated with the thread. In this case, the close method executed
+     * on the proxy closes the <code>PersistenceManager</code> and then
+     * clears the ThreadLocal.
+     * Use of this method does not affect the configurability of the
+     * <code>PersistenceManagerFactory</code>.
+     *
+     * @since 2.1
+     * @return a <code>PersistenceManager</code> proxy.
+     */
+    PersistenceManager getPersistenceManagerProxy();
+
     /** Get an instance of <code>PersistenceManager</code> from this factory.  
      * The instance has default values for options.  
      * The parameters <code>userid</code> and <code>password</code> are used 
@@ -329,9 +352,72 @@
      * factory.
      * @see #getDetachAllOnCommit()
      * @since 2.0
+     * @param flag the default DetachAllOnCommit setting
      */
     void setDetachAllOnCommit(boolean flag);
-    
+
+
+    /**
+     * Sets the PersistenceUnitName for this PersistenceManagerFactory.
+     * @see #getPersistenceUnitName()
+     * @since 2.1
+     * @param name the PersistenceUnitName
+     */
+    void setPersistenceUnitName(String name);
+
+    /**
+     * Gets the PersistenceUnitName for this PersistenceManagerFactory.
+     * @see #setPersistenceUnitName(String)
+     * @since 2.1
+     * @return the PersistenceUnitName
+     */
+    String getPersistenceUnitName();
+
+    /**
+     * Sets the TimeZone ID of the server associated with this
+     * PersistenceManagerFactory. The parameter is a String
+     * suitable for use with TimeZone.getTimeZone. The String
+     * should match an ID returned by TimeZone.getAvailableIDs().
+     * If the ServerTimeZoneID is not set, 
+     * assume that the server has the same TimeZone ID as the client.
+     * If incorrectly set, the result of PersistenceManager.getServerDate
+     * might be incorrect.
+     * @see #getServerTimeZone()
+     * @see TimeZone#getTimeZone(java.lang.String)
+     * @see TimeZone#getAvailableIDs()
+     * @see PersistenceManager#getServerDate()
+     * @since 2.1
+     * @param timezoneid the TimeZone ID of the server
+     */
+    void setServerTimeZoneID(String timezoneid);
+
+    /**
+     * Gets the TimeZone ID of the server associated with this
+     * PersistenceManagerFactory. If not set, assume that
+     * the server has the same TimeZone ID as the client.
+     * @see #setServerTimeZoneID()
+     * @since 2.1
+     * @return the TimeZone of the server
+     */
+    String getServerTimeZoneID();
+
+    /**
+     * Sets the TransactionType for this PersistenceManagerFactory.
+     * Permitted values are "JTA" and "RESOURCE_LOCAL".
+     * @see #getTransactionType()
+     * @since 2.1
+     * @param name the TransactionType
+     */
+    void setTransactionType(String name);
+
+    /**
+     * Gets the TransactionType for this PersistenceManagerFactory.
+     * @see #setTransactionType(String)
+     * @since 2.1
+     * @return the TransactionType
+     */
+    String getTransactionType();
+
     /** Return non-configurable properties of this 
      * <code>PersistenceManagerFactory</code>.
      * Properties with keys <code>VendorName</code> and 
@@ -388,6 +474,7 @@
      * a second-level cache, the returned instance does nothing. This
      * method never returns <code>null</code>.
      * @since 2.0
+     * @return the DataStoreCache
      */
     DataStoreCache getDataStoreCache ();