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 2015/07/01 10:04:18 UTC
[1/3] camel git commit: CAMEL-8906: destroy method
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x bfbf24952 -> 97c6a8605
refs/heads/master 58870c1bf -> 65594b370
CAMEL-8906: destroy method
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f231d640
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f231d640
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f231d640
Branch: refs/heads/master
Commit: f231d6401819326fa33d508f5e79173112dbbde4
Parents: 58870c1
Author: bsmk <mi...@gmail.com>
Authored: Sun Jun 28 17:10:26 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 1 09:56:08 2015 +0200
----------------------------------------------------------------------
.../spring/boot/CamelSpringBootApplicationController.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f231d640/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
index 7ff3714..cd516e7 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
@@ -24,6 +24,8 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.main.MainSupport;
import org.springframework.context.ApplicationContext;
+import javax.annotation.PreDestroy;
+
public class CamelSpringBootApplicationController {
private final MainSupport mainSupport;
@@ -51,4 +53,9 @@ public class CamelSpringBootApplicationController {
}
}
+ @PreDestroy
+ private void destroy() {
+ mainSupport.completed();
+ }
+
}
\ No newline at end of file
[2/3] camel git commit: Added missing lic headers and polished
Posted by da...@apache.org.
Added missing lic headers and polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/65594b37
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65594b37
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65594b37
Branch: refs/heads/master
Commit: 65594b3707c1e9a8b3f384d525933fd1712ce678
Parents: f231d64
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 1 10:08:35 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 1 10:08:35 2015 +0200
----------------------------------------------------------------------
components/camel-spring-boot/pom.xml | 137 ++++++++++---------
.../src/test/resources/camel/camelContext.xml | 16 +++
.../src/test/resources/externalCamelContext.xml | 16 +++
.../src/test/resources/logback.xml | 21 +++
4 files changed, 123 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/65594b37/components/camel-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 0fa09f5..fd26863 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -15,78 +15,81 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.16-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.16-SNAPSHOT</version>
+ </parent>
- <name>Camel :: Spring Boot</name>
- <artifactId>camel-spring-boot</artifactId>
- <description>Camel :: Spring Boot autostart configuration</description>
+ <name>Camel :: Spring Boot</name>
+ <artifactId>camel-spring-boot</artifactId>
+ <description>Camel :: Spring Boot</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <optional>true</optional>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <optional>true</optional>
+ <version>${spring-boot-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ <version>${spring-boot-version}</version>
+ </dependency>
- <!-- Optional Spring web support -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <optional>true</optional>
- <version>${spring-boot-version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
- <!-- Testing dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Optional Spring web support -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <optional>true</optional>
+ <version>${spring-boot-version}</version>
+ </dependency>
+
+ <!-- Testing dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <version>${spring-boot-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-netty4-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/65594b37/components/camel-spring-boot/src/test/resources/camel/camelContext.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/test/resources/camel/camelContext.xml b/components/camel-spring-boot/src/test/resources/camel/camelContext.xml
index 21b424b..8d9e7b8 100644
--- a/components/camel-spring-boot/src/test/resources/camel/camelContext.xml
+++ b/components/camel-spring-boot/src/test/resources/camel/camelContext.xml
@@ -1,4 +1,20 @@
<?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.
+-->
<routes xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:xmlAutoLoading"/>
http://git-wip-us.apache.org/repos/asf/camel/blob/65594b37/components/camel-spring-boot/src/test/resources/externalCamelContext.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/test/resources/externalCamelContext.xml b/components/camel-spring-boot/src/test/resources/externalCamelContext.xml
index 08f0e5c..3d02f55 100644
--- a/components/camel-spring-boot/src/test/resources/externalCamelContext.xml
+++ b/components/camel-spring-boot/src/test/resources/externalCamelContext.xml
@@ -1,4 +1,20 @@
<?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:camel="http://camel.apache.org/schema/spring"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/camel/blob/65594b37/components/camel-spring-boot/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/test/resources/logback.xml b/components/camel-spring-boot/src/test/resources/logback.xml
new file mode 100644
index 0000000..e573bd4
--- /dev/null
+++ b/components/camel-spring-boot/src/test/resources/logback.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<configuration>
+ <include resource="org/springframework/boot/logging/logback/base.xml"/>
+ <logger name="org.apache.camel.spring.boot" level="INFO"/>
+</configuration>
\ No newline at end of file
[3/3] camel git commit: CAMEL-8906: destroy method
Posted by da...@apache.org.
CAMEL-8906: destroy method
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97c6a860
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97c6a860
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97c6a860
Branch: refs/heads/camel-2.15.x
Commit: 97c6a86052b39b1b957b2a2d178c1a06aca6239b
Parents: bfbf249
Author: bsmk <mi...@gmail.com>
Authored: Sun Jun 28 17:10:26 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 1 10:09:57 2015 +0200
----------------------------------------------------------------------
.../spring/boot/CamelSpringBootApplicationController.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/97c6a860/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
index 7ff3714..cd516e7 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
@@ -24,6 +24,8 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.main.MainSupport;
import org.springframework.context.ApplicationContext;
+import javax.annotation.PreDestroy;
+
public class CamelSpringBootApplicationController {
private final MainSupport mainSupport;
@@ -51,4 +53,9 @@ public class CamelSpringBootApplicationController {
}
}
+ @PreDestroy
+ private void destroy() {
+ mainSupport.completed();
+ }
+
}
\ No newline at end of file