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 5f3efadaa0ec4a1e652095506eb3e4617a7ddab3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 7 12:46:36 2019 +0200
CAMEL-13620: Move Main out to camel-main
---
.../camel-example-main => core/camel-main}/pom.xml | 48 ++++++++--------------
.../src/main/java/org/apache/camel/main/Main.java | 0
.../camel/main/MainConfigurationProperties.java | 0
.../camel/main/MainDurationEventNotifier.java | 0
.../apache/camel/main/MainLifecycleStrategy.java | 0
.../java/org/apache/camel/main/MainListener.java | 0
.../org/apache/camel/main/MainListenerSupport.java | 0
.../java/org/apache/camel/main/MainRegistry.java | 0
.../java/org/apache/camel/main/MainSupport.java | 0
.../main/java/org/apache/camel/main/package.html | 0
.../java/org/apache/camel/main/MainExample.java | 0
.../main/MainIoCNewRouteBuilderComplexTest.java | 1 -
.../camel/main/MainIoCNewRouteBuilderTest.java | 0
.../java/org/apache/camel/main/MainIoCTest.java | 0
.../camel/main/MainSupportCommandLineTest.java} | 9 ++--
.../test/java/org/apache/camel/main/MainTest.java | 0
.../java/org/apache/camel/main/MainVetoTest.java | 0
.../test/java/org/apache/camel/main/MyFoo.java} | 19 ++++++---
.../src/test/resources/application.properties | 21 ++++++++++
core/pom.xml | 1 +
examples/camel-example-main/pom.xml | 4 ++
21 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/examples/camel-example-main/pom.xml b/core/camel-main/pom.xml
similarity index 64%
copy from examples/camel-example-main/pom.xml
copy to core/camel-main/pom.xml
index 9f75dcc..54659cf 100644
--- a/examples/camel-example-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -19,22 +19,22 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.camel.example</groupId>
- <artifactId>examples</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-example-main</artifactId>
+ <artifactId>camel-main</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Example :: Main</name>
- <description>An example for showing standalone Camel</description>
+ <name>Camel :: Main</name>
+ <description>Camel Main</description>
<properties>
- <category>Beginner</category>
+ <firstVersion>3.0</firstVersion>
+ <label>core</label>
</properties>
<dependencies>
@@ -43,47 +43,33 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+
+ <!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz2</artifactId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
</dependency>
-
- <!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <scope>runtime</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- <!-- Allows the example to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
-
<mainClass>org.apache.camel.example.MyApplication</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/Main.java
b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/Main.java
rename to core/camel-main/src/main/java/org/apache/camel/main/Main.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
similarity index 100%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
rename to
core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
similarity index 100%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
rename to
core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
similarity index 100%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
rename to
core/camel-main/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainListener.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainListener.java
similarity index 100%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainListener.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainListener.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainListenerSupport.java
similarity index 100%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
rename to
core/camel-main/src/main/java/org/apache/camel/main/MainListenerSupport.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainRegistry.java
similarity index 100%
copy from core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
copy to core/camel-main/src/main/java/org/apache/camel/main/MainRegistry.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
rename to core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
diff --git a/core/camel-core/src/main/java/org/apache/camel/main/package.html
b/core/camel-main/src/main/java/org/apache/camel/main/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/main/package.html
rename to core/camel-main/src/main/java/org/apache/camel/main/package.html
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainExample.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainExample.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainExample.java
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
rename to
core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
index 01a90db..a7304d6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderComplexTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.main;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
-import org.apache.camel.MyFoo;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
similarity index 100%
rename from
core/camel-core/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
rename to
core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
similarity index 90%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
rename to
core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
index 1e9ba7d..78449e9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
@@ -14,18 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.main;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.main.MainSupport;
+import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Test;
-public class MainSupportTest extends ContextTestSupport {
+public class MainSupportCommandLineTest {
private class MyMainSupport extends MainSupport {
+ private CamelContext context = new DefaultCamelContext();
+
@Override
protected ProducerTemplate findOrCreateCamelTemplate() {
return context.createProducerTemplate();
diff --git a/core/camel-core/src/test/java/org/apache/camel/main/MainTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
similarity index 100%
rename from core/camel-core/src/test/java/org/apache/camel/main/MainTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
diff --git
a/core/camel-core/src/test/java/org/apache/camel/main/MainVetoTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
similarity index 100%
rename from
core/camel-core/src/test/java/org/apache/camel/main/MainVetoTest.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MainVetoTest.java
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
b/core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
similarity index 76%
rename from
core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
rename to core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
index 7eb8281..c612071 100644
--- a/core/camel-core/src/main/java/org/apache/camel/main/MainRegistry.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MyFoo.java
@@ -16,13 +16,22 @@
*/
package org.apache.camel.main;
-import java.util.Set;
+public class MyFoo {
-import org.apache.camel.support.DefaultRegistry;
+ private String name;
-public final class MainRegistry extends DefaultRegistry {
+ public MyFoo() {
+ }
+
+ public MyFoo(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
- public <T> Set<T> findBindingsByType(Class<T> type) {
- return fallbackRegistry.findByType(type);
+ public void setName(String name) {
+ this.name = name;
}
}
diff --git a/core/camel-main/src/test/resources/application.properties
b/core/camel-main/src/test/resources/application.properties
new file mode 100644
index 0000000..8d8fba7
--- /dev/null
+++ b/core/camel-main/src/test/resources/application.properties
@@ -0,0 +1,21 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+hello=World
+
+camel.component.seda.concurrent-consumers=2
+camel.component.seda.queueSize=500
+camel.component.direct.timeout=1234
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 08b85a7..3f44b11 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -48,6 +48,7 @@
<module>camel-core-osgi</module>
<module>camel-core-xml</module>
<module>camel-cloud</module>
+ <module>camel-main</module>
</modules>
<build>
diff --git a/examples/camel-example-main/pom.xml
b/examples/camel-example-main/pom.xml
index 9f75dcc..2d05078 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -45,6 +45,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-quartz2</artifactId>
</dependency>
