Author: davsclaus
Date: Mon Feb 11 10:13:42 2013
New Revision: 1444719
URL: http://svn.apache.org/r1444719
Log:
Polished
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-karaf/src/test/resources/log4j.properties
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1444719&r1=1444718&r2=1444719&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Mon Feb 11 10:13:42 2013
@@ -27,6 +27,7 @@ import org.apache.camel.osgi.CamelContex
import org.junit.After;
import org.junit.Before;
import org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption;
+import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
@@ -35,6 +36,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertNotNull;
import static
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
import static
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -162,7 +164,9 @@ public abstract class AbstractFeatureTes
// override the config.properties (to fix pax-exam bug)
replaceConfigurationFile("etc/config.properties", new
File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
replaceConfigurationFile("etc/custom.properties", new
File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
- // install the cxf jaxb spec as the karaf doesn't provide it
by default
+ // we need INFO logging otherwise we cannot see what happens
+ logLevel(LogLevelOption.LogLevel.INFO),
+ // install the cxf jaxb spec as the karaf doesn't provide it
by default
scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb",
"camel-core", "camel-spring", "camel-" + feature)};
return options;
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/resources/log4j.properties?rev=1444719&r1=1444718&r2=1444719&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/resources/log4j.properties
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/resources/log4j.properties Mon
Feb 11 10:13:42 2013
@@ -26,6 +26,7 @@ log4j.rootLogger=INFO, out
#log4j.logger.org.ops4j.pax=DEBUG
# is very noisy at INFO level
log4j.logger.org.ops4j.io=WARN
+#log4j.logger.org.apache.camel.impl.osgi=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
