svn commit: r821084 - in /openjpa/trunk/openjpa-persistence/src: main/java/org/apache/openjpa/persistence/ test/java/org/apache/openjpa/persistence/ test/java/org/apache/openjpa/persistence/entity/ test/resources/META-INF/

[curtisr7]

Author: curtisr7
Date: Fri Oct  2 16:32:49 2009
New Revision: 821084

URL: http://svn.apache.org/viewvc?rev=821084&view=rev
Log:
OPENJPA-859: Backing out 818928 while investigating a regression.

Removed:
    
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestParsing.java
    
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/entity/
    
openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/parsing-orm.xml
Modified:
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
    
openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/persistence.xml

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=821084&r1=821083&r2=821084&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
 Fri Oct  2 16:32:49 2009
@@ -485,26 +485,21 @@
      * Read annotations for the current type.
      */
     private ClassMetaData parseClassAnnotations() {
-        // Check to see if there is cached metadata for the class that we are 
currently parsing. It is possible
-        // that one of the annotations (Entity, Embeddable, MappedSuperclass) 
is in the orm.xml. We still need to look
-        // at these files for other annotations and more importantly setup 
defaults (ie: Basic fields). 
-        ClassMetaData m = getRepository().getCachedMetaData(_cls);
-        if(m == null) {
-            // check immediately whether the user is using any annotations,
-            // regardless of mode.  this prevents adding non-entity classes to
-            // repository if we're ignoring these annotations in mapping mode
-            if (!(AccessController.doPrivileged(J2DoPrivHelper
-                .isAnnotationPresentAction(_cls, Entity.class))).booleanValue()
-                && !(AccessController.doPrivileged(J2DoPrivHelper
-                    .isAnnotationPresentAction(_cls, Embeddable.class)))
-                    .booleanValue()
-                && !(AccessController.doPrivileged(J2DoPrivHelper
-                    .isAnnotationPresentAction(_cls, MappedSuperclass.class)))
-                    .booleanValue())
-                return null;
-        }
+        // check immediately whether the user is using any annotations,
+        // regardless of mode.  this prevents adding non-entity classes to
+        // repository if we're ignoring these annotations in mapping mode
+        if (!(AccessController.doPrivileged(J2DoPrivHelper
+            .isAnnotationPresentAction(_cls, Entity.class))).booleanValue()
+            && !(AccessController.doPrivileged(J2DoPrivHelper
+                .isAnnotationPresentAction(_cls, Embeddable.class)))
+                .booleanValue()
+            && !(AccessController.doPrivileged(J2DoPrivHelper
+                .isAnnotationPresentAction(_cls, MappedSuperclass.class)))
+                .booleanValue())
+            return null;
+
         // find / create metadata
-        ClassMetaData meta = (m == null) ? getMetaData() : m;
+        ClassMetaData meta = getMetaData();
         if (meta == null)
             return null;
 

Modified: 
openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/persistence.xml?rev=821084&r1=821083&r2=821084&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/persistence.xml 
(original)
+++ 
openjpa/trunk/openjpa-persistence/src/test/resources/META-INF/persistence.xml 
Fri Oct  2 16:32:49 2009
@@ -43,8 +43,4 @@
     <persistence-unit name="exclude_true">
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
     </persistence-unit>
-    <persistence-unit name="test_parsing">
-       <mapping-file>META-INF/parsing-orm.xml</mapping-file>
-               
<class>org.apache.openjpa.persistence.entity.MixedMappingLocation</class>       
        
-    </persistence-unit>
 </persistence>