svn commit: r943715 - in /websites/production/camel/content: cache/main.pageCache camel-2160-release.html
Author: buildbot Date: Fri Mar 13 18:18:53 2015 New Revision: 943715 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2160-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2160-release.html == --- websites/production/camel/content/camel-2160-release.html (original) +++ websites/production/camel/content/camel-2160-release.html Fri Mar 13 18:18:53 2015 @@ -84,7 +84,7 @@ -Camel 2.16.0 release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png";> New and NoteworthyWelcome to the x.y.z release which approx XXX issues resolved (new features, improvements and bug fixes such as...)The route models (definition classes) preserve property placeholders, which allows round trip editing, and also prevents showing potential sensitive informationAdded onPrepareFailure option to Dead Letter Channel to allow a custom proc essor to prepare the Exchange before sending to the dead letter queue.highlighted issue fixedNew Enterprise Integration PatternsNew ComponentsNew DSLNew AnnotationsNew Data Formatscamel-boom - For mapping POJO to/from jsonNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant changes to consider when upgradingThe dumpRoutesAsXml operation now preserve property placeholder used in the route models. Getting the DistributionsBinary DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip";>apache-camel-2.1 6.0.ziphttp://www.apache.org/dist/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip.asc";>apache-camel-2.16.0.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz";>apache-camel-2.16.0.tar.gzhttp://www.apache.org/dist/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc";>apache-camel-2.16.0.tar.gz.asc +Camel 2.16.0 release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png";> New and NoteworthyWelcome to the x.y.z release which approx XXX issues resolved (new features, improvements and bug fixes such as...)The route models (definition classes) preserve property placeholders, which allows round trip editing, and also prevents showing potential sensitive informationAdded onPrepareFailure option to Dead Letter Channel to allow a custom proc essor to prepare the Exchange before sending to the dead letter queue.highlighted issue fixedMongoDB tailable consumers now allow setting the readPreference option.New Enterprise Integration PatternsNew ComponentsNew DSLNew AnnotationsNew Data Formatscamel-boom - For mapping POJO to/from jsonNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesDependency upgradesMongoDB Java Driver from 2.12.4 to 2.13.0.Embed MongoDB test harness from 1.46.4 to 1.47.0.Important changes to consider when upgradingThe dumpRoutesAsXml operation now preserve property placeholder used in the route models. Getting the DistributionsBinary DistributionsDescriptionDownload LinkPGP Sig nature file of downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip";>apache-camel-2.16.0.ziphttp://www.apache.org/dist/camel/apache-camel/2.16.0/apache-camel-2.16.0.zip.asc";>apache-camel-2.16.0.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz";>apache-camel-2.16.0.tar.gzhttp://www.apac he.org/dist/camel/apache-camel/2.16.0/apache-camel-2.16.0.tar.gz.asc">apache-camel-2.16.0.tar.gz.asc The above URLs use redirection Icon
camel git commit: Upgrade MongoDB Java driver and Embed Mongo versions.
Repository: camel Updated Branches: refs/heads/master 14ad4785a -> 6a6e26217 Upgrade MongoDB Java driver and Embed Mongo versions. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a6e2621 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a6e2621 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a6e2621 Branch: refs/heads/master Commit: 6a6e262178f33f088cb31399588bf751b2365086 Parents: 14ad478 Author: Raul Kripalani Authored: Fri Mar 13 18:02:39 2015 + Committer: Raul Kripalani Committed: Fri Mar 13 18:02:39 2015 + -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6a6e2621/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 7f8e6a1..1790d87 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -143,7 +143,7 @@ 1.4.2_1 1.4.2 1.0.1 -1.46.4 +1.47.0 1.2.1 1.0.6_1 1.1.12 @@ -342,7 +342,7 @@ 0.9.1 1.9 1.9.5 -2.12.4 +2.13.0 1.10 2013.6.1 0.9.0
camel git commit: CAMEL-8483 Removed readPreference from the list of invalid options for camel-mongodb tailable consumer.
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x a4fcbb625 -> 82d7c3a7c
CAMEL-8483 Removed readPreference from the list of invalid options for
camel-mongodb tailable consumer.
Thanks to Jörg Peschke (GitHub: jpeschke2608). Added unit test to his
contribution.
This closes #434.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82d7c3a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82d7c3a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82d7c3a7
Branch: refs/heads/camel-2.14.x
Commit: 82d7c3a7c8cc86c53e1b225ce5e89a139b23e039
Parents: a4fcbb6
Author: Raul Kripalani
Authored: Fri Mar 13 17:32:26 2015 +
Committer: Raul Kripalani
Committed: Fri Mar 13 17:35:47 2015 +
--
.../component/mongodb/MongoDbEndpoint.java | 4 +-
.../MongoDbTailableCursorConsumerTest.java | 51
2 files changed, 34 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/82d7c3a7/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index 398a5d6..d015955 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -133,8 +133,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
} else if (role == 'C') {
if (!ObjectHelper.isEmpty(operation) ||
!ObjectHelper.isEmpty(writeConcern) || writeConcernRef != null
-|| readPreference != null || dynamicity ||
invokeGetLastError) {
-throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, readPreference, dynamicity, invokeGetLastError "
+ || dynamicity || invokeGetLastError) {
+throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, dynamicity, invokeGetLastError "
+ "options cannot appear on a consumer endpoint");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/82d7c3a7/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
--
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
index fb65f22..cbcf2f5 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
@@ -36,26 +36,13 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
private String cappedTestCollectionName;
@Test
-public void testThousandRecords() throws Exception {
-assertEquals(0, cappedTestCollection.count());
-MockEndpoint mock = getMockEndpoint("mock:test");
-mock.expectedMessageCount(1000);
-
-// create a capped collection with max = 1000
-cappedTestCollection = db.createCollection(cappedTestCollectionName,
-BasicDBObjectBuilder.start().add("capped", true).add("size",
10).add("max", 1000).get());
-
-for (int i = 0; i < 1000; i++) {
-
cappedTestCollection.insert(BasicDBObjectBuilder.start("increasing",
i).add("string", "value" + i).get(), WriteConcern.SAFE);
-}
-assertEquals(1000, cappedTestCollection.count());
-
-addTestRoutes();
-context.startRoute("tailableCursorConsumer1");
-Thread.sleep(1000);
-mock.assertIsSatisfied();
-context.stopRoute("tailableCursorConsumer1");
+public void testThousandRecordsWithoutReadPreference() throws Exception {
+testThousandRecordsWithRouteId("tailableCursorConsumer1");
+}
+@Test
+public void testThousandRecordsWithReadPreference() throws Exception {
+
testThousandRecordsWithRouteId("tailableCursorConsumer1.readPreference");
}
@Test
@@ -371,6 +358,27 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
mock.assertIsSatisfied();
mock.reset();
}
+
+private void testThousandRecordsWithRouteId(String routeId) throws
Exceptio
camel git commit: CAMEL-8483 Removed readPreference from the list of invalid options for camel-mongodb tailable consumer.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 4c34a21e0 -> 20ae65340
CAMEL-8483 Removed readPreference from the list of invalid options for
camel-mongodb tailable consumer.
Thanks to Jörg Peschke (GitHub: jpeschke2608). Added unit test to his
contribution.
This closes #434.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20ae6534
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20ae6534
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20ae6534
Branch: refs/heads/camel-2.15.x
Commit: 20ae65340fa2b55434939659e93b99efe703e206
Parents: 4c34a21
Author: Raul Kripalani
Authored: Fri Mar 13 17:32:26 2015 +
Committer: Raul Kripalani
Committed: Fri Mar 13 17:35:09 2015 +
--
.../component/mongodb/MongoDbEndpoint.java | 4 +-
.../MongoDbTailableCursorConsumerTest.java | 51
2 files changed, 34 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/20ae6534/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index e2eb6df..a9c4820 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -153,8 +153,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
} else if (role == 'C') {
if (!ObjectHelper.isEmpty(operation) ||
!ObjectHelper.isEmpty(writeConcern) || writeConcernRef != null
-|| readPreference != null || dynamicity ||
invokeGetLastError) {
-throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, readPreference, dynamicity, invokeGetLastError "
+ || dynamicity || invokeGetLastError) {
+throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, dynamicity, invokeGetLastError "
+ "options cannot appear on a consumer endpoint");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/20ae6534/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
--
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
index f7d2a58..9085ff7 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
@@ -36,26 +36,13 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
private String cappedTestCollectionName;
@Test
-public void testThousandRecords() throws Exception {
-assertEquals(0, cappedTestCollection.count());
-MockEndpoint mock = getMockEndpoint("mock:test");
-mock.expectedMessageCount(1000);
-
-// create a capped collection with max = 1000
-cappedTestCollection = db.createCollection(cappedTestCollectionName,
-BasicDBObjectBuilder.start().add("capped", true).add("size",
10).add("max", 1000).get());
-
-for (int i = 0; i < 1000; i++) {
-
cappedTestCollection.insert(BasicDBObjectBuilder.start("increasing",
i).add("string", "value" + i).get(), WriteConcern.SAFE);
-}
-assertEquals(1000, cappedTestCollection.count());
-
-addTestRoutes();
-context.startRoute("tailableCursorConsumer1");
-Thread.sleep(1000);
-mock.assertIsSatisfied();
-context.stopRoute("tailableCursorConsumer1");
+public void testThousandRecordsWithoutReadPreference() throws Exception {
+testThousandRecordsWithRouteId("tailableCursorConsumer1");
+}
+@Test
+public void testThousandRecordsWithReadPreference() throws Exception {
+
testThousandRecordsWithRouteId("tailableCursorConsumer1.readPreference");
}
@Test
@@ -371,6 +358,27 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
mock.assertIsSatisfied();
mock.reset();
}
+
+private void testThousandRecordsWithRouteId(String routeId) throws
Exceptio
camel git commit: CAMEL-8483 Removed readPreference from the list of invalid options for camel-mongodb tailable consumer.
Repository: camel
Updated Branches:
refs/heads/master 8d5570a30 -> 14ad4785a
CAMEL-8483 Removed readPreference from the list of invalid options for
camel-mongodb tailable consumer.
Thanks to Jörg Peschke (GitHub: jpeschke2608). Added unit test to his
contribution.
This closes #434.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14ad4785
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14ad4785
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14ad4785
Branch: refs/heads/master
Commit: 14ad4785a89fba6ef61483e24f628d26442b25a6
Parents: 8d5570a
Author: Raul Kripalani
Authored: Fri Mar 13 17:32:26 2015 +
Committer: Raul Kripalani
Committed: Fri Mar 13 17:32:26 2015 +
--
.../component/mongodb/MongoDbEndpoint.java | 4 +-
.../MongoDbTailableCursorConsumerTest.java | 51
2 files changed, 34 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/14ad4785/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
--
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index e2eb6df..a9c4820 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -153,8 +153,8 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
} else if (role == 'C') {
if (!ObjectHelper.isEmpty(operation) ||
!ObjectHelper.isEmpty(writeConcern) || writeConcernRef != null
-|| readPreference != null || dynamicity ||
invokeGetLastError) {
-throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, readPreference, dynamicity, invokeGetLastError "
+ || dynamicity || invokeGetLastError) {
+throw new IllegalArgumentException("operation, writeConcern,
writeConcernRef, dynamicity, invokeGetLastError "
+ "options cannot appear on a consumer endpoint");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/14ad4785/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
--
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
index f7d2a58..9085ff7 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
@@ -36,26 +36,13 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
private String cappedTestCollectionName;
@Test
-public void testThousandRecords() throws Exception {
-assertEquals(0, cappedTestCollection.count());
-MockEndpoint mock = getMockEndpoint("mock:test");
-mock.expectedMessageCount(1000);
-
-// create a capped collection with max = 1000
-cappedTestCollection = db.createCollection(cappedTestCollectionName,
-BasicDBObjectBuilder.start().add("capped", true).add("size",
10).add("max", 1000).get());
-
-for (int i = 0; i < 1000; i++) {
-
cappedTestCollection.insert(BasicDBObjectBuilder.start("increasing",
i).add("string", "value" + i).get(), WriteConcern.SAFE);
-}
-assertEquals(1000, cappedTestCollection.count());
-
-addTestRoutes();
-context.startRoute("tailableCursorConsumer1");
-Thread.sleep(1000);
-mock.assertIsSatisfied();
-context.stopRoute("tailableCursorConsumer1");
+public void testThousandRecordsWithoutReadPreference() throws Exception {
+testThousandRecordsWithRouteId("tailableCursorConsumer1");
+}
+@Test
+public void testThousandRecordsWithReadPreference() throws Exception {
+
testThousandRecordsWithRouteId("tailableCursorConsumer1.readPreference");
}
@Test
@@ -371,6 +358,27 @@ public class MongoDbTailableCursorConsumerTest extends
AbstractMongoDbTest {
mock.assertIsSatisfied();
mock.reset();
}
+
+private void testThousandRecordsWithRouteId(String routeId) throws
Exception {
+
camel git commit: Fix XstreamBlueprintRouteTest
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 0465e3578 -> 4c34a21e0
Fix XstreamBlueprintRouteTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c34a21e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c34a21e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c34a21e
Branch: refs/heads/camel-2.15.x
Commit: 4c34a21e0c570e1ff1e56315332c6af9524a4db9
Parents: 0465e35
Author: Grzegorz Grzybek
Authored: Fri Mar 13 17:17:53 2015 +0100
Committer: Grzegorz Grzybek
Committed: Fri Mar 13 17:17:53 2015 +0100
--
.../itest/osgi/xstream/XstreamBlueprintRouteTest.java| 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4c34a21e/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
index 99ede54..2e99137 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
@@ -27,6 +27,8 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.ProbeBuilder;
+import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
@@ -57,19 +59,24 @@ public class XstreamBlueprintRouteTest extends
OSGiBlueprintTestSupport {
assertEquals(new SampleObject("1"), result);
}
+@ProbeBuilder
+public TestProbeBuilder probeConfiguration(TestProbeBuilder builder) {
+builder.setHeader(Constants.EXPORT_PACKAGE,
SampleObject.class.getPackage().getName());
+return builder;
+}
+
@Configuration
public static Option[] configure() throws Exception {
Option[] options = combine(
getDefaultCamelKarafOptions(),
provision(TinyBundles.bundle()
-.add(SampleObject.class)
.add(XstreamRouteBuilder.class)
.add("OSGI-INF/blueprint/test.xml",
XstreamBlueprintRouteTest.class.getResource("blueprintCamelContext.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintXstreamTestBundle")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()),
-
+
// using the features to install the camel components
loadCamelFeatures("xml-specs-api", "camel-blueprint",
"camel-xstream"));
//vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
camel git commit: Fix XstreamBlueprintRouteTest
Repository: camel
Updated Branches:
refs/heads/master 9287abdfb -> 8d5570a30
Fix XstreamBlueprintRouteTest
(cherry picked from commit 4c34a21e0c570e1ff1e56315332c6af9524a4db9)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d5570a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d5570a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d5570a3
Branch: refs/heads/master
Commit: 8d5570a30afa4cf161316a06869716bb01bd9102
Parents: 9287abd
Author: Grzegorz Grzybek
Authored: Fri Mar 13 17:17:53 2015 +0100
Committer: Grzegorz Grzybek
Committed: Fri Mar 13 17:19:18 2015 +0100
--
.../itest/osgi/xstream/XstreamBlueprintRouteTest.java| 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5570a3/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
index 99ede54..2e99137 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
@@ -27,6 +27,8 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.ProbeBuilder;
+import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
@@ -57,19 +59,24 @@ public class XstreamBlueprintRouteTest extends
OSGiBlueprintTestSupport {
assertEquals(new SampleObject("1"), result);
}
+@ProbeBuilder
+public TestProbeBuilder probeConfiguration(TestProbeBuilder builder) {
+builder.setHeader(Constants.EXPORT_PACKAGE,
SampleObject.class.getPackage().getName());
+return builder;
+}
+
@Configuration
public static Option[] configure() throws Exception {
Option[] options = combine(
getDefaultCamelKarafOptions(),
provision(TinyBundles.bundle()
-.add(SampleObject.class)
.add(XstreamRouteBuilder.class)
.add("OSGI-INF/blueprint/test.xml",
XstreamBlueprintRouteTest.class.getResource("blueprintCamelContext.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintXstreamTestBundle")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()),
-
+
// using the features to install the camel components
loadCamelFeatures("xml-specs-api", "camel-blueprint",
"camel-xstream"));
//vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
camel git commit: Fix XstreamBlueprintRouteTest
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 3515a52da -> a4fcbb625
Fix XstreamBlueprintRouteTest
(cherry picked from commit 4c34a21e0c570e1ff1e56315332c6af9524a4db9)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a4fcbb62
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a4fcbb62
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a4fcbb62
Branch: refs/heads/camel-2.14.x
Commit: a4fcbb6250e63d7e77f5ca1656cc110b62a4d97a
Parents: 3515a52
Author: Grzegorz Grzybek
Authored: Fri Mar 13 17:17:53 2015 +0100
Committer: Grzegorz Grzybek
Committed: Fri Mar 13 17:18:49 2015 +0100
--
.../itest/osgi/xstream/XstreamBlueprintRouteTest.java| 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a4fcbb62/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
index 99ede54..2e99137 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
@@ -27,6 +27,8 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.ProbeBuilder;
+import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
@@ -57,19 +59,24 @@ public class XstreamBlueprintRouteTest extends
OSGiBlueprintTestSupport {
assertEquals(new SampleObject("1"), result);
}
+@ProbeBuilder
+public TestProbeBuilder probeConfiguration(TestProbeBuilder builder) {
+builder.setHeader(Constants.EXPORT_PACKAGE,
SampleObject.class.getPackage().getName());
+return builder;
+}
+
@Configuration
public static Option[] configure() throws Exception {
Option[] options = combine(
getDefaultCamelKarafOptions(),
provision(TinyBundles.bundle()
-.add(SampleObject.class)
.add(XstreamRouteBuilder.class)
.add("OSGI-INF/blueprint/test.xml",
XstreamBlueprintRouteTest.class.getResource("blueprintCamelContext.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME,
"CamelBlueprintXstreamTestBundle")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()),
-
+
// using the features to install the camel components
loadCamelFeatures("xml-specs-api", "camel-blueprint",
"camel-xstream"));
//vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master 3619503bd -> 9287abdfb
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9287abdf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9287abdf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9287abdf
Branch: refs/heads/master
Commit: 9287abdfbb48b9682b16bf56a05eb554c5b25591
Parents: 3619503
Author: Claus Ibsen
Authored: Fri Mar 13 13:51:32 2015 +0100
Committer: Claus Ibsen
Committed: Fri Mar 13 13:51:44 2015 +0100
--
.../camel/component/file/remote/RemoteFileConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9287abdf/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index 502bd92..bc8f89b 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -307,8 +307,8 @@ public abstract class RemoteFileConfiguration extends
GenericFileConfiguration {
/**
* Sets the path separator to be used.
*
- * UNIX = Path separator / is used
- * Windows = Path separator \ is used
+ * UNIX = Uses unix style path separator
+ * Windows = Uses windows style path separator
* Auto = (is default) Use existing path separator in file name
*/
public void setSeparator(PathSeparator separator) {
camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 8d47c7906 -> 0465e3578
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0465e357
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0465e357
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0465e357
Branch: refs/heads/camel-2.15.x
Commit: 0465e3578ff9f611aaa6fdbdf7ede8a179691e8e
Parents: 8d47c79
Author: Claus Ibsen
Authored: Fri Mar 13 13:51:32 2015 +0100
Committer: Claus Ibsen
Committed: Fri Mar 13 13:52:13 2015 +0100
--
.../camel/component/file/remote/RemoteFileConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0465e357/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index 502bd92..bc8f89b 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -307,8 +307,8 @@ public abstract class RemoteFileConfiguration extends
GenericFileConfiguration {
/**
* Sets the path separator to be used.
*
- * UNIX = Path separator / is used
- * Windows = Path separator \ is used
+ * UNIX = Uses unix style path separator
+ * Windows = Uses windows style path separator
* Auto = (is default) Use existing path separator in file name
*/
public void setSeparator(PathSeparator separator) {
camel git commit: CAMEL-8480 fixed the camel-catalog package exporting issue
Repository: camel Updated Branches: refs/heads/camel-2.15.x d8353cbd7 -> 8d47c7906 CAMEL-8480 fixed the camel-catalog package exporting issue Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d47c790 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d47c790 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d47c790 Branch: refs/heads/camel-2.15.x Commit: 8d47c7906d22dabefceb8b1f83463a192c01a1e6 Parents: d8353cb Author: Willem Jiang Authored: Fri Mar 13 17:48:50 2015 +0800 Committer: Willem Jiang Committed: Fri Mar 13 17:49:59 2015 +0800 -- platforms/catalog/pom.xml | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8d47c790/platforms/catalog/pom.xml -- diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml index 69606d4..3b5614d 100644 --- a/platforms/catalog/pom.xml +++ b/platforms/catalog/pom.xml @@ -31,13 +31,7 @@ - org.apache.camel.catalog, - org.apache.camel.catalog.archetypes, - org.apache.camel.catalog.components, - org.apache.camel.catalog.dataformats, - org.apache.camel.catalog.languages, - org.apache.camel.catalog.models, - org.apache.camel.catalog.schemas + org.apache.camel.catalog*
camel git commit: CAMEL-8480 fixed the camel-catalog package exporting issue
Repository: camel Updated Branches: refs/heads/master b0d5b435a -> 3619503bd CAMEL-8480 fixed the camel-catalog package exporting issue Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3619503b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3619503b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3619503b Branch: refs/heads/master Commit: 3619503bdc8864eb320c2c2244dad20182c2856d Parents: b0d5b43 Author: Willem Jiang Authored: Fri Mar 13 17:48:50 2015 +0800 Committer: Willem Jiang Committed: Fri Mar 13 17:48:50 2015 +0800 -- platforms/catalog/pom.xml | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3619503b/platforms/catalog/pom.xml -- diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml index 15b5d30..8f03495 100644 --- a/platforms/catalog/pom.xml +++ b/platforms/catalog/pom.xml @@ -31,13 +31,7 @@ - org.apache.camel.catalog, - org.apache.camel.catalog.archetypes, - org.apache.camel.catalog.components, - org.apache.camel.catalog.dataformats, - org.apache.camel.catalog.languages, - org.apache.camel.catalog.models, - org.apache.camel.catalog.schemas + org.apache.camel.catalog*
svn commit: r943641 - in /websites/production/camel/content: ./ 2007/08/17/ 2007/08/20/ 2007/10/01/ 2007/10/28/ 2008/04/08/ 2008/04/22/ 2008/04/28/ 2008/07/22/ 2008/10/31/ 2009/01/19/ 2009/02/03/ 2009
Author: buildbot Date: Fri Mar 13 08:22:59 2015 New Revision: 943641 Log: Production update by buildbot for camel [This commit notification would consist of 103 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r943638 - /websites/production/camel/content/cache/main.pageCache
Author: ningjiang Date: Fri Mar 13 08:06:44 2015 New Revision: 943638 Log: regenerate the site Removed: websites/production/camel/content/cache/main.pageCache
camel git commit: CAMEL-8479 Fixed the TrapReceiveTest failure
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x f75a68706 -> d8353cbd7
CAMEL-8479 Fixed the TrapReceiveTest failure
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8353cbd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8353cbd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8353cbd
Branch: refs/heads/camel-2.15.x
Commit: d8353cbd7a170d4b022f0bc25194e97787e7d899
Parents: f75a687
Author: Willem Jiang
Authored: Fri Mar 13 13:22:31 2015 +0800
Committer: Willem Jiang
Committed: Fri Mar 13 15:50:36 2015 +0800
--
.../java/org/apache/camel/component/snmp/SnmpEndpoint.java| 2 +-
.../java/org/apache/camel/component/snmp/PollOIDTest.java | 5 +
.../java/org/apache/camel/component/snmp/TrapReceiveTest.java | 7 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d8353cbd/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
--
diff --git
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
index 39c253e..fb2fbf4 100644
---
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
+++
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
@@ -97,7 +97,7 @@ public class SnmpEndpoint extends DefaultPollingEndpoint {
public Consumer createConsumer(Processor processor) throws Exception {
if (this.type == SnmpActionType.TRAP) {
SnmpTrapConsumer answer = new SnmpTrapConsumer(this, processor);
-configureConsumer(answer);
+// As the SnmpTrapConsumer is not a polling consumer we don't need
to call the configureConsumer here.
return answer;
} else if (this.type == SnmpActionType.POLL) {
SnmpOIDPoller answer = new SnmpOIDPoller(this, processor);
http://git-wip-us.apache.org/repos/asf/camel/blob/d8353cbd/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
--
diff --git
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
index 0774907..9d84302 100644
---
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
+++
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
@@ -45,6 +45,11 @@ public class PollOIDTest extends CamelTestSupport {
}
}
}
+
+@Test
+public void testStartRoute() throws Exception {
+// do nothing here , just make sure the camel route can started.
+}
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
http://git-wip-us.apache.org/repos/asf/camel/blob/d8353cbd/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
--
diff --git
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
index 72dfb08..e5c4862 100644
---
a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
+++
b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapReceiveTest.java
@@ -45,12 +45,17 @@ public class TrapReceiveTest extends CamelTestSupport {
}
}
}
+
+@Test
+public void testStartRoute() throws Exception {
+// do nothing here , just make sure the camel route can started.
+}
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
// START SNIPPET: e1
-
from("snmp:0.0.0.0:1662?protocol=udp&type=TRAP").transform(body().convertToString()).to("mock:result");
+
from("snmp:0.0.0.0:1662?protocol=udp&type=TRAP").id("route1").transform(body().convertToString()).to("mock:result");
// END SNIPPET: e1
}
};
