openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curti...@apache.org
Subject svn commit: r899732 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java openjpa-persistence-jdbc/pom.xml openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java
Date Fri, 15 Jan 2010 17:49:50 GMT
Author: curtisr7
Date: Fri Jan 15 17:49:46 2010
New Revision: 899732

URL: http://svn.apache.org/viewvc?rev=899732&view=rev
Log:
OPENJPA-250: Missed a line in the previous merge and remove a test from being excluded in
pom.xml

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=899732&r1=899731&r2=899732&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
Fri Jan 15 17:49:46 2010
@@ -1566,9 +1566,11 @@
         if (_locking) {
             synchronized (_registered) {
                 _registered.add(cls);
+                registerAlias(cls);
             }
         } else {
             _registered.add(cls);
+            registerAlias(cls);
         }
     }
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=899732&r1=899731&r2=899732&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Jan 15 17:49:46 2010
@@ -1017,8 +1017,9 @@
                         <!-- ==================================================================
-->
                         <!--  MetaModel tests are *temporarily* excluded to wait for 
          -->
                         <!--  spec to stabilize on Result Processing API             
          -->
-                        <!-- ==================================================================
--> 
-                        <exclude>org/apache/openjpa/persistence/meta/*.java</exclude>
+                        <!--  This was blanket exclude, but some tests were erroneously
excluded.-->
+                        <!-- ==================================================================
 --> 
+                        <exclude>org/apache/openjpa/persistence/meta/TestExternalValues.java</exclude>
                         
                         <!-- Exclude subclassing tests   -->
                         <exclude>org/apache/openjpa/**/TestUnenhanced*.java</exclude>

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java?rev=899732&r1=899731&r2=899732&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetaDataRepository.java
Fri Jan 15 17:49:46 2010
@@ -44,7 +44,7 @@
     public void testPreloadBasic() {
         OpenJPAEntityManagerFactorySPI emf = null;
         try {
-            emf = createNamedEMF(PU_NAME, "openjpa.MetaDataRepository", "Preload=true,NoLock=true");
+            emf = createNamedEMF(PU_NAME, "openjpa.MetaDataRepository", "Preload=true");
             MetaDataRepository mdr = emf.getConfiguration().getMetaDataRepositoryInstance();
 
             // Check that there is cached metadata in the repo



Mime
View raw message