svn commit: r549211 - in /db/jdo/trunk/api2/src/java/javax/jdo/annotations: Discriminator.java Inheritance.java PersistenceCapable.java PersistentInterface.java Version.java

[mc...@apache.org]

Author: mcaisse
Date: Wed Jun 20 12:44:58 2007
New Revision: 549211

URL: http://svn.apache.org/viewvc?view=rev&rev=549211
Log:
JDO-JDO-403

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Inheritance.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistenceCapable.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistentInterface.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Version.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java?view=diff&rev=549211&r1=549210&r2=549211
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java Wed Jun 20 12:44:58 2007
@@ -37,8 +37,8 @@
      * the class associated with a row in the datastore.
      * @return Strategy to use for discriminator.
      */
-    DiscriminatorStrategyType strategy() 
-        default DiscriminatorStrategyType.UNKNOWN;
+    DiscriminatorStrategy strategy() 
+        default DiscriminatorStrategy.UNKNOWN;
 
     /**
      * Whether the discriminator is indexed.
@@ -65,4 +65,4 @@
      * @return The column(s) making up the discriminator.
      */
     Column[] columns() default {};
-}
\ No newline at end of file
+}

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Inheritance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Inheritance.java?view=diff&rev=549211&r1=549210&r2=549211
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Inheritance.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Inheritance.java Wed Jun 20 12:44:58 2007
@@ -32,5 +32,5 @@
 public @interface Inheritance
 {
     /** Strategy to use for inheritance. Relates to where the data for the class is stored. */
-    InheritanceStrategyType strategy();
-}
\ No newline at end of file
+    InheritanceStrategy strategy();
+}

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistenceCapable.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistenceCapable.java?view=diff&rev=549211&r1=549210&r2=549211
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistenceCapable.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistenceCapable.java Wed Jun 20 12:44:58 2007
@@ -40,7 +40,7 @@
     String detachable() default "";
 
     /** Type of identity for this class. */
-    IdentityTypeValue identityType() default IdentityTypeValue.DATASTORE;
+    IdentityType identityType() default IdentityType.DATASTORE;
 
     /** Primary key class when using application identity and using own PK. */
     Class objectIdClass() default void.class;

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistentInterface.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistentInterface.java?view=diff&rev=549211&r1=549210&r2=549211
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistentInterface.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/PersistentInterface.java Wed Jun 20 12:44:58 2007
@@ -40,7 +40,7 @@
     String detachable() default "";
 
     /** Type of identity for this persistent interface. */
-    IdentityTypeValue identityType() default IdentityTypeValue.DATASTORE;
+    IdentityType identityType() default IdentityType.DATASTORE;
 
     /** Primary key class when using application identity and using own PK. */
     Class objectIdClass() default void.class;

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Version.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Version.java?view=diff&rev=549211&r1=549210&r2=549211
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Version.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Version.java Wed Jun 20 12:44:58 2007
@@ -35,7 +35,7 @@
      * Strategy for versioning of objects of this class
      * @return Strategy for versioning objects of this class
      */
-    VersionStrategyType strategy();
+    VersionStrategy strategy();
 
     /**
      * Name of the column for the version
@@ -54,4 +54,4 @@
      * @return The column(s) making up the version.
      */
     Column[] columns() default {};
-}
\ No newline at end of file
+}