This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91a63303020023679f73455bbf3055e6241bbf16 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Mar 23 07:42:34 2021 +0100 CAMEL-13374: Move XmlStreamReader into camel-xml-io-util module to be independent. --- core/{camel-xml-io => camel-xml-io-util}/pom.xml | 45 +++------------------- .../apache/camel/xml/io/util}/XmlStreamReader.java | 2 +- .../xml/io/util}/XmlStreamReaderException.java | 2 +- core/camel-xml-io/pom.xml | 5 ++- .../java/org/apache/camel/xml/io/MXParser.java | 3 +- core/pom.xml | 2 +- parent/pom.xml | 5 +++ 7 files changed, 20 insertions(+), 44 deletions(-) diff --git a/core/camel-xml-io/pom.xml b/core/camel-xml-io-util/pom.xml similarity index 52% copy from core/camel-xml-io/pom.xml copy to core/camel-xml-io-util/pom.xml index d6c22ee..e2c42e5 100644 --- a/core/camel-xml-io/pom.xml +++ b/core/camel-xml-io-util/pom.xml @@ -26,51 +26,18 @@ <version>3.9.0-SNAPSHOT</version> </parent> - <artifactId>camel-xml-io</artifactId> - - <name>Camel :: XML IO</name> - <description>Camel XML IO</description> - - <properties> - <camel-generate-xml-parser>true</camel-generate-xml-parser> - </properties> + <artifactId>camel-xml-io-util</artifactId> + <packaging>jar</packaging> + <name>Camel :: XML IO Util</name> + <description>Camel XML IO Utilities</description> <dependencies> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core-engine</artifactId> - </dependency> - - <!-- testing --> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> + <artifactId>slf4j-api</artifactId> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate-xml-parser</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </dependencies> </project> diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java similarity index 99% rename from core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java rename to core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java index 3b32a1b..be4637b 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java +++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java @@ -33,7 +33,7 @@ */ // CHECKSTYLE:OFF -package org.apache.camel.xml.io; +package org.apache.camel.xml.io.util; import java.io.BufferedInputStream; import java.io.File; diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java similarity index 99% rename from core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java rename to core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java index a74e6ab..edcb4df 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java +++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamReaderException.java @@ -33,7 +33,7 @@ */ // CHECKSTYLE:OFF -package org.apache.camel.xml.io; +package org.apache.camel.xml.io.util; import java.io.IOException; import java.io.InputStream; diff --git a/core/camel-xml-io/pom.xml b/core/camel-xml-io/pom.xml index d6c22ee..53d7abe 100644 --- a/core/camel-xml-io/pom.xml +++ b/core/camel-xml-io/pom.xml @@ -27,7 +27,6 @@ </parent> <artifactId>camel-xml-io</artifactId> - <name>Camel :: XML IO</name> <description>Camel XML IO</description> @@ -41,6 +40,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-core-engine</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-xml-io-util</artifactId> + </dependency> <!-- testing --> <dependency> diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java index 8cdaf72..0cae9f7 100644 --- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java +++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java @@ -33,6 +33,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import org.apache.camel.xml.io.util.XmlStreamReader; + //TODO best handling of interning issues // have isAllNewStringInterned ??? @@ -46,7 +48,6 @@ import java.io.Reader; * @author <a href="http://www.extreme.indiana.edu/~aslom/";>Aleksander * Slominski</a> */ - public class MXParser implements XmlPullParser { // NOTE: no interning of those strings --> by Java lang spec they MUST be // already interned diff --git a/core/pom.xml b/core/pom.xml index 1778090..1b4db6c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,13 +35,13 @@ <modules> <module>camel-util</module> - <module>camel-api</module> <module>camel-core-catalog</module> <module>camel-support</module> <module>camel-management-api</module> <module>camel-management</module> <module>camel-base</module> <module>camel-base-engine</module> + <module>camel-xml-io-util</module> <module>camel-xml-jaxp</module> <module>camel-cluster</module> <module>camel-core-engine</module> diff --git a/parent/pom.xml b/parent/pom.xml index 80c2aeb..640dcc7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -747,6 +747,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-xml-io-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-xml-jaxb</artifactId> <version>${project.version}</version> </dependency>
