db-jdo-commits mailing list archives

Author: clr
Date: Tue Feb 12 16:25:03 2008
New Revision: 627198

URL: http://svn.apache.org/viewvc?rev=627198&view=rev
Log:
JDO-575 Fix signature verifier for Java 6

Modified:
    db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java

Modified: db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt?rev=627198&r1=627197&r2=627198&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt (original)
+++ db/jdo/trunk/tck2/src/conf/jdo-2_1-signatures.txt Tue Feb 12 16:25:03 2008
@@ -1056,7 +1056,7 @@
     public static final enum javax.jdo.ObjectState DETACHED_CLEAN;
     public static final enum javax.jdo.ObjectState DETACHED_DIRTY;
     public static enum javax.jdo.ObjectState valueOf(java.lang.String);
-    public static final javax.jdo.ObjectState[] values();
+    public static javax.jdo.ObjectState[] values();
     public String toString();
 }
 
@@ -1108,7 +1108,7 @@
     public static final enum javax.jdo.annotations.DiscriminatorStrategy VALUE_MAP;
     public static final enum javax.jdo.annotations.DiscriminatorStrategy CLASS_NAME;
     public static enum javax.jdo.annotations.DiscriminatorStrategy valueOf(java.lang.String);
-    public static final javax.jdo.annotations.DiscriminatorStrategy[] values();
+    public static javax.jdo.annotations.DiscriminatorStrategy[] values();
 }
 
 public annotation javax.jdo.annotations.Element extends java.lang.annotation.Annotation
@@ -1204,7 +1204,7 @@
     public static final enum javax.jdo.annotations.ForeignKeyAction DEFAULT;
     public static final enum javax.jdo.annotations.ForeignKeyAction NONE;
     public static enum javax.jdo.annotations.ForeignKeyAction valueOf(java.lang.String);
-    public static final javax.jdo.annotations.ForeignKeyAction[] values();
+    public static javax.jdo.annotations.ForeignKeyAction[] values();
 }
 
 public annotation javax.jdo.annotations.ForeignKeys extends java.lang.annotation.Annotation
@@ -1222,7 +1222,7 @@
     public static final enum javax.jdo.annotations.IdGeneratorStrategy UUIDSTRING;
     public static final enum javax.jdo.annotations.IdGeneratorStrategy UUIDHEX;
     public static enum javax.jdo.annotations.IdGeneratorStrategy valueOf(java.lang.String);
-    public static final javax.jdo.annotations.IdGeneratorStrategy[] values();
+    public static javax.jdo.annotations.IdGeneratorStrategy[] values();
 }
 
 public final enum javax.jdo.annotations.IdentityType extends java.lang.Enum
@@ -1232,7 +1232,7 @@
     public static final enum javax.jdo.annotations.IdentityType DATASTORE;
     public static final enum javax.jdo.annotations.IdentityType NONDURABLE;
     public static enum javax.jdo.annotations.IdentityType valueOf(java.lang.String);
-    public static final javax.jdo.annotations.IdentityType[] values();
+    public static javax.jdo.annotations.IdentityType[] values();
 }
 
 public annotation javax.jdo.annotations.Index extends java.lang.annotation.Annotation
@@ -1262,7 +1262,7 @@
     public static final enum javax.jdo.annotations.InheritanceStrategy SUBCLASS_TABLE;
     public static final enum javax.jdo.annotations.InheritanceStrategy SUPERCLASS_TABLE;
     public static enum javax.jdo.annotations.InheritanceStrategy valueOf(java.lang.String);
-    public static final javax.jdo.annotations.InheritanceStrategy[] values();
+    public static javax.jdo.annotations.InheritanceStrategy[] values();
 }
 
 public annotation javax.jdo.annotations.Join extends java.lang.annotation.Annotation
@@ -1320,7 +1320,7 @@
     public static final enum javax.jdo.annotations.NullValue EXCEPTION;
     public static final enum javax.jdo.annotations.NullValue DEFAULT;
     public static enum javax.jdo.annotations.NullValue valueOf(java.lang.String);
-    public static final javax.jdo.annotations.NullValue[] values();
+    public static javax.jdo.annotations.NullValue[] values();
 }
 
 public annotation javax.jdo.annotations.Order extends java.lang.annotation.Annotation
@@ -1355,7 +1355,7 @@
     public static final enum javax.jdo.annotations.PersistenceModifier TRANSACTIONAL;
     public static final enum javax.jdo.annotations.PersistenceModifier NONE;
     public static enum javax.jdo.annotations.PersistenceModifier valueOf(java.lang.String);
-    public static final javax.jdo.annotations.PersistenceModifier[] values();
+    public static javax.jdo.annotations.PersistenceModifier[] values();
 }
 
 public annotation javax.jdo.annotations.Persistent extends java.lang.annotation.Annotation
@@ -1431,7 +1431,7 @@
     public static final enum javax.jdo.annotations.SequenceStrategy CONTIGUOUS;
     public static final enum javax.jdo.annotations.SequenceStrategy NONCONTIGUOUS;
     public static enum javax.jdo.annotations.SequenceStrategy valueOf(java.lang.String);
-    public static final javax.jdo.annotations.SequenceStrategy[] values();
+    public static javax.jdo.annotations.SequenceStrategy[] values();
 }
 
 public annotation javax.jdo.annotations.Serialized extends java.lang.annotation.Annotation
@@ -1496,5 +1496,5 @@
     public static final enum javax.jdo.annotations.VersionStrategy DATE_TIME;
     public static final enum javax.jdo.annotations.VersionStrategy VERSION_NUMBER;
     public static enum javax.jdo.annotations.VersionStrategy valueOf(java.lang.String);
-    public static final javax.jdo.annotations.VersionStrategy[] values();
+    public static javax.jdo.annotations.VersionStrategy[] values();
 }

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java?rev=627198&r1=627197&r2=627198&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java Tue
Feb 12 16:25:03 2008
@@ -759,12 +759,16 @@
         int result = method.getModifiers();
         // first remove extraneous stuff
         result &= ALL_MODIFIERS;
-        // if enum, set pseudo enum flag
+        // if enum return type, set pseudo enum flag
         if (method.getReturnType().isEnum())
             result |= ENUM;
         // if annotation, set pseudo annotation flag
         if (method.getReturnType().isAnnotation()) 
             result |= ANNOTATION;
+        // if return type is an enum class, un-set FINAL modifier in all methods
+        // because in Java 5, methods are generated as final; in Java 6, not
+        if (method.getDeclaringClass().isEnum()) 
+            result &= ~Modifier.FINAL;
         return result;
     }