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 2019/01/28 16:17:40 UTC
[camel] branch master updated: camel3 - Move TimeUnitAdapter from
builder.xml to model as its part of the model.
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
The following commit(s) were added to refs/heads/master by this push:
new b70deaa camel3 - Move TimeUnitAdapter from builder.xml to model as its part of the model.
b70deaa is described below
commit b70deaa59ddc2e32f2a0b7afa8b52e16158dff05
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 28 17:15:43 2019 +0100
camel3 - Move TimeUnitAdapter from builder.xml to model as its part of the model.
---
.../src/main/java/org/apache/camel/model/SamplingDefinition.java | 1 -
.../main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java | 1 -
.../src/main/java/org/apache/camel/model/ThreadsDefinition.java | 1 -
.../java/org/apache/camel/{builder/xml => model}/TimeUnitAdapter.java | 2 +-
.../model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java | 2 +-
.../org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 3 +--
.../org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java | 4 ++--
7 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
index 322471b..71c9854 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.camel.builder.xml.TimeUnitAdapter;
import org.apache.camel.spi.Metadata;
/**
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
index 112697f..cfb9599 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.camel.builder.xml.TimeUnitAdapter;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index d88439f..ad4767e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.camel.builder.xml.TimeUnitAdapter;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java b/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java
rename to camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
index 86ccca8..12f13c7 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/TimeUnitAdapter.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.xml;
+package org.apache.camel.model;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
index 177d00e..4c3df26 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.camel.CamelContext;
-import org.apache.camel.builder.xml.TimeUnitAdapter;
+import org.apache.camel.model.TimeUnitAdapter;
import org.apache.camel.spi.Metadata;
@Metadata(label = "routing,cloud,service-discovery")
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index d88469a..36d7d95 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlTransient;
@@ -50,9 +49,9 @@ import org.apache.camel.component.properties.PropertiesResolver;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckService;
+import org.apache.camel.impl.DefaultManagementStrategy;
import org.apache.camel.management.DefaultManagementAgent;
import org.apache.camel.management.DefaultManagementLifecycleStrategy;
-import org.apache.camel.impl.DefaultManagementStrategy;
import org.apache.camel.management.ManagedManagementStrategy;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FromDefinition;
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
index 87bbccf..254d9ab 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
@@ -23,12 +23,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.ThreadPoolProfileBuilder;
-import org.apache.camel.builder.xml.TimeUnitAdapter;
+import org.apache.camel.model.TimeUnitAdapter;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.support.CamelContextHelper;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
/**
* A factory which instantiates {@link java.util.concurrent.ExecutorService} objects