You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/08/01 09:05:09 UTC
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...
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);
}
}
}
Re: 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/ap
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Patrick,
Just nit-picking.
The only change that you apparently made to the file was to remove
the ending newline.
Bygones,
Craig
On Aug 1, 2006, at 9:19 AM, Patrick Linskey wrote:
> Why not? I've never met a Java compiler that doesn't deal with that
> behavior; many of our source files do not end with a newline.
>
> -Patrick
>
> --
> Patrick Linskey
> BEA Systems, Inc.
>
>> -----Original Message-----
>> From: Craig.Russell@Sun.COM [mailto:Craig.Russell@Sun.COM]
>> Sent: Tuesday, August 01, 2006 7:50 AM
>> To: open-jpa-dev@incubator.apache.org
>> Subject: Re: 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/ap
>>
>> Hi Patrick,
>>
>> So you removed the new line at end of file? Not so good I think...
>>
>> Craig
>>
>> On Aug 1, 2006, at 12:05 AM, pcl@apache.org wrote:
>>
>>> 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
>>>
>>
>> Craig Russell
>> Architect, Sun Java Enterprise System http://java.sun.com/products/
>> jdo
>> 408 276-5638 mailto:Craig.Russell@sun.com P.S. A good JDO? O, Gasp!
>>
>>
> ______________________________________________________________________
> _
> Notice: This email message, together with any attachments, may
> contain
> information of BEA Systems, Inc., its subsidiaries and
> affiliated
> entities, that may be confidential, proprietary, copyrighted
> and/or
> legally privileged, and is intended solely for the use of the
> individual
> or entity named in this message. If you are not the intended
> recipient,
> and have received this message in error, please immediately return
> this
> by email and then delete it.
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
RE: 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/ap
Posted by Patrick Linskey <pl...@bea.com>.
Why not? I've never met a Java compiler that doesn't deal with that
behavior; many of our source files do not end with a newline.
-Patrick
--
Patrick Linskey
BEA Systems, Inc.
> -----Original Message-----
> From: Craig.Russell@Sun.COM [mailto:Craig.Russell@Sun.COM]
> Sent: Tuesday, August 01, 2006 7:50 AM
> To: open-jpa-dev@incubator.apache.org
> Subject: Re: 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/ap
>
> Hi Patrick,
>
> So you removed the new line at end of file? Not so good I think...
>
> Craig
>
> On Aug 1, 2006, at 12:05 AM, pcl@apache.org wrote:
>
> > 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
> >
>
> Craig Russell
> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com P.S. A good JDO? O, Gasp!
>
>
_______________________________________________________________________
Notice: This email message, together with any attachments, may contain
information of BEA Systems, Inc., its subsidiaries and affiliated
entities, that may be confidential, proprietary, copyrighted and/or
legally privileged, and is intended solely for the use of the individual
or entity named in this message. If you are not the intended recipient,
and have received this message in error, please immediately return this
by email and then delete it.
Re: 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...
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Patrick,
So you removed the new line at end of file? Not so good I think...
Craig
On Aug 1, 2006, at 12:05 AM, pcl@apache.org wrote:
> 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
>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!