openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dez...@apache.org
Subject svn commit: r727250 - in /openjpa/trunk: openjpa-kernel/src/main/resources/org/apache/openjpa/conf/ openjpa-persistence-jdbc/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/
Date Wed, 17 Dec 2008 03:01:27 GMT
Author: dezzio
Date: Tue Dec 16 19:01:26 2008
New Revision: 727250

URL: http://svn.apache.org/viewvc?rev=727250&view=rev
Log:
Merged changes 726860, 68, and 76 from branch 1.1.x.  Added Cache Marshallers to descriptors,
and renamed test case.  Was not able to enable test case due to additional missing property
descriptors in trunk.  See Jira: OPENJPA-830.

Added:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
      - copied, changed from r727204, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestKodoConfiguration.java
Removed:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestKodoConfiguration.java
Modified:
    openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml

Modified: openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties?rev=727250&r1=727249&r2=727250&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
Tue Dec 16 19:01:26 2008
@@ -548,6 +548,17 @@
 RuntimeUnenhancedClasses-cat: Optimization
 RuntimeUnenhancedClasses-displayorder: 50
 
+CacheMarshallers-name: Cache Marshallers
+CacheMarshallers-desc: List of org.apache.openjpa.conf.CacheMarshaller \
+    implementations to use. \
+    Cache marshallers are part of experimental support for accelerating \
+    application redeployment.
+CacheMarshallers-type: General
+CacheMarshallers-cat: Advanced
+CacheMarshallers-displayorder: 50
+CacheMarshallers-expert: true
+CacheMarshallers-interface: org.apache.openjpa.conf.CacheMarshaller
+
 no-named-cf: use a DataSource bound to JNDI
 diff-specs: Attempt to configure for multiple specifications.  Was configured \
 	for "{0}".  Attempt to now configure for "{1}".  This attempt will be \

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=727250&r1=727249&r2=727250&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Dec 16 19:01:26 2008
@@ -332,7 +332,7 @@
                         <exclude>org/apache/openjpa/persistence/annotations/TestPropertyAccess.java</exclude>
                         <exclude>org/apache/openjpa/persistence/annotations/TestVersion.java</exclude>
                         <exclude>org/apache/openjpa/persistence/cache/TestQueryCache.java</exclude>
-                        <exclude>org/apache/openjpa/persistence/conf/TestKodoConfiguration.java</exclude>
+                        <exclude>org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java</exclude>
                         <exclude>org/apache/openjpa/persistence/datacache/TestCacheMultiThreadedLoad.java</exclude>
                         <exclude>org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java</exclude>
                         <exclude>org/apache/openjpa/persistence/datacache/TestDataCachePCDataGenerator.java</exclude>

Copied: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
(from r727204, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestKodoConfiguration.java)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java?p2=openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java&p1=openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestKodoConfiguration.java&r1=727204&r2=727250&rev=727250&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestKodoConfiguration.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
Tue Dec 16 19:01:26 2008
@@ -40,10 +40,10 @@
  *
  * @author Marc Prud'hommeaux
  */
-public class TestKodoConfiguration
+public class TestOpenJPAConfiguration
     extends AbstractTestCase {
 
-    public TestKodoConfiguration(String test) {
+    public TestOpenJPAConfiguration(String test) {
         super(test, "confcactusapp");
     }
 
@@ -131,11 +131,16 @@
             try {
                 assertNotNull(pds[i].getShortDescription());
                 assertNotNull(pds[i].getDisplayName());
-
-                Method setter = pds[i].getWriteMethod();
+                
+                // skip the EntityManagerFactory property added by
+                // product derivation code as it has no accessor methods
+                if ("EntityManagerFactory".equals(values[i].getProperty()))
+                        continue;
+                        
                 Method getter = pds[i].getReadMethod();
-                assertNotNull(setter);
+                Method setter = pds[i].getWriteMethod();
                 assertNotNull(getter);
+                assertNotNull(setter);
 
                 assertNotNull("Missing attribute ("
                     + Configuration.ATTRIBUTE_TYPE
@@ -199,7 +204,7 @@
         log.clear();
 
         // now make sure we do *not* try to validate sub-configurations (such
-        // as kodo.jdbc.Foo).
+        // as openjpa.jdbc.Foo).
         props.clear();
         props.setProperty("openjpa.jdbc.Foo", "XXX");
         props.setProperty("oponjpa", "XXX");



Mime
View raw message