openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r427472 - in /incubator/openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ openjpa-lib/src/main/java/org/apa...
Date Tue, 01 Aug 2006 07:05:09 GMT
Author: pcl
Date: Tue Aug  1 00:05:08 2006
New Revision: 427472

URL: http://svn.apache.org/viewvc?rev=427472&view=rev
Log:
cleaned up some imports; fixed a typo; changed test case to reduce output

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
    incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
    incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
    incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java?rev=427472&r1=427471&r2=427472&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
(original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
Tue Aug  1 00:05:08 2006
@@ -20,7 +20,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=427472&r1=427471&r2=427472&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
(original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Tue Aug  1 00:05:08 2006
@@ -2793,20 +2793,7 @@
     }
 
     /**
-     * Return whether the second field has any custom fetch groups in common 
-     * with the first.
-     */
-    private static boolean sharesCustomFetchGroups(FieldMetaData fmd1, 
-        FieldMetaData fmd2) {
-        String[] fgs = fmd1.getCustomFetchGroups();
-        for (int i = 0; i < fgs.length; i++)
-            if (fmd2.isInFetchGroup(fgs[i]))
-                return true;
-        return false;
-    }
-
-    /**
-     * Helper method to privde the given field number to the given
+     * Helper method to provide the given field number to the given
      * field manager.
      */
     void provideField(PersistenceCapable pc, FieldManager store, int field) {

Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java?rev=427472&r1=427471&r2=427472&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
Tue Aug  1 00:05:08 2006
@@ -266,5 +266,4 @@
     public int getResultSetHoldability() throws SQLException {
         throw new UnsupportedOperationException();
     }
-}
-
+}
\ No newline at end of file

Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java?rev=427472&r1=427471&r2=427472&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
Tue Aug  1 00:05:08 2006
@@ -20,7 +20,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.sax.SAXTransformerFactory;
 
 import org.apache.commons.lang.exception.NestableRuntimeException;
 import org.w3c.dom.Document;
@@ -42,7 +41,6 @@
     // cache parsers and transformers in all possible configurations
     private static SAXParserFactory[] _saxFactories = null;
     private static DocumentBuilderFactory[] _domFactories = null;
-    private static SAXTransformerFactory _transFactory = null;
     private static ErrorHandler _validating;
 
     static {

Modified: incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java?rev=427472&r1=427471&r2=427472&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
Tue Aug  1 00:05:08 2006
@@ -36,7 +36,6 @@
 public class TestConfigurationImpl extends AbstractTestCase {
 
     private ConfigurationTest _conf = new ConfigurationTest();
-    private String _def;
 
     public TestConfigurationImpl(String test) {
         super(test);
@@ -307,6 +306,13 @@
 
         public void deriveObjectKey(Object val) {
             _objectKey.set(val, true);
+        }
+        
+        protected boolean isInvalidProperty(String s) {
+            if ("openjpatest.properties".equals(s))
+                return false;
+            else 
+                return super.isInvalidProperty(s);
         }
     }
 }



Mime
View raw message