date:20140826

[4/4] git commit: Upgarded pax-exam version of camel-itest-karaf to 3.4.0

2014-08-26 Thread ningjiang

Upgarded  pax-exam version of camel-itest-karaf to 3.4.0


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

Branch: refs/heads/master
Commit: fe438ef79b601424b7bec444629662db79b94754
Parents: b70c418
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Aug 26 10:11:08 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Aug 26 14:08:13 2014 +0800

--
 tests/camel-itest-karaf/pom.xml | 12 +-
 .../camel/itest/karaf/AbstractFeatureTest.java  | 25 +---
 .../apache/camel/itest/karaf/CamelAhcTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelAmqpTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelApnsTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelAtomTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelAvroTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelAwsTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelBamTest.java  |  6 ++---
 .../camel/itest/karaf/CamelBase64Test.java  |  6 ++---
 .../itest/karaf/CamelBeanValidatorTest.java |  6 ++---
 .../camel/itest/karaf/CamelBeanioTest.java  |  6 ++---
 .../camel/itest/karaf/CamelBindyTest.java   |  6 ++---
 .../camel/itest/karaf/CamelCacheTest.java   |  6 ++---
 .../camel/itest/karaf/CamelCastorTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelCmisTest.java |  6 ++---
 .../camel/itest/karaf/CamelCometdTest.java  |  6 ++---
 .../camel/itest/karaf/CamelContextTest.java |  6 ++---
 .../camel/itest/karaf/CamelCouchDBTest.java |  6 ++---
 .../camel/itest/karaf/CamelCryptoTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelCsvTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelCxfTest.java  |  6 ++---
 .../camel/itest/karaf/CamelDisruptorTest.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelDnsTest.java  |  6 ++---
 .../camel/itest/karaf/CamelDropboxTest.java |  6 ++---
 .../itest/karaf/CamelElasticsearchTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelExecTest.java |  6 ++---
 .../camel/itest/karaf/CamelFacebookTest.java|  6 ++---
 .../camel/itest/karaf/CamelFlatpackTest.java|  6 ++---
 .../apache/camel/itest/karaf/CamelFopTest.java  |  6 ++---
 .../camel/itest/karaf/CamelFreemarkerTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelFtpTest.java  |  6 ++---
 .../camel/itest/karaf/CamelGeocoderTest.java|  6 ++---
 .../camel/itest/karaf/CamelGroovyTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelGsonTest.java |  6 ++---
 .../itest/karaf/CamelGuavaEventBusTest.java |  6 ++---
 .../camel/itest/karaf/CamelGuiceTest.java   |  6 ++---
 .../camel/itest/karaf/CamelHazelcastTest.java   |  6 ++---
 .../camel/itest/karaf/CamelHbaseTest.java   |  6 ++---
 .../camel/itest/karaf/CamelHdfs2Test.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelHdfsTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelHl7Test.java  |  6 ++---
 .../camel/itest/karaf/CamelHttp4Test.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelHttpTest.java |  6 ++---
 .../camel/itest/karaf/CamelIbatisTest.java  |  6 ++---
 .../camel/itest/karaf/CamelInfinispanTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelIrcTest.java  |  6 ++---
 .../camel/itest/karaf/CamelJacksonTest.java |  6 ++---
 .../camel/itest/karaf/CamelJasyptTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelJaxbTest.java |  6 ++---
 .../camel/itest/karaf/CamelJcloudsTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelJcrTest.java  |  6 ++---
 .../itest/karaf/CamelJdbcAggregatorTest.java|  6 ++---
 .../apache/camel/itest/karaf/CamelJdbcTest.java |  6 ++---
 .../camel/itest/karaf/CamelJettyTest.java   |  6 ++---
 .../camel/itest/karaf/CamelJgroupsTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelJibxTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelJingTest.java |  6 ++---
 .../apache/camel/itest/karaf/CamelJmsTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelJmxTest.java  |  6 ++---
 .../camel/itest/karaf/CamelJosqlTest.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelJpaTest.java  |  6 ++---
 .../camel/itest/karaf/CamelJsonpathTest.java|  6 ++---
 .../camel/itest/karaf/CamelJt400Test.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelJuelTest.java |  6 ++---
 .../camel/itest/karaf/CamelJxpathTest.java  |  6 ++---
 .../camel/itest/karaf/CamelKafkaTest.java   |  6 ++---
 .../camel/itest/karaf/CamelKratiTest.java   |  6 ++---
 .../apache/camel/itest/karaf/CamelLdapTest.java |  6 ++---
 .../camel/itest/karaf/CamelLuceneTest.java  |  6 ++---
 .../apache/camel/itest/karaf/CamelMailTest.java |  6 ++---
 .../camel/itest/karaf/CamelMetricsTest.java |  6 ++---

[3/4] Upgarded pax-exam version of camel-itest-karaf to 3.4.0

2014-08-26 Thread ningjiang

http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
index 6794fd3..e70a0d5 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJxpathTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
 public class CamelJxpathTest extends AbstractFeatureTest {
 
 public static final String COMPONENT = extractName(CamelJxpathTest.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
index d0e7587..0f6cf0f 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKafkaTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
 public class CamelKafkaTest extends AbstractFeatureTest {
 
 public static final String COMPONENT = extractName(CamelKafkaTest.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
index 582b9c9..cd602fc 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
 public class CamelKratiTest extends AbstractFeatureTest {
 
 public static final String COMPONENT = extractName(CamelKratiTest.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
index a381e18..eea6c99 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLdapTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.junit.PaxExam;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
 public class CamelLdapTest extends AbstractFeatureTest {
 
 public static final String COMPONENT = extractName(CamelLdapTest.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java

[2/4] git commit: CAMEL-7615 Enabled the test of CxfRsBlueprintRouterTest

2014-08-26 Thread ningjiang

CAMEL-7615 Enabled the test of CxfRsBlueprintRouterTest


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

Branch: refs/heads/master
Commit: e65f67e34905a01ffae7664d81f728d8a7bb9b4f
Parents: fe438ef
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Aug 26 14:05:57 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Aug 26 14:08:13 2014 +0800

--
 tests/camel-itest-osgi/pom.xml | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e65f67e3/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index ca89992..a6dc6c4 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -267,7 +267,7 @@
 /dependency
 dependency
   groupIdorg.springframework/groupId
-  artifactIdspring-context-support/artifactId  
+  artifactIdspring-context-support/artifactId
   scopetest/scope
 /dependency
 dependency
@@ -300,12 +300,12 @@
 /dependency
dependency
   groupIdorg.apache.camel/groupId
-  artifactIdcamel-mail/artifactId  
+  artifactIdcamel-mail/artifactId
   scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.camel/groupId
-  artifactIdcamel-test/artifactId  
+  artifactIdcamel-test/artifactId
   scopetest/scope
 /dependency
 dependency
@@ -375,19 +375,19 @@
   artifactIdcxf-rt-rs-extension-providers/artifactId
   version${cxf-version}/version
   scopetest/scope
-  /dependency  
+  /dependency
   dependency
   groupIdorg.apache.cxf/groupId
   artifactIdcxf-rt-transports-http-jetty/artifactId
   version${cxf-version}/version
   scopetest/scope
-  /dependency  
+  /dependency
   dependency
-  groupIdorg.apache.cxf/groupId
+  groupIdorg.apache.cxf/goupId
   artifactIdcxf-rt-ws-security/artifactId
   version${cxf-version}/version
   scopetest/scope
-  /dependency  
+  /dependency
   dependency
   groupIdorg.codehaus.jettison/groupId
   artifactIdjettison/artifactId
@@ -486,7 +486,6 @@
   excludes
   exclude**/FIXMETest.*/exclude
   exclude**/FtpConsumeTest.*/exclude
-  exclude**/CxfRsBlueprintRouterTest.*/exclude
   exclude**/BlobStoreRouteTest.*/exclude !-- CAMEL-6134 
--
   exclude**/BlobStoreBlueprintRouteTest.*/exclude !-- 
CAMEL-6134 --
   /excludes
@@ -494,7 +493,7 @@
   karafVersion${karaf-version}/karafVersion
   /systemPropertyVariables
   /configuration
-  /plugin  
+  /plugin
 
 !-- CXF wsdl2java generator, will plugin to the compile goal --
 plugin
@@ -549,7 +548,7 @@
/plugin
 /plugins
   /build
-   
+
   profiles
profile
 idci-build-profile/id

[1/4] git commit: Fixed the mvn test error of camel-itest-karaf

2014-08-26 Thread ningjiang

Repository: camel
Updated Branches:
  refs/heads/master b70c4189c - 9863ac9e4


Fixed the mvn test error of camel-itest-karaf


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

Branch: refs/heads/master
Commit: 9863ac9e42640bbc6448ab9763643093a7ffb4ee
Parents: e65f67e
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Aug 26 14:07:50 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Aug 26 14:08:13 2014 +0800

--
 tests/camel-itest-karaf/pom.xml |   2 -
 .../camel/itest/karaf/AbstractFeatureTest.java  |  77 +-
 .../camel/itest/karaf/org.ops4j.pax.url.mvn.cfg | 103 +++
 3 files changed, 154 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9863ac9e/tests/camel-itest-karaf/pom.xml
--
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 9e5e6b4..219ac8c 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -163,8 +163,6 @@
 artifactIdmaven-surefire-plugin/artifactId
 configuration
 forkModepertest/forkMode
-redirectTestOutputToFiletrue/redirectTestOutputToFile
-argLine-Xmx256m/argLine
 systemPropertyVariables
 karafVersion${karaf-version}/karafVersion
 /systemPropertyVariables

http://git-wip-us.apache.org/repos/asf/camel/blob/9863ac9e/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 9cd900c..c164b9a 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
@@ -18,12 +18,15 @@ package org.apache.camel.itest.karaf;
 
 import java.io.File;
 
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
 import javax.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultRouteContext;
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.osgi.CamelContextFactory;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption;
 import org.junit.After;
@@ -49,10 +52,14 @@ public abstract class AbstractFeatureTest {
 
 @Before
 public void setUp() throws Exception {
+LOG.info(Calling the setUp method );
+LOG.info(The BundleContext is  + bundleContext);
+Thread.sleep(3000);
 }
 
 @After
 public void tearDown() throws Exception {
+LOG.info(Calling the tearDown method );
 }
 
 protected void testComponent(String component) throws Exception {
@@ -114,12 +121,19 @@ public abstract class AbstractFeatureTest {
 }
 
 protected CamelContext createCamelContext() throws Exception {
+LOG.info(Creating the CamelContext ...);
+setThreadContextClassLoader();
 CamelContextFactory factory = new CamelContextFactory();
 factory.setBundleContext(bundleContext);
 LOG.info(Get the bundleContext is  + bundleContext);
 return factory.createContext();
 }
 
+protected void setThreadContextClassLoader() {
+// set the thread context classloader current bundle classloader
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
 public static String extractName(Class? clazz) {
 String name = clazz.getName();
 int id0 = name.indexOf(Camel) + Camel.length();
@@ -139,7 +153,7 @@ public abstract class AbstractFeatureTest {
 return mavenBundle().
 groupId(org.apache.camel.karaf).
 artifactId(apache-camel).
-classifier(features).type(xml).versionAsInProject();
+versionAsInProject().type(xml/features);
 }
 
 public static UrlReference getKarafFeatureUrl() {
@@ -151,32 +165,43 @@ public abstract class AbstractFeatureTest {
 artifactId(standard).version(karafVersion).type(type);
 }
 
+private static void switchPlatformEncodingToUTF8() {
+try {
+

git commit: CAMEL-7741 Added karaf3 profile for running itest with karaf3

2014-08-26 Thread ningjiang

Repository: camel
Updated Branches:
  refs/heads/master 9863ac9e4 - 2f8bc8045


CAMEL-7741 Added karaf3 profile for running itest with karaf3


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

Branch: refs/heads/master
Commit: 2f8bc804586f41ba346ccb30b1bcf96b5c702c09
Parents: 9863ac9
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Aug 26 14:41:35 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Aug 26 14:51:54 2014 +0800

--
 parent/pom.xml  |  1 +
 tests/camel-itest-karaf/pom.xml | 14 
 .../camel/itest/karaf/AbstractFeatureTest.java  | 13 ++-
 tests/camel-itest-osgi/pom.xml  | 36 ++--
 .../itest/osgi/OSGiIntegrationTestSupport.java  | 15 +++-
 5 files changed, 66 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f8bc804/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8a6293e..6cb99a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,6 +269,7 @@
 kafka-version0.8.1/kafka-version
 kafka-bundle-version0.8.1_1/kafka-bundle-version
 karaf-version2.3.6/karaf-version
+karaf3-version3.0.1/karaf3-version
 kie-version6.0.0.Final/kie-version
 krati-version0.4.9/krati-version
 kxml2-bundle-version2.3.0_2/kxml2-bundle-version

http://git-wip-us.apache.org/repos/asf/camel/blob/2f8bc804/tests/camel-itest-karaf/pom.xml
--
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 219ac8c..9944170 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -66,6 +66,14 @@
 groupIdorg.eclipse/groupId
 artifactIdosgi/artifactId
 /exclusion
+exclusion
+groupIdorg.apache.karaf/groupId
+artifactIdorg.apache.karaf.client/artifactId
+/exclusion
+exclusion
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.framework/artifactId
+/exclusion
 /exclusions
 /dependency
 dependency
@@ -200,6 +208,12 @@
 /plugins
 /build
 /profile
+profile
+idkaraf3/id
+properties
+karaf-version${karaf3-version}/karaf-version
+/properties
+/profile
 /profiles
 
 /project

http://git-wip-us.apache.org/repos/asf/camel/blob/2f8bc804/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 c164b9a..736b465 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
@@ -176,14 +176,25 @@ public abstract class AbstractFeatureTest {
 }
 }
 
+private static String getKarafVersion() {
+String karafVersion = System.getProperty(karafVersion);
+if (karafVersion == null) {
+// setup the default version of it
+karafVersion = 2.3.6;
+}
+return karafVersion;
+}
+
 public static Option[] configure(String feature) {
 switchPlatformEncodingToUTF8();
+String karafVersion = getKarafVersion();
+LOG.info(*** The karaf version is  + karafVersion +  ***);
 
 Option[] options =
 new Option[]{
 
KarafDistributionOption.karafDistributionConfiguration()
 
.frameworkUrl(maven().groupId(org.apache.karaf).artifactId(apache-karaf).type(tar.gz).versionAsInProject())
-.karafVersion(2.3.6)
+.karafVersion(karafVersion)
 .name(Apache Karaf)
 .useDeployFolder(false).unpackDirectory(new 
File(target/paxexam/unpack/)),
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2f8bc804/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml

[CONF] Apache Camel Camel 2.14.0 Release

2014-08-26 Thread Claus Ibsen (Confluence)

Claus Ibsen edited the page:

Camel 2.14.0 Release

...

Timer consumer is now scheduled after CamelContext has started all routes, to ensure other routes is running when timer routes is triggered to run.
Netty HTTP now returns HTTP status 404 if resource not found instead of 503.
Fixed the MongoDBreadPreferenceoption which used to cause an IllegalArgumentExceptionto be thrown.
Fixed issue with Netty producer may leak HashWhealTimer instances when having many producers that are not reused.
Fixed issue with Netty consumer should wait for join to complete when joining a multicast group over UDP
Improved stability when testing withcamel-test-blueprint component.
Netty HTTPnow removes headerFilterStrategy option after resolvingit
Fixed POJO aggregating when the parameter type was referring to a type that was class annotated.
FixedMyBatisto keep the message body as-is when calling stored procedures, if the procedure returns data as OUT parameters.
Fixed Camel Karaf commands to work with multiple CamelContext from the same bundle.
Fixed Advice-With to work with transacted routes defined in XML DSL
Fixed Advice-With to work with Content Based Router when adding outputs to the when clauses.
Fixed Advice-With to honor autoStartup option.
FixedOnCompletion to route the completedExchangeeven if it was marked to stop / failed due exception / handled by error handler etc.
Fixed using@EndpointInject with ref in RouteBuilderclasses, to enlist the endpoints in JMX during starting CamelContext when using OSGi

New Enterprise Integration Patterns
...

View Online Like View Changes
Stop watching space Manage Notifications

This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software

40 matches

Mail list logo