camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CAMEL-7741 Fixed the karaf start up error with -Pkaraf3
Date Tue, 26 Aug 2014 14:36:00 GMT
Repository: camel
Updated Branches:
  refs/heads/master 99a76e706 -> 5ab756b3c


CAMEL-7741 Fixed the karaf start up error with -Pkaraf3


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ab756b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ab756b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ab756b3

Branch: refs/heads/master
Commit: 5ab756b3c24d11682fb104044918d4f0b15a6e91
Parents: 99a76e7
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Aug 26 22:34:33 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Aug 26 22:34:58 2014 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java     | 2 +-
 .../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5ab756b3/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 736b465..89589af 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -202,7 +202,7 @@ public abstract class AbstractFeatureTest {
 
                         KarafDistributionOption.keepRuntimeFolder(),
                         // override the config.properties (to fix pax-exam bug)
-                        KarafDistributionOption.replaceConfigurationFile("etc/config.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+                        //KarafDistributionOption.replaceConfigurationFile("etc/config.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
                         KarafDistributionOption.replaceConfigurationFile("etc/custom.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
                         KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg",
new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")),
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5ab756b3/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 6543f60..52f7bbf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -162,7 +162,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
 
                       KarafDistributionOption.keepRuntimeFolder(),
                       // override the config.properties (to fix pax-exam bug)
-                      KarafDistributionOption.replaceConfigurationFile("etc/config.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+                      // KarafDistributionOption.replaceConfigurationFile("etc/config.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
                       KarafDistributionOption.replaceConfigurationFile("etc/custom.properties",
new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
                       KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg",
new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")),
 


Mime
View raw message