svn commit: r738095 - in /db/jdo/trunk: api2/src/java/javax/jdo/PersistenceManagerFactory.java tck2/src/conf/jdo-2_3-signatures.txt

[an...@apache.org]

Author: andyj
Date: Tue Jan 27 14:09:26 2009
New Revision: 738095

URL: http://svn.apache.org/viewvc?rev=738095&view=rev
Log:
JDO-615 Change signature of PMF.getMetadata(String) to return ComponentMetadata so that it also handles persistent interfaces as well as classes

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
    db/jdo/trunk/tck2/src/conf/jdo-2_3-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=738095&r1=738094&r2=738095&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Tue Jan 27 14:09:26 2009
@@ -24,7 +24,7 @@
 
 import javax.jdo.datastore.DataStoreCache;
 import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.metadata.ClassMetadata;
+import javax.jdo.metadata.ComponentMetadata;
 import javax.jdo.metadata.JDOMetadata;
 import javax.jdo.spi.JDOPermission; // for getFetchGroups javadoc
 import java.io.Serializable;
@@ -707,6 +707,8 @@
      * Method to register metadata with the persistence process managed by this
      * <code>PersistenceManagerFactory</code>. 
      * Metadata can be created using the method {@link #newMetadata}.
+     * If there is already metadata registered for a class contained in this metadata
+     * object then a JDOUserException will be thrown.
      * @param metadata The Metadata to register.
      * @since 2.3
      */
@@ -721,10 +723,11 @@
     JDOMetadata newMetadata();
 
     /**
-     * Method to return the (class) metadata object for the specified class, if there is
-     * metadata defined for that class.
+     * Method to return the metadata object for the specified class/interface, if there is
+     * metadata defined for that class/interface.
+     * If there is no metadata for the specified class/interface then null will be returned.
      * @return The metadata
      * @since 2.3
      */
-    ClassMetadata getMetadata(String className);
+    ComponentMetadata getMetadata(String className);
 }

Modified: db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt?rev=738095&r1=738094&r2=738095&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt (original)
+++ db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt Tue Jan 27 14:09:26 2009
@@ -834,7 +834,7 @@
     java.util.Set getFetchGroups();
     public void registerMetadata(javax.jdo.metadata.JDOMetadata metadata);
     public javax.jdo.metadata.JDOMetadata newMetadata();
-    public javax.jdo.metadata.ClassMetadata getMetadata(String className);
+    public javax.jdo.metadata.ComponentMetadata getMetadata(String className);
 }
 
 public interface javax.jdo.Query extends java.io.Serializable {