This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5b89f48b956 CAMEL-18346 Remove xalan-specific code / references (#8254)
5b89f48b956 is described below
commit 5b89f48b9565421d59cd37bbcaa84695e668649f
Author: Tom Cunningham <tcunn...@redhat.com>
AuthorDate: Fri Sep 2 00:30:41 2022 -0400
CAMEL-18346 Remove xalan-specific code / references (#8254)
---
.../src/main/resources/notice-supplements.xml | 17 --------------
.../component/cxf/converter/CachedCxfPayload.java | 5 ----
.../spring/ws/SpringWebserviceHelper.java | 5 ----
.../org/apache/camel/builder/xml/XPathTest.java | 27 ----------------------
.../apache/camel/converter/jaxp/XmlConverter.java | 6 -----
5 files changed, 60 deletions(-)
diff --git a/buildingtools/src/main/resources/notice-supplements.xml
b/buildingtools/src/main/resources/notice-supplements.xml
index 4ee9c872a8b..0ca92261649 100644
--- a/buildingtools/src/main/resources/notice-supplements.xml
+++ b/buildingtools/src/main/resources/notice-supplements.xml
@@ -137,23 +137,6 @@
</licenses>
</project>
</supplement>
- <supplement>
- <project>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <name>Apache Xalan-Java</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
<supplement>
<project>
<groupId>net.java.dev.stax-utils</groupId>
diff --git
a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index 18e4fac91f1..e40d134ef8d 100644
---
a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++
b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -129,11 +129,6 @@ public class CachedCxfPayload<T> extends CxfPayload<T>
implements StreamCache {
outputProperties.put("omit-xml-declaration", "yes");
transformer.setOutputProperties(outputProperties);
- if
(factory.getClass().getName().equals("org.apache.xalan.processor.TransformerFactoryImpl")
- && source instanceof StAXSource) {
- source = new StAX2SAXSource(((StAXSource)
source).getXMLStreamReader());
- }
-
transformer.transform(source, result);
}
}
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceHelper.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceHelper.java
index 9cbf54d7e8e..97bce2080a1 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceHelper.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceHelper.java
@@ -49,11 +49,6 @@ public final class SpringWebserviceHelper {
outputProperties.put("omit-xml-declaration", "yes");
transformer.setOutputProperties(outputProperties);
- if
(factory.getClass().getName().equals("org.apache.xalan.processor.TransformerFactoryImpl")
- && source instanceof StAXSource) {
- source = new StAX2SAXSource(((StAXSource)
source).getXMLStreamReader());
- }
-
transformer.transform(source, result);
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index 88c52fc751b..47eecd83b51 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -306,33 +306,6 @@ public class XPathTest extends ContextTestSupport {
assertTrue(result.toString().contains("James"));
}
- @Test
- public void testUsingJavaExtensions() throws Exception {
- Object instance = null;
-
- // we may not have Xalan on the classpath
- try {
- instance =
Class.forName("org.apache.xalan.extensions.XPathFunctionResolverImpl").getDeclaredConstructor()
- .newInstance();
- } catch (Throwable e) {
-
- log.debug("Could not find Xalan on the classpath so ignoring this
test case: " + e);
- }
- if (instance instanceof XPathFunctionResolver) {
- XPathFunctionResolver functionResolver = (XPathFunctionResolver)
instance;
-
- XPathBuilder builder = xpath("java:" + getClass().getName() +
".func(string(/header/value))")
- .namespace("java", "http://xml.apache.org/xalan/java";)
- .functionResolver(functionResolver).stringResult();
-
- String xml = "<header><value>12</value></header>";
- // it can throw the exception if we put the xalan into the test
- // class path
- assertExpression(builder, xml, "modified12");
- }
-
- }
-
public static String func(String message) {
return "modified" + message;
}
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 80f022d46c4..1f2e7a77412 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -93,7 +93,6 @@ public class XmlConverter {
private static final String JDK_FALLBACK_TRANSFORMER_FACTORY
=
"com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
- private static final String XALAN_TRANSFORMER_FACTORY =
"org.apache.xalan.processor.TransformerFactoryImpl";
private static final Logger LOG =
LoggerFactory.getLogger(XmlConverter.class);
private static final ErrorHandler DOCUMENT_BUILDER_LOGGING_ERROR_HANDLER =
new DocumentBuilderLoggingErrorHandler();
@@ -138,11 +137,6 @@ public class XmlConverter {
throw new TransformerException("Could not create a transformer -
JAXP is misconfigured!");
}
transformer.setOutputProperties(outputProperties);
- if
(this.transformerFactory.getClass().getName().equals(XALAN_TRANSFORMER_FACTORY)
- && source instanceof StAXSource) {
- //external xalan can't handle StAXSource, so convert StAXSource to
SAXSource.
- source = new StAX2SAXSource(((StAXSource)
source).getXMLStreamReader());
- }
transformer.transform(source, result);
}
