You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/22 09:35:36 UTC
[camel] branch split created (now f33eba3064f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch split
in repository https://gitbox.apache.org/repos/asf/camel.git
at f33eba3064f CAMEL-19632: Fix split package in camel-xml-jaxp and camel-xml-japx-util
This branch includes the following new commits:
new f33eba3064f CAMEL-19632: Fix split package in camel-xml-jaxp and camel-xml-japx-util
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-19632: Fix split package in camel-xml-jaxp and camel-xml-japx-util
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch split
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f33eba3064f7fe742713d95448ab1853e2a5ba58
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jul 22 11:35:22 2023 +0200
CAMEL-19632: Fix split package in camel-xml-jaxp and camel-xml-japx-util
---
.../camel/language/csimple/CSimpleHelper.java | 2 +-
.../camel/support/builder/ExpressionBuilder.java | 2 +-
.../util/xml/{ => pretty}/XmlPrettyPrinter.java | 2 +-
.../xml/{ => pretty}/XmlPrettyPrinterTest.java | 2 +-
.../org/apache/camel/util/camel-context.xml | 49 ----------------------
.../camel/dsl/jbang/core/common/XmlHelper.java | 2 +-
6 files changed, 5 insertions(+), 54 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index b526f800a43..4b5c4cd81cb 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -49,7 +49,7 @@ import org.apache.camel.util.OgnlHelper;
import org.apache.camel.util.SkipIterator;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.Jsoner;
-import org.apache.camel.util.xml.XmlPrettyPrinter;
+import org.apache.camel.util.xml.pretty.XmlPrettyPrinter;
/**
* A set of helper as static imports for the Camel compiled simple language.
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index a82c23085f6..6b8828b5561 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -55,7 +55,7 @@ import org.apache.camel.util.InetAddressUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.Jsoner;
-import org.apache.camel.util.xml.XmlPrettyPrinter;
+import org.apache.camel.util.xml.pretty.XmlPrettyPrinter;
/**
* A helper class for working with <a href="http://camel.apache.org/expression.html">expressions</a>.
diff --git a/core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java b/core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinter.java
similarity index 99%
rename from core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java
rename to core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinter.java
index 89724072545..4e5789e0e67 100644
--- a/core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/XmlPrettyPrinter.java
+++ b/core/camel-xml-jaxp-util/src/main/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.xml;
+package org.apache.camel.util.xml.pretty;
import java.io.ByteArrayInputStream;
diff --git a/core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/XmlPrettyPrinterTest.java b/core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinterTest.java
similarity index 98%
rename from core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/XmlPrettyPrinterTest.java
rename to core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinterTest.java
index e84dd9589d2..1740e3929df 100644
--- a/core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/XmlPrettyPrinterTest.java
+++ b/core/camel-xml-jaxp-util/src/test/java/org/apache/camel/util/xml/pretty/XmlPrettyPrinterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util.xml;
+package org.apache.camel.util.xml.pretty;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/core/camel-xml-jaxp-util/src/test/resources/org/apache/camel/util/camel-context.xml b/core/camel-xml-jaxp-util/src/test/resources/org/apache/camel/util/camel-context.xml
deleted file mode 100644
index d111a238942..00000000000
--- a/core/camel-xml-jaxp-util/src/test/resources/org/apache/camel/util/camel-context.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
- <!-- notice Camel will only update the routes that has been changed, so you can edit either either route or both
- and save the file, and Camel will update only what is required -->
-
- <camelContext xmlns="http://camel.apache.org/schema/spring">
-
- <route id="timer">
- <from uri="timer:foo"/>
- <!-- call the 2nd route -->
- <to uri="direct:foo"/>
- <!-- try to change me and save this file -->
- <log message="You said: ${body}"/>
- </route>
-
- <route id="foo">
- <from uri="direct:foo"/>
- <!-- try to change me and save this file -->
- <transform>
- <constant>Hello World</constant>
- </transform>
- </route>
-
- </camelContext>
-
-</beans>
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/XmlHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/XmlHelper.java
index 374ad0a3930..e481241013f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/XmlHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/XmlHelper.java
@@ -21,7 +21,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.xml.XmlPrettyPrinter;
+import org.apache.camel.util.xml.pretty.XmlPrettyPrinter;
import org.fusesource.jansi.Ansi;
public final class XmlHelper {