Author: davsclaus
Date: Thu Feb 28 10:37:55 2013
New Revision: 1451168
URL: http://svn.apache.org/r1451168
Log:
CAMEL-6111: Fixed camel-test-blueprint which may start Camel twice due 2 x
BlueprintExtender being activated.
Modified:
camel/trunk/components/camel-test-blueprint/pom.xml
camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1451168&r1=1451167&r2=1451168&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Thu Feb 28 10:37:55 2013
@@ -47,6 +47,13 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-blueprint</artifactId>
+ <!-- exclude aries blueprint as we add these dependencies explicit
-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- the ordering of the dependencies can matter as we load the
dependencies from the classpath
Modified:
camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1451168&r1=1451167&r2=1451168&view=diff
==============================================================================
---
camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
(original)
+++
camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
Thu Feb 28 10:37:55 2013
@@ -26,6 +26,7 @@ log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel.blueprint=TRACE
#log4j.logger.org.apache.camel.core.osgi=TRACE
#log4j.logger.org.apache.aries.blueprint.container=DEBUG
+#log4j.logger.org.apache.camel.blueprint.BlueprintCamelContext=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
