Author: veithen
Date: Sat Apr 14 10:49:05 2012
New Revision: 1326085
URL: http://svn.apache.org/viewvc?rev=1326085&view=rev
Log:
Improved build stability.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithIdentityStylesheet.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithStylesheet.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-integration/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/pom.xml
Sat Apr 14 10:49:05 2012
@@ -56,7 +56,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithIdentityStylesheet.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithIdentityStylesheet.java?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithIdentityStylesheet.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithIdentityStylesheet.java
Sat Apr 14 10:49:05 2012
@@ -53,7 +53,6 @@ public class TestTransformerWithIdentity
Document output = builder.newDocument();
Transformer transformer =
((TransformerFactory)transformerFactoryClass.newInstance()).newTransformer(new
DOMSource(stylesheet));
transformer.transform(new DOMSource(document), new DOMResult(output));
- XMLUnit.setIgnoreWhitespace(false);
- XMLAssert.assertXMLEqual(document, output);
+ XMLAssert.assertXMLIdentical(XMLUnit.compareXML(document, output),
true);
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithStylesheet.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithStylesheet.java?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithStylesheet.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestTransformerWithStylesheet.java
Sat Apr 14 10:49:05 2012
@@ -43,7 +43,12 @@ public class TestTransformerWithStyleshe
Document actual = builder.newDocument();
Transformer transformer =
((TransformerFactory)transformerFactoryClass.newInstance()).newTransformer(new
DOMSource(stylesheet));
transformer.transform(new DOMSource(input), new DOMResult(actual));
+ boolean oldIgnoreWhitespace = XMLUnit.getIgnoreWhitespace();
XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expected, actual);
+ try {
+ XMLAssert.assertXMLEqual(expected, actual);
+ } finally {
+ XMLUnit.setIgnoreWhitespace(oldIgnoreWhitespace);
+ }
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Sat Apr
14 10:49:05 2012
@@ -102,7 +102,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Sat Apr
14 10:49:05 2012
@@ -100,7 +100,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-integration/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-integration/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-integration/pom.xml
Sat Apr 14 10:49:05 2012
@@ -83,7 +83,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml Sat
Apr 14 10:49:05 2012
@@ -458,7 +458,12 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/pom.xml?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/pom.xml Sat
Apr 14 10:49:05 2012
@@ -67,7 +67,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java?rev=1326085&r1=1326084&r2=1326085&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
Sat Apr 14 10:49:05 2012
@@ -24,7 +24,6 @@ import java.io.InputStream;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -32,6 +31,7 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.DocumentElementExtractor;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.xalan.processor.TransformerFactoryImpl;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -53,7 +53,8 @@ public class OMElementFactory implements
dbf.setNamespaceAware(true);
Document doc = dbf.newDocumentBuilder().parse(testFileContent);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- TransformerFactory.newInstance().newTransformer().transform(
+ // Use Xalan's factory directly to avoid issues if Saxon is
selected as default
+ new TransformerFactoryImpl().newTransformer().transform(
new DOMSource(doc.getDocumentElement()), new
StreamResult(baos));
return new InputSource(new
ByteArrayInputStream(baos.toByteArray()));
} finally {
