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/11/27 08:27:59 UTC
[1/3] camel git commit: Update RoutesCollector.java
Repository: camel
Updated Branches:
refs/heads/master 3cdf9221a -> 59a3f6bdb
Update RoutesCollector.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea12ee7f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea12ee7f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea12ee7f
Branch: refs/heads/master
Commit: ea12ee7fc04391e842b5c1ac39404d930164adff
Parents: c94dbbb
Author: awgtek <ad...@hotmail.com>
Authored: Mon Nov 16 23:08:07 2015 -0500
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 27 08:16:16 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/spring/boot/RoutesCollector.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ea12ee7f/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
index c13e214..af2f625 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
@@ -83,6 +83,11 @@ public class RoutesCollector implements ApplicationListener<ContextRefreshedEven
}
camelContext.start();
+
+ for (CamelContextConfiguration camelContextConfiguration : camelContextConfigurations) {
+ camelContextConfiguration.afterApplicationStart(camelContext);
+ }
+
} catch (Exception e) {
throw new CamelSpringBootInitializationException(e);
}
@@ -109,4 +114,4 @@ public class RoutesCollector implements ApplicationListener<ContextRefreshedEven
}
}
-}
\ No newline at end of file
+}
[2/3] camel git commit: Update CamelContextConfiguration.java
Posted by da...@apache.org.
Update CamelContextConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c94dbbb5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c94dbbb5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c94dbbb5
Branch: refs/heads/master
Commit: c94dbbb5af6d748ee66f79e15f8fa40a63886c29
Parents: 3cdf922
Author: awgtek <ad...@hotmail.com>
Authored: Mon Nov 16 23:04:15 2015 -0500
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 27 08:16:16 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/spring/boot/CamelContextConfiguration.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c94dbbb5/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
index 418cb00..47c0640 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
@@ -22,4 +22,6 @@ public interface CamelContextConfiguration {
void beforeApplicationStart(CamelContext camelContext);
+ void afterApplicationStart(CamelContext camelContext);
+
}
[3/3] camel git commit: Polished. Fixes #678. Fixed #677. Fixes #662.
Posted by da...@apache.org.
Polished. Fixes #678. Fixed #677. Fixes #662.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a3f6bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a3f6bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a3f6bd
Branch: refs/heads/master
Commit: 59a3f6bdb9091014b79caec864bf90c61838d894
Parents: ea12ee7
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 27 08:27:49 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 27 08:27:49 2015 +0100
----------------------------------------------------------------------
.../src/test/resources/application.properties | 2 ++
.../camel-spring-boot/src/test/resources/logback.xml | 14 ++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59a3f6bd/components/camel-spring-boot/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/test/resources/application.properties b/components/camel-spring-boot/src/test/resources/application.properties
index ab48a84..c82e80b 100644
--- a/components/camel-spring-boot/src/test/resources/application.properties
+++ b/components/camel-spring-boot/src/test/resources/application.properties
@@ -15,5 +15,7 @@
# limitations under the License.
#
+spring.main.banner_mode=off
+
from=direct:test
to=mock:test
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/59a3f6bd/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
index e573bd4..21594c9 100644
--- a/components/camel-spring-boot/src/test/resources/logback.xml
+++ b/components/camel-spring-boot/src/test/resources/logback.xml
@@ -16,6 +16,16 @@
limitations under the License.
-->
<configuration>
- <include resource="org/springframework/boot/logging/logback/base.xml"/>
- <logger name="org.apache.camel.spring.boot" level="INFO"/>
+
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ <file>target/camel-spring-boot-test.log</file>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="FILE"/>
+ </root>
+
</configuration>
\ No newline at end of file