You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by ma...@apache.org on 2007/04/02 18:43:08 UTC
svn commit: r524833 - in /db/jdo/trunk/api20: src/java/javax/jdo/
src/schema/javax/jdo/ test/java/javax/jdo/
test/schema/jdoconfig.xml/Negative0/META-INF/
test/schema/jdoconfig.xml/Negative1/META-INF/
test/schema/jdoconfig.xml/Negative2/META-INF/ test/...
Author: madams
Date: Mon Apr 2 09:43:07 2007
New Revision: 524833
URL: http://svn.apache.org/viewvc?view=rev&rev=524833
Log:
JDO-467
Addressing some issues from community patch review:
* EOL characters
* ParserConfigurationException => JDOFatalInternalException
* SAXParseException includes line & column numbers in exception message
Modified:
db/jdo/trunk/api20/src/java/javax/jdo/Bundle.properties
db/jdo/trunk/api20/src/java/javax/jdo/Constants.java
db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java
db/jdo/trunk/api20/src/java/javax/jdo/PersistenceManagerFactory.java
db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.dtd
db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.xsd
db/jdo/trunk/api20/test/java/javax/jdo/ClasspathHelper.java
db/jdo/trunk/api20/test/java/javax/jdo/JDOHelperConfigTest.java
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative0/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative1/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative2/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative3/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative4/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative5/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6a/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6b/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive0/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1a/META-INF/jdoconfig.xml
db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1b/META-INF/jdoconfig.xml
Modified: db/jdo/trunk/api20/src/java/javax/jdo/Bundle.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/Bundle.properties?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/Bundle.properties (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/Bundle.properties Mon Apr 2 09:43:07 2007
@@ -77,8 +77,8 @@
EXC_DateStringConstructor: Error parsing Date string "{0}" at position {1} \
using date format "{2}".
MSG_unknown: unknown
-EXC_DuplicateRequestedPUFoundInDifferentConfigs: Duplicate persistence unit \
-name "{0}" found in {1} and {2}.
+EXC_DuplicateRequestedPersistenceUnitFoundInDifferentConfigs: Duplicate \
+persistence unit name "{0}" found in {1} and {2}.
EXC_DuplicateRequestedPersistenceUnitFoundInSameConfig: Duplicate persistence \
unit name "{0}" found in {1}.
EXC_UnableToInvokeCreateEMFMethod: Unable to invoke \
@@ -89,7 +89,9 @@
javax.xml.parsers.DocumentBuilderFactory
EXC_ParserConfigException: Encountered parser configuration exception while \
getting javax.xml.parsers.DocumentBuilder
-EXC_ParsingException: Exception parsing configuration {0}
+EXC_SAXParseException: Exception parsing configuration {0}\
+at line {1}, column {2}
+EXC_SAXException: Exception parsing configuration {0}
EXC_DuplicatePropertyFound: Duplicate property name "{0}" found in persistence \
unit name "{1}" found in {2}.
EXC_DuplicatePersistenceUnitNamePropertyFoundWithinUnitConfig: Duplicate \
Modified: db/jdo/trunk/api20/src/java/javax/jdo/Constants.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/Constants.java?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/Constants.java (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/Constants.java Mon Apr 2 09:43:07 2007
@@ -804,3 +804,4 @@
static String JDOQUERY_XSD_RESOURCE
= "javax/jdo/jdoquery_2_0.xsd";
}
+
Modified: db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java Mon Apr 2 09:43:07 2007
@@ -23,6 +23,7 @@
package javax.jdo;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -960,7 +961,7 @@
if (propertiesByNameInAllConfigs.containsKey(name))
throw new JDOFatalUserException (msg.msg(
- "EXC_DuplicateRequestedPUFoundInDifferentConfigs",
+ "EXC_DuplicateRequestedPersistenceUnitFoundInDifferentConfigs",
"".equals(name)
? "(anonymous)"
: name,
@@ -1234,13 +1235,22 @@
ioe); //NOI18N
}
catch (ParserConfigurationException e) {
- throw new JDOFatalUserException(
+ throw new JDOFatalInternalException(
msg.msg("EXC_ParserConfigException"),
e);
}
+ catch (SAXParseException e) {
+ throw new JDOFatalUserException(
+ msg.msg(
+ "EXC_SAXParseException",
+ url.toExternalForm(),
+ new Integer(e.getLineNumber()),
+ new Integer(e.getColumnNumber())),
+ e);
+ }
catch (SAXException e) {
throw new JDOFatalUserException(
- msg.msg("EXC_ParsingException", url.toExternalForm()),
+ msg.msg("EXC_SAXException", url.toExternalForm()),
e);
}
catch (JDOException e) {
@@ -1248,7 +1258,7 @@
}
catch (RuntimeException e) {
throw new JDOFatalUserException(
- msg.msg("EXC_ParsingException", url.toExternalForm()),
+ msg.msg("EXC_SAXException", url.toExternalForm()),
e);
}
finally {
Modified: db/jdo/trunk/api20/src/java/javax/jdo/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/PersistenceManagerFactory.java?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/PersistenceManagerFactory.java Mon Apr 2 09:43:07 2007
@@ -530,3 +530,4 @@
void removeInstanceLifecycleListener (InstanceLifecycleListener listener);
}
+
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.dtd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.dtd?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.dtd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.dtd Mon Apr 2 09:43:07 2007
@@ -48,3 +48,4 @@
<!ELEMENT instance-lifecycle-listener EMPTY>
<!ATTLIST instance-lifecycle-listener listener CDATA #REQUIRED>
<!ATTLIST instance-lifecycle-listener classes CDATA #IMPLIED>
+
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.xsd
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.xsd?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoconfig_2_1.xsd Mon Apr 2 09:43:07 2007
@@ -172,3 +172,5 @@
</xs:attributeGroup>
</xs:schema>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/java/javax/jdo/ClasspathHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/java/javax/jdo/ClasspathHelper.java?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/ClasspathHelper.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/ClasspathHelper.java Mon Apr 2 09:43:07 2007
@@ -70,3 +70,4 @@
}
}
+
Modified: db/jdo/trunk/api20/test/java/javax/jdo/JDOHelperConfigTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/java/javax/jdo/JDOHelperConfigTest.java?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/JDOHelperConfigTest.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/JDOHelperConfigTest.java Mon Apr 2 09:43:07 2007
@@ -380,3 +380,4 @@
}
}
}
+
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative0/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative0/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative0/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative0/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -0,0 +1 @@
+
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative1/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative1/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative1/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative1/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -5,3 +5,4 @@
<!-- No PUs defined -->
</jdoconfig>
+
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative2/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative2/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative2/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative2/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -7,3 +7,5 @@
<persistence-manager-factory/>
<persistence-manager-factory/>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative3/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative3/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative3/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative3/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -16,3 +16,5 @@
persistence-unit-name="persistence-unit-name.negative3"/>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative4/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative4/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative4/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative4/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -17,3 +17,5 @@
</persistence-manager-factory>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative5/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative5/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative5/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative5/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -17,3 +17,5 @@
</persistence-manager-factory>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6a/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6a/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6a/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6a/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -12,3 +12,5 @@
<persistence-manager-factory
persistence-unit-name="persistence-unit-name.negative6"/>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6b/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6b/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6b/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Negative6/6b/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -12,3 +12,5 @@
<persistence-manager-factory
persistence-unit-name="persistence-unit-name.negative6"/>
</jdoconfig>
+
+
\ No newline at end of file
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive0/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive0/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive0/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive0/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -248,3 +248,4 @@
property.positive0.pmf4.name0="property.positive0.pmf4.value0"
property.positive0.pmf4.name1="property.positive0.pmf4.value1"/>
</jdoconfig>
+
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1a/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1a/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1a/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1a/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -14,3 +14,4 @@
<persistence-manager-factory
persistence-unit-name="persistence-unit-name.positive1"/>
</jdoconfig>
+
Modified: db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1b/META-INF/jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1b/META-INF/jdoconfig.xml?view=diff&rev=524833&r1=524832&r2=524833
==============================================================================
--- db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1b/META-INF/jdoconfig.xml (original)
+++ db/jdo/trunk/api20/test/schema/jdoconfig.xml/Positive1/1b/META-INF/jdoconfig.xml Mon Apr 2 09:43:07 2007
@@ -12,3 +12,4 @@
<persistence-manager-factory
persistence-unit-name="persistence-unit-name.positive1"/>
</jdoconfig>
+