You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2006/07/28 20:12:02 UTC
svn commit: r426634 - in /incubator/openjpa/trunk:
openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/
openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/
openjpa-persistence-jdbc/
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/
Author: awhite
Date: Fri Jul 28 11:12:02 2006
New Revision: 426634
URL: http://svn.apache.org/viewvc?rev=426634&view=rev
Log:
Pass "-p persistence.xml" to enhancer invocation when running persistence
tests so that we don't have to set JPA defaults in the JPA
ConfigurationProviderImpl.beforeConfigurationLoad, which is incompatible with
having JDO,etc providers in the same system. Eventually we should probably
recognize persistence.xml as a defaults file, but for now that's against our
previous contract of allowing a user to have a JDO,etc defaults file and a
persistence.xml in the same system. Also removed XML Transformer functionality
from XMLFactory, since we don't use it and it causes problems with Ant (this
seems to be an Ant+JDK 1.5 bug in Ant).
Modified:
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/xml/TestXMLWriter.java
incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
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=426634&r1=426633&r2=426634&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 Fri Jul 28 11:12:02 2006
@@ -20,13 +20,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
import org.apache.commons.lang.exception.NestableRuntimeException;
import org.w3c.dom.Document;
@@ -73,9 +67,6 @@
_domFactories[arrIdx] = domFactory;
}
}
-
- _transFactory = (SAXTransformerFactory) TransformerFactory.
- newInstance();
_validating = new ValidatingErrorHandler();
}
@@ -128,47 +119,6 @@
*/
public static Document getDocument() {
return getDOMParser(false, false).newDocument();
- }
-
- /**
- * Return a Transformer that will apply the XSL transformation
- * from the given source. If the source is null,
- * no transformation will be applied.
- */
- public static Transformer getTransformer(Source source) {
- try {
- if (source == null)
- return _transFactory.newTransformer();
- return _transFactory.newTransformer(source);
- } catch (TransformerConfigurationException tfce) {
- throw new NestableRuntimeException(tfce);
- }
- }
-
- /**
- * Return a Templates for the given XSL source.
- */
- public static Templates getTemplates(Source source) {
- try {
- return _transFactory.newTemplates(source);
- } catch (TransformerConfigurationException tfce) {
- throw new NestableRuntimeException(tfce);
- }
- }
-
- /**
- * Return a TransformerHandler for transforming SAX events, applying the
- * XSL transform from the given source. If the source is null, no
- * transform will be applied.
- */
- public static TransformerHandler getTransformerHandler(Source source) {
- try {
- if (source == null)
- return _transFactory.newTransformerHandler();
- return _transFactory.newTransformerHandler(source);
- } catch (TransformerConfigurationException tfce) {
- throw new NestableRuntimeException(tfce);
- }
}
/**
Modified: incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java?rev=426634&r1=426633&r2=426634&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java Fri Jul 28 11:12:02 2006
@@ -15,6 +15,7 @@
import java.io.InputStreamReader;
import java.io.StringWriter;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
@@ -48,7 +49,7 @@
StringWriter formatted = new StringWriter();
StreamResult result = new StreamResult(new XMLWriter(formatted));
- Transformer trans = XMLFactory.getTransformer(null);
+ Transformer trans = TransformerFactory.newInstance().newTransformer();
trans.transform(source, result);
// read the correct output into a buffer
Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=426634&r1=426633&r2=426634&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Jul 28 11:12:02 2006
@@ -90,6 +90,7 @@
pathsep=" "/>
<java
classname="org.apache.openjpa.enhance.PCEnhancer">
+ <arg line="-p persistence.xml"/>
<arg line="${enhance.files}"/>
<classpath>
<path
@@ -110,6 +111,5 @@
</plugins>
</build>
-
</project>
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=426634&r1=426633&r2=426634&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Fri Jul 28 11:12:02 2006
@@ -48,8 +48,6 @@
PersistenceMetaDataFactory.class.getName());
conf.metaFactoryPlugin.setAlias(ALIAS_EJB,
PersistenceMetaDataFactory.class.getName());
- conf.metaFactoryPlugin.setDefault(SPEC_JPA);
- conf.metaFactoryPlugin.setString(SPEC_JPA);
}
public void afterSpecificationSet(OpenJPAConfiguration c) {