git commit: Updated API component framework to generate test classes in the component's package, added abstract base class for tests to create component, added assertNotNull for results

[dhirajsb]

Repository: camel
Updated Branches:
  refs/heads/master 73f067e61 -> 18573971a


Updated API component framework to generate test classes in the component's 
package, added abstract base class for tests to create component, added 
assertNotNull for results


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

Branch: refs/heads/master
Commit: 18573971a767350d86696367cbf48183de3ff221
Parents: 73f067e
Author: Dhiraj Bokde 
Authored: Thu Jun 26 16:36:14 2014 -0700
Committer: Dhiraj Bokde 
Committed: Thu Jun 26 16:36:52 2014 -0700

--
 .../META-INF/maven/archetype-metadata.xml   |  6 ++
 .../test/java/Abstract__name__TestSupport.java  | 71 
 .../src/test/resources/test-options.properties  |  1 +
 .../src/it/all-it/pom.xml   |  3 +-
 .../maven/AbstractApiMethodGeneratorMojo.java   |  3 +-
 .../src/main/resources/api-route-test.vm| 19 +++---
 .../component/test/AbstractTestTestSupport.java | 31 +
 7 files changed, 121 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/18573971/tooling/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 935370b..134af47 100644
--- 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -81,6 +81,12 @@
 **/*
   
 
+
+  __artifactId__-component/src/test/java
+  
+**/*.java
+  
+
 
   __artifactId__-component/src/test/resources
   

http://git-wip-us.apache.org/repos/asf/camel/blob/18573971/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
--
diff --git 
a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
new file mode 100644
index 000..0ad30f9
--- /dev/null
+++ 
b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/java/Abstract__name__TestSupport.java
@@ -0,0 +1,71 @@
+## 
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## 
+package ${package};
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IntrospectionSupport;
+
+/**
+ * Abstract base class for ${name} Integration tests generated by Camel API 
component maven plugin.
+ */
+public class Abstract${name}TestSupport extends CamelTestSupport {
+
+private static final String TEST_OPTIONS_PROPERTIES = 
"/test-options.properties";
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+
+final CamelContext context = super.createCamelContext();
+
+// read ${name} component configuration from TEST_OPTIONS_PROPERTIES
+final Pro

git commit: Typo

[bibryam]

Repository: camel
Updated Branches:
  refs/heads/master d4a605036 -> 73f067e61


Typo


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

Branch: refs/heads/master
Commit: 73f067e61ceb066e2acd628d55c6e70f2231b398
Parents: d4a6050
Author: Bilgin Ibryam 
Authored: Thu Jun 26 23:15:40 2014 +0100
Committer: Bilgin Ibryam 
Committed: Thu Jun 26 23:15:40 2014 +0100

--
 camel-core/src/main/java/org/apache/camel/spi/Policy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/73f067e6/camel-core/src/main/java/org/apache/camel/spi/Policy.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/spi/Policy.java 
b/camel-core/src/main/java/org/apache/camel/spi/Policy.java
index 3362c9b..1dddcaf 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/Policy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/Policy.java
@@ -22,7 +22,7 @@ import org.apache.camel.model.ProcessorDefinition;
 /**
  * A strategy capable of applying interceptors to a processor
  * 
- * Its strongly adviced to use an {@link 
org.apache.camel.AsyncProcessor} as the returned wrapped
+ * Its strongly advised to use an {@link 
org.apache.camel.AsyncProcessor} as the returned wrapped
  * {@link Processor} which ensures the policy works well with the asynchronous 
routing engine.
  * You can use the {@link org.apache.camel.processor.DelegateAsyncProcessor} 
to easily return an
  * {@link org.apache.camel.AsyncProcessor} and override the

svn commit: r914021 - in /websites/production/camel/content: cache/main.pageCache hbase.html

[buildbot]

Author: buildbot
Date: Thu Jun 26 22:18:00 2014
New Revision: 914021

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/hbase.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/hbase.html
==
--- websites/production/camel/content/hbase.html (original)
+++ websites/production/camel/content/hbase.html Thu Jun 26 22:18:00 2014
@@ -117,7 +117,7 @@
 
 ${in.body.value}
 
-
+
 
 ]]>
 The route above assumes that the message body contains an 
object that has an id and value property and will store the content of value in 
the HBase column myfamily:myqualifier in the row specified by id. If we needed 
to specify more than one column/value pairs we could just specify additional 
column mappings. Notice that you must use numbers from the 2nd header onwards, 
eg RowId2, RowId3, RowId4, etc. Only the 1st header does not have the number 
1.
@@ -139,7 +139,7 @@
 
 ${in.body.othervalue}
 
-
+
 
 ]]>
 It is important to remember that you can use uri options, 
message headers or a combination of both. It is recommended to specify 
constants as part of the uri and dynamic values as headers. If something is 
defined both as header and as part of the uri, the header will be used.Get Operations.A Get Operation is an 
operation that is used to retrieve one or more values from a specified HBase 
row. To specify what are the values that you want to retrieve you can just 
specify them as part of the uri or as message headers.
@@ -149,7 +149,7 @@
 
 ${in.body.id}
 
-
+
 
 
 ]]>
@@ -160,13 +160,13 @@
 
 ${in.body.id}
 
-
+
 
 ]]>
 Scan Operations.A scan 
operation is the equivalent of a query in HBase. You can use the scan operation 
to retrieve multiple rows. To specify what columns should be part of the result 
and also specify how the values will be converted to objects you can use either 
uri options or headers.
 
@@ -199,7 +199,7 @@
 
 country
 
-
+
 
 
 

[CONF] Apache Camel > hbase

[Christian Mueller (Confluence)]

  


Christian Mueller edited the page:
 


hbase   






...



 Code Block









xml


 




 



${in.body.id}



${in.body.value}

opertaionoperation=CamelHBasePut&family=myfamily&qualifier=myqualifier"/>

 



...



 Code Block









xml


 




 



${in.body.id}



${in.body.id}



${in.body.value}



${in.body.othervalue}

opertaionoperation=CamelHBasePut&family=myfamily&qualifier=myqualifier&family2=myfamily&qualifier2=myqualifier2"/>

 
  

svn commit: r914011 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html

[buildbot]

Author: buildbot
Date: Thu Jun 26 21:18:48 2014
New Revision: 914011

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2140-release.html
==
--- websites/production/camel/content/camel-2140-release.html (original)
+++ websites/production/camel/content/camel-2140-release.html Thu Jun 26 
21:18:48 2014
@@ -87,7 +87,7 @@
 
 
 Camel 2.14.0 
release (currently in progress)
-http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; 
style="border: 0px solid black">New 
and NoteworthyWelcome to the 2.14.0 release which approx XXX issues 
resolved (new features, improvements and bug fixes such 
as...)Support for running on Java 1.8 JVMsSpring 4.x 
supported.Simple language defined in routes using resultType as 
boolean is now evaluated as predicate instead of as 
expression.Introduced RuntimeEndpointRegistry to capture runtime usage 
of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.Added event notification for 
routes added and removed.Allow to configure cache size in Recipient 
List, Routing Slip and Dynamic Router EIPs; and as well turn caching 
off.Netty HTTP producer now supports the CamelHttpPath 
header to define a dynamic context-path and query parameters to call the remote 
http server.Polling Consumer allows to configure 
initial queue size and whether to block when full when using the 
default EventDrivenPollingConsumer which most components 
does. We now block by default, as otherwise the message may be lost if the 
queue was full, and a new message was offered.https://issues.apache.org/jira/browse/CAMEL-7435";>Added a generic 
callback to configure the APNS service 
builder.Added StreamList option to 
the JDBC 
componentAllow to define Simple expressions for sql parameters 
of the SQL component.Fixed IssuesTimer 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 https://camel.apache.org/mongodb.html";>MongoDB readPreference option
 which used to cause an IllegalArgumentException to 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 
with camel-test-blueprint component.Netty HTTP now https://issues.apache.org/jira/browse/CAMEL-7506";>removes 
headerFilterStrategy option after resolving itFixed POJO aggregating when the parameter type was 
referring to a type that was class annotated.Fixed MyBatis to 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.New 
Enterprise 
Integration PatternsCircuit Breaker pattern implemented as a Load 
Balancer policyNew href="components.html">Componentscamel-ahc-wscamel-atmosphere-websocket shape="rect" href="openshift.html">camel-openshiftshape="rect" href="gora.html">camel-goraid="Camel2.14.0Release-New.2">New href="camel-maven-archetypes.html">Camel Maven Archetypesid="Camel2.14.0Release-NewDSL">New DSLid="Camel2.14.0Release-NewAnnotations">New Annotationsid="Camel2.14.0Release-NewDataFormats">New href="data-format.html">Data Formatshref="gora.html">camel-href="barcode-data-format.html">barcodeid="Camel2.14.0Release-New.3">New href="languages.html">LanguagesNew 
 >Examplesid="Camel2.14.0Release-New.5">New TutorialsNew 
ToolingAPI 
changesChanged ...Known IssuesDependency UpgradesYou can 
see any dependency changes using http://vdiff.notsoclever.cc/"; rel="nofollow">Camel Dependencies Version 
Differences web tool created by Tracy Snell from the Camel Team.The below list is a best effort, and we may 
miss some updates, its better to use the http://vdiff.notsoclever.cc/"; rel="nofollow">Camel Dependencies Version 
Differences web tool which uses the released projects for 
comparison.Atomikos 3.9.2 to 3.9.3Commons-codec 1.8 to 
1.9CXF 2.7.11 to 3.0.0Dozer 5.4.0 to 5.5.1EhCache 
2.8.1 to 2.8
 .3Groovy 2.2.2 to 2.3.3Guava 16.0.1 to 17.0JRuby 
1.7.10 to 1.7.12MongoDB-Java-Driver 2.11.4 to 2.12.0RabbitMQ 
AMQ Client 3.2.2 to 3.3.0RxJava 0.17.5 to 0.19.1Scala 2.10.3 
to 2.10.4Snmp4j 2.2.5 to 2.3.0SSHD 0.10.1 to 
0.11.0spring-redis 1.1.0 to 1.3.0Internal changesChanged 
...Changes 
that may affect end usersPolling Consumer allows to configure 
initial queue size and whether 

[CONF] Apache Camel > Camel 2.14.0 Release

[Claus Ibsen (Confluence)]

  


Claus Ibsen edited the page:
 


Camel 2.14.0 Release   






...

Atomikos 3.9.2 to 3.9.3
Commons-codec 1.8 to 1.9
CXF 2.7.11 to 3.0.0
 Deltaspike 0.7 to 1.0.0 
Dozer 5.4.0 to 5.5.1
EhCache 2.8.1 to 2.8.3
Groovy 2.2.2 to 2.3.3
Guava 16.0.1 to 17.0
JRuby 1.7.10 to 1.7.12
MongoDB-Java-Driver 2.11.4 to 2.12.0
RabbitMQ AMQ Client 3.2.2 to 3.3.0
RxJava 0.17.5 to 0.19.1
Scala 2.10.3 to 2.10.4
Snmp4j 2.2.5 to 2.3.0
SSHD 0.10.1 to 0.11.0
spring-redis 1.1.0 to 1.3.0

...






 View Online  · Like  · View Changes  
 Stop watching space  · Manage Notifications  


 


 


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

git commit: Upgraded to deltaspike 1.0

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 53e95788f -> d4a605036


Upgraded to deltaspike 1.0


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

Branch: refs/heads/master
Commit: d4a605036714c9303b8b66a9c889ecf4e8cd0f20
Parents: 53e9578
Author: Claus Ibsen 
Authored: Thu Jun 26 22:20:17 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 22:20:17 2014 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d4a60503/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fa56668..d3330d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,14 +111,14 @@
 3.0.0
 [2.7,4.0)
 2.7.0
-0.7
+1.0.0
 10.10.2.0
 3.2.1
 2.1.1
 2.1.1_1
 1.6.1_5
 5.5.1
-6.0.0.Final
+6.0.1.Final
 1.7.6
 3.2
 4.2.2

svn commit: r913999 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html

[buildbot]

Author: buildbot
Date: Thu Jun 26 20:17:49 2014
New Revision: 913999

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2140-release.html
==
--- websites/production/camel/content/camel-2140-release.html (original)
+++ websites/production/camel/content/camel-2140-release.html Thu Jun 26 
20:17:49 2014
@@ -87,7 +87,7 @@
 
 
 Camel 2.14.0 
release (currently in progress)
-http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; 
style="border: 0px solid black">New 
and NoteworthyWelcome to the 2.14.0 release which approx XXX issues 
resolved (new features, improvements and bug fixes such 
as...)Support for running on Java 1.8 JVMsSpring 4.x 
supported.Simple language defined in routes using resultType as 
boolean is now evaluated as predicate instead of as 
expression.Introduced RuntimeEndpointRegistry to capture runtime usage 
of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.Added event notification for 
routes added and removed.Allow to configure cache size in Recipient 
List, Routing Slip and Dynamic Router EIPs; and as well turn caching 
off.Netty HTTP producer now supports the CamelHttpPath 
header to define a dynamic context-path and query parameters to call the remote 
http server.Polling Consumer allows to configure 
initial queue size and whether to block when full when using the 
default EventDrivenPollingConsumer which most components 
does. We now block by default, as otherwise the message may be lost if the 
queue was full, and a new message was offered.https://issues.apache.org/jira/browse/CAMEL-7435";>Added a generic 
callback to configure the APNS service 
builder.Added StreamList option to 
the JDBC 
componentAllow to define Simple expressions for sql parameters 
of the SQL component.Fixed IssuesTimer 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 https://camel.apache.org/mongodb.html";>MongoDB readPreference option
 which used to cause an IllegalArgumentException to 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 
with camel-test-blueprint component.Netty HTTP now https://issues.apache.org/jira/browse/CAMEL-7506";>removes 
headerFilterStrategy option after resolving itFixed POJO aggregating when the parameter type was 
referring to a type that was class annotated.New Enterprise Integration 
PatternsCircuit 
Breaker pattern implemented as a Load Balancer policyNew Componentscamel-ahc-wscamel-atmosphere-websocketcamel-openshiftcamel-gora<
 /a>New Camel Maven ArchetypesNew DSLNew AnnotationsNew Data Formatscamel-barcodeNew LanguagesNew 
ExamplesNew TutorialsNew ToolingAPI changesChanged 
...Known IssuesDep
 endency UpgradesYou can see any dependency changes using http://vdiff.notsoclever.cc/"; 
rel="nofollow">Camel Dependencies Version Differences web tool created by 
Tracy Snell from the Camel Team.The 
below list is a best effort, and we may miss some updates, its better to use 
the http://vdiff.notsoclever.cc/"; 
rel="nofollow">Camel Dependencies Version Differences web tool which uses 
the released projects for comparison.Atomikos 3.9.2 to 
3.9.3Commons-codec 1.8 to 1.9CXF 2.7.11 to 
3.0.0Dozer 5.4.0 to 5.5.1EhCache 2.8.1 to 
2.8.3Groovy 2.2.2 to 2.3.3Guava 16.0.1 to 17.0JRuby 
1.7.10 to 1.7.12MongoDB-Java-Driver 2.11.4 to 2.12.0RabbitMQ 
AMQ Client 3.2.2 to 3.3.0RxJava 0.17.5 to 0.19.1Scala 2.10.3 
to 2.10.4Snmp4j 2.2.5 to 2.3.0SSHD 0.10.1 to 0.11.0spring-redis 1.1.0 to 1.3.0Internal changesChanged 
...Changes 
that may affect end usersPolling Consumer allows to configure 
initial queue size and whether to block when full when using the 
default EventDrivenPollingConsumer which most components 
does. We now block by default, as otherwise the message may be lost if the 
queue was full, and a new message was offered.Important 
changes to consider when upgradingJava 1.6 no longer supported.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of 
downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip";>apache-camel-2.14.0.ziphttp://www.apache.org/dist/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip.asc";>apache-camel-2.14.0.

[5/6] git commit: CAMEL-7407: file/ftp consumer should eager remove in progress files in case pollDirectory throw exception.

[davsclaus]

CAMEL-7407: file/ftp consumer should eager remove in progress files in case 
pollDirectory throw exception.


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

Branch: refs/heads/camel-2.12.x
Commit: 1f861c6678e4aac8d1f2b07cc6f2ddefa08ebb0b
Parents: 741b0ca
Author: Claus Ibsen 
Authored: Thu Jun 26 21:35:24 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 22:12:43 2014 +0200

--
 .../component/file/GenericFileConsumer.java | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f861c66/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 2b86c7f..8a39211 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -114,7 +114,17 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 
 // time how long time it takes to poll
 StopWatch stop = new StopWatch();
-boolean limitHit = !pollDirectory(name, files, 0);
+boolean limitHit;
+try {
+limitHit = !pollDirectory(name, files, 0);
+} catch (Exception e) {
+// during poll directory we add files to the in progress 
repository, in case of any exception thrown after this work
+// we must then drain the in progress files before rethrowing the 
exception
+log.debug("Error occurred during poll directory: " + name + " due 
" + e.getMessage() + ". Removing " + files.size() + " files marked as 
in-progress.");
+removeExcessiveInProgressFiles(files);
+throw e;
+}
+
 long delta = stop.stop();
 if (log.isDebugEnabled()) {
 log.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), 
name);
@@ -231,6 +241,18 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 }
 
 /**
+ * Drain any in progress files as we are done with the files
+ *
+ * @param files  the files
+ */
+protected void removeExcessiveInProgressFiles(List> files) {
+for (GenericFile file : files) {
+String key = file.getAbsoluteFilePath();
+endpoint.getInProgressRepository().remove(key);
+}
+}
+
+/**
  * Whether or not we can continue polling for more files
  *
  * @param fileList  the current list of gathered files

[6/6] git commit: CAMEL-7432: camel-mybatis should keep message body as-is if calling stored procedure and it did not return data, but are using OUT parameters etc.

[davsclaus]

CAMEL-7432: camel-mybatis should keep message body as-is if calling stored 
procedure and it did not return data, but are using OUT parameters etc.


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

Branch: refs/heads/camel-2.12.x
Commit: 53c75549f55d515133b697fa33980b6228fd44bb
Parents: 1f861c6
Author: Claus Ibsen 
Authored: Thu Jun 26 21:56:40 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 22:12:48 2014 +0200

--
 .../component/mybatis/MyBatisProducer.java  | 50 +---
 1 file changed, 33 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/53c75549/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 03367e3..6465636 100644
--- 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++ 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.slf4j.Logger;
@@ -105,7 +106,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectOne(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doSelectList(Exchange exchange, SqlSession session) throws 
Exception {
@@ -119,7 +120,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectList(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doInsert(Exchange exchange, SqlSession session) throws 
Exception {
@@ -132,12 +133,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Inserting: {} using statement: {}", value, 
statement);
 result = session.insert(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -148,11 +149,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Inserting: {} using statement: {}", in, statement);
 result = session.insert(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -166,12 +167,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Updating: {} using statement: {}", value, 
statement);
 result = session.update(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Updating using statement: {}", statement);
 result = session.update(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -182,11 +183,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Updating: {} using statement: {}", in, statement);
 result = session.update(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, s

[2/6] git commit: CAMEL-7432: camel-mybatis should keep message body as-is if calling stored procedure and it did not return data, but are using OUT parameters etc.

[davsclaus]

CAMEL-7432: camel-mybatis should keep message body as-is if calling stored 
procedure and it did not return data, but are using OUT parameters etc.


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

Branch: refs/heads/master
Commit: 53e95788f7ebcd8efbffc633e177105fa0cfdadc
Parents: 1796abc
Author: Claus Ibsen 
Authored: Thu Jun 26 21:56:40 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 21:56:40 2014 +0200

--
 .../component/mybatis/MyBatisProducer.java  | 50 +---
 1 file changed, 33 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/53e95788/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 03367e3..6465636 100644
--- 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++ 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.slf4j.Logger;
@@ -105,7 +106,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectOne(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doSelectList(Exchange exchange, SqlSession session) throws 
Exception {
@@ -119,7 +120,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectList(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doInsert(Exchange exchange, SqlSession session) throws 
Exception {
@@ -132,12 +133,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Inserting: {} using statement: {}", value, 
statement);
 result = session.insert(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -148,11 +149,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Inserting: {} using statement: {}", in, statement);
 result = session.insert(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -166,12 +167,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Updating: {} using statement: {}", value, 
statement);
 result = session.update(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Updating using statement: {}", statement);
 result = session.update(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -182,11 +183,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Updating: {} using statement: {}", in, statement);
 result = session.update(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session

[1/6] git commit: CAMEL-7407: file/ftp consumer should eager remove in progress files in case pollDirectory throw exception.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 741b0cab2 -> 53c75549f
  refs/heads/camel-2.13.x c88d8eb85 -> 2bf29e331
  refs/heads/master cd3515ab5 -> 53e95788f


CAMEL-7407: file/ftp consumer should eager remove in progress files in case 
pollDirectory throw exception.


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

Branch: refs/heads/master
Commit: 1796abcb47fd346a06695d57ff1e2eb4015152cc
Parents: cd3515a
Author: Claus Ibsen 
Authored: Thu Jun 26 21:35:24 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 21:35:24 2014 +0200

--
 .../component/file/GenericFileConsumer.java | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1796abcb/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 2b86c7f..8a39211 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -114,7 +114,17 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 
 // time how long time it takes to poll
 StopWatch stop = new StopWatch();
-boolean limitHit = !pollDirectory(name, files, 0);
+boolean limitHit;
+try {
+limitHit = !pollDirectory(name, files, 0);
+} catch (Exception e) {
+// during poll directory we add files to the in progress 
repository, in case of any exception thrown after this work
+// we must then drain the in progress files before rethrowing the 
exception
+log.debug("Error occurred during poll directory: " + name + " due 
" + e.getMessage() + ". Removing " + files.size() + " files marked as 
in-progress.");
+removeExcessiveInProgressFiles(files);
+throw e;
+}
+
 long delta = stop.stop();
 if (log.isDebugEnabled()) {
 log.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), 
name);
@@ -231,6 +241,18 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 }
 
 /**
+ * Drain any in progress files as we are done with the files
+ *
+ * @param files  the files
+ */
+protected void removeExcessiveInProgressFiles(List> files) {
+for (GenericFile file : files) {
+String key = file.getAbsoluteFilePath();
+endpoint.getInProgressRepository().remove(key);
+}
+}
+
+/**
  * Whether or not we can continue polling for more files
  *
  * @param fileList  the current list of gathered files

[3/6] git commit: CAMEL-7407: file/ftp consumer should eager remove in progress files in case pollDirectory throw exception.

[davsclaus]

CAMEL-7407: file/ftp consumer should eager remove in progress files in case 
pollDirectory throw exception.


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

Branch: refs/heads/camel-2.13.x
Commit: ea9ac3c0bb86e9f0f973222672c340673822ff07
Parents: c88d8eb
Author: Claus Ibsen 
Authored: Thu Jun 26 21:35:24 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 22:12:26 2014 +0200

--
 .../component/file/GenericFileConsumer.java | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ea9ac3c0/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 2b86c7f..8a39211 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -114,7 +114,17 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 
 // time how long time it takes to poll
 StopWatch stop = new StopWatch();
-boolean limitHit = !pollDirectory(name, files, 0);
+boolean limitHit;
+try {
+limitHit = !pollDirectory(name, files, 0);
+} catch (Exception e) {
+// during poll directory we add files to the in progress 
repository, in case of any exception thrown after this work
+// we must then drain the in progress files before rethrowing the 
exception
+log.debug("Error occurred during poll directory: " + name + " due 
" + e.getMessage() + ". Removing " + files.size() + " files marked as 
in-progress.");
+removeExcessiveInProgressFiles(files);
+throw e;
+}
+
 long delta = stop.stop();
 if (log.isDebugEnabled()) {
 log.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), 
name);
@@ -231,6 +241,18 @@ public abstract class GenericFileConsumer extends 
ScheduledBatchPollingConsum
 }
 
 /**
+ * Drain any in progress files as we are done with the files
+ *
+ * @param files  the files
+ */
+protected void removeExcessiveInProgressFiles(List> files) {
+for (GenericFile file : files) {
+String key = file.getAbsoluteFilePath();
+endpoint.getInProgressRepository().remove(key);
+}
+}
+
+/**
  * Whether or not we can continue polling for more files
  *
  * @param fileList  the current list of gathered files

[4/6] git commit: CAMEL-7432: camel-mybatis should keep message body as-is if calling stored procedure and it did not return data, but are using OUT parameters etc.

[davsclaus]

CAMEL-7432: camel-mybatis should keep message body as-is if calling stored 
procedure and it did not return data, but are using OUT parameters etc.


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

Branch: refs/heads/camel-2.13.x
Commit: 2bf29e331c752a6bec2df3da484e8fc4241b0c4e
Parents: ea9ac3c
Author: Claus Ibsen 
Authored: Thu Jun 26 21:56:40 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 22:12:33 2014 +0200

--
 .../component/mybatis/MyBatisProducer.java  | 50 +---
 1 file changed, 33 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2bf29e33/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 03367e3..6465636 100644
--- 
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++ 
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.slf4j.Logger;
@@ -105,7 +106,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectOne(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doSelectList(Exchange exchange, SqlSession session) throws 
Exception {
@@ -119,7 +120,7 @@ public class MyBatisProducer extends DefaultProducer {
 result = session.selectList(statement);
 }
 
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 
 private void doInsert(Exchange exchange, SqlSession session) throws 
Exception {
@@ -132,12 +133,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Inserting: {} using statement: {}", value, 
statement);
 result = session.insert(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -148,11 +149,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Inserting: {} using statement: {}", in, statement);
 result = session.insert(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 } else {
 LOG.trace("Inserting using statement: {}", statement);
 result = session.insert(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -166,12 +167,12 @@ public class MyBatisProducer extends DefaultProducer {
 Object value = iter.next();
 LOG.trace("Updating: {} using statement: {}", value, 
statement);
 result = session.update(statement, value);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 } else {
 LOG.trace("Updating using statement: {}", statement);
 result = session.update(statement);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, session);
 }
 }
 
@@ -182,11 +183,11 @@ public class MyBatisProducer extends DefaultProducer {
 // just pass in the body as Object and allow MyBatis to iterate 
using its own foreach statement
 LOG.trace("Updating: {} using statement: {}", in, statement);
 result = session.update(statement, in);
-doProcessResult(exchange, result);
+doProcessResult(exchange, result, s

[CONF] Apache Camel > Camel 2.14.0 Release

[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 MongoDB readPreference option which used to cause an IllegalArgumentException to 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 with camel-test-blueprint component.
 Netty HTTP now removes headerFilterStrategy option after resolving it
Fixed POJO aggregating when the parameter type was referring to a type that was class annotated.
Fixed MyBatis to 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. 

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  

[CONF] Apache Camel > Camel 2.14.0 Release

[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 MongoDB readPreference option which used to cause an IllegalArgumentException to 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 with camel-test-blueprint component.
 Netty HTTP now removes headerFilterStrategy option after resolving it
Fixed POJO aggregating when the parameter type was referring to a type that was class annotated.
 Fixed MyBatis to keep the message body as-is when calling stored procedures, if the procedure returns data as OUT parameters. 

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  

git commit: Upgraded Netty

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 768fcbb6f -> c88d8eb85


Upgraded Netty


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

Branch: refs/heads/camel-2.13.x
Commit: c88d8eb85414980cb9fc5b0b509e69605a3f37b2
Parents: 768fcbb
Author: Claus Ibsen 
Authored: Thu Jun 26 20:17:50 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:17:50 2014 +0200

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c88d8eb8/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d57c38e..89f4282 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -313,8 +313,8 @@
 2.1.7.Final
 3.2.7
 3.0.1
-3.9.1.Final
-4.0.19.Final
+3.9.2.Final
+4.0.20.Final
 0.5_1
 1.3.4
 

[2/2] git commit: CAMEL-7458: Add noggit bundle to camel-solr feature.

[davsclaus]

CAMEL-7458: Add noggit bundle to camel-solr feature.

Conflicts:
parent/pom.xml


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

Branch: refs/heads/camel-2.13.x
Commit: 768fcbb6f75f666832b7153dc714ea68f00130a7
Parents: 4450a6c
Author: Claus Ibsen 
Authored: Thu Jun 26 20:16:06 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:16:53 2014 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/768fcbb6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9a8df52..d57c38e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -315,6 +315,7 @@
 3.0.1
 3.9.1.Final
 4.0.19.Final
+0.5_1
 1.3.4
 
 1.1.5

http://git-wip-us.apache.org/repos/asf/camel/blob/768fcbb6/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index e2d1569..a140257 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1011,6 +1011,7 @@
 camel-core
 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
 mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.noggit/${noggit-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}

[1/2] git commit: CAMEL-7458: Add noggit bundle to camel-solr feature.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 4450a6c11 -> 768fcbb6f
  refs/heads/master 559197e60 -> cd3515ab5


CAMEL-7458: Add noggit bundle to camel-solr feature.


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

Branch: refs/heads/master
Commit: cd3515ab5ca841b5e194e201267cef24619f70e7
Parents: 559197e
Author: Claus Ibsen 
Authored: Thu Jun 26 20:16:06 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:16:06 2014 +0200

--
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cd3515ab/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0aa72e4..fa56668 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -310,6 +310,7 @@
 3.0.1
 3.9.2.Final
 4.0.20.Final
+0.5_1
 1.3.4
 
 1.1.5

http://git-wip-us.apache.org/repos/asf/camel/blob/cd3515ab/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 3c1be6b..a4ec9f6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1039,6 +1039,7 @@
 camel-core
 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
 mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.noggit/${noggit-bundle-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}

[3/4] git commit: CAMEL-7546: Avoid clash of CamelContext managementName in OSGi. Also reuse clash logic in finding free default context name and context management name.

[davsclaus]

CAMEL-7546: Avoid clash of CamelContext managementName in OSGi. Also reuse 
clash logic in finding free default context name and context management name.


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

Branch: refs/heads/camel-2.13.x
Commit: 67548e2ed2c68cd2a5601ba0c89f2758942e78b3
Parents: 0164fbc
Author: Claus Ibsen 
Authored: Thu Jun 26 18:44:51 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:08:16 2014 +0200

--
 .../core/osgi/OsgiCamelContextNameStrategy.java | 42 +
 .../core/osgi/OsgiCamelContextPublisher.java| 28 --
 .../core/osgi/OsgiManagementNameStrategy.java   |  7 ++
 .../camel/core/osgi/OsgiNamingHelper.java   | 91 
 4 files changed, 123 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/67548e2e/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
index a68c242..9e66e29 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
@@ -18,13 +18,8 @@ package org.apache.camel.core.osgi;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelContextNameStrategy;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import static 
org.apache.camel.core.osgi.OsgiCamelContextPublisher.CONTEXT_NAME_PROPERTY;
 
@@ -37,7 +32,6 @@ import static 
org.apache.camel.core.osgi.OsgiCamelContextPublisher.CONTEXT_NAME_
  */
 public class OsgiCamelContextNameStrategy implements CamelContextNameStrategy {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(OsgiCamelContextNameStrategy.class);
 private static final AtomicInteger CONTEXT_COUNTER = new AtomicInteger(0);
 private final BundleContext context;
 private final String prefix = "camel";
@@ -57,35 +51,8 @@ public class OsgiCamelContextNameStrategy implements 
CamelContextNameStrategy {
 
 @Override
 public synchronized String getNextName() {
-String candidate = null;
-boolean clash = false;
-
-do {
-try {
-clash = false;
-
-// generate new candidate
-candidate = prefix + "-" + getNextCounter();
-LOG.trace("Checking OSGi Service Registry for existence of 
existing CamelContext with name: {}", candidate);
-
-ServiceReference[] refs = 
context.getServiceReferences(CamelContext.class.getName(), "(" + 
CONTEXT_NAME_PROPERTY + "=" + candidate + ")");
-if (refs != null && refs.length > 0) {
-for (ServiceReference ref : refs) {
-Object id = ref.getProperty(CONTEXT_NAME_PROPERTY);
-if (id != null && candidate.equals(id)) {
-clash = true;
-break;
-}
-}
-}
-} catch (InvalidSyntaxException e) {
-LOG.debug("Error finding free Camel name in OSGi Service 
Registry due " + e.getMessage() + ". This exception is ignored.", e);
-break;
-}
-} while (clash);
-
-LOG.debug("Generated CamelContext name for bundle id: {}, clash: {} -> 
{}", new Object[]{context.getBundle().getBundleId(), clash, candidate});
-return candidate;
+// false = do no check fist, but add the counter asap, so we have 
camel-1
+return OsgiNamingHelper.findFreeCamelContextName(context, prefix, 
CONTEXT_NAME_PROPERTY, CONTEXT_COUNTER, false);
 }
 
 @Override
@@ -93,9 +60,4 @@ public class OsgiCamelContextNameStrategy implements 
CamelContextNameStrategy {
 return false;
 }
 
-public static int getNextCounter() {
-// we want to start counting from 1, so increment first
-return CONTEXT_COUNTER.incrementAndGet();
-}
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/67548e2e/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
-

[4/4] git commit: Fixed OSGi test

[davsclaus]

Fixed OSGi test


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

Branch: refs/heads/camel-2.13.x
Commit: 4450a6c11097c22bc2a125f7ae84e67a0cc7da5c
Parents: 67548e2
Author: Claus Ibsen 
Authored: Thu Jun 26 20:05:55 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:08:24 2014 +0200

--
 .../itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4450a6c1/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
--
diff --git 
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
 
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
index e82ee48..c9f77c5 100644
--- 
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
+++ 
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
@@ -36,7 +36,7 @@ import static 
org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 @RunWith(JUnit4TestRunner.class)
 public class OSGiBlueprintHelloWorldTest extends OSGiBlueprintTestSupport {
 
-private String name = OSGiBlueprintHelloWorldTest.class.getName();
+private static final String NAME = 
OSGiBlueprintHelloWorldTest.class.getName();
 
 @Override
 public void setUp() throws Exception {
@@ -47,12 +47,10 @@ public class OSGiBlueprintHelloWorldTest extends 
OSGiBlueprintTestSupport {
 @Test
 public void testHelloWorld() throws Exception {
 // start bundle
-getInstalledBundle(name).start();
+getInstalledBundle(NAME).start();
 
 // must use the camel context from osgi
-CamelContext ctx = getOsgiService(CamelContext.class, 
-   //"(camel.context.symbolicname=" + name + ")"
-   "camel.context.name=camel1", 1);
+CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=" + NAME + ")", 1);
 
 ProducerTemplate myTemplate = ctx.createProducerTemplate();
 myTemplate.start();
@@ -76,7 +74,7 @@ public class OSGiBlueprintHelloWorldTest extends 
OSGiBlueprintTestSupport {
 
 bundle(newBundle()
 .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml"))
-.set(Constants.BUNDLE_SYMBOLICNAME, 
OSGiBlueprintHelloWorldTest.class.getName())
+.set(Constants.BUNDLE_SYMBOLICNAME, NAME)
 .build()).noStart(),
 
 // using the features to install the camel components

[2/4] git commit: Fixed OSGi test

[davsclaus]

Fixed OSGi test


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

Branch: refs/heads/master
Commit: 559197e609eabdd573415acacae83845e30b556b
Parents: d1ae838
Author: Claus Ibsen 
Authored: Thu Jun 26 20:05:55 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 20:05:55 2014 +0200

--
 .../itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/559197e6/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
--
diff --git 
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
 
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
index e82ee48..c9f77c5 100644
--- 
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
+++ 
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
@@ -36,7 +36,7 @@ import static 
org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 @RunWith(JUnit4TestRunner.class)
 public class OSGiBlueprintHelloWorldTest extends OSGiBlueprintTestSupport {
 
-private String name = OSGiBlueprintHelloWorldTest.class.getName();
+private static final String NAME = 
OSGiBlueprintHelloWorldTest.class.getName();
 
 @Override
 public void setUp() throws Exception {
@@ -47,12 +47,10 @@ public class OSGiBlueprintHelloWorldTest extends 
OSGiBlueprintTestSupport {
 @Test
 public void testHelloWorld() throws Exception {
 // start bundle
-getInstalledBundle(name).start();
+getInstalledBundle(NAME).start();
 
 // must use the camel context from osgi
-CamelContext ctx = getOsgiService(CamelContext.class, 
-   //"(camel.context.symbolicname=" + name + ")"
-   "camel.context.name=camel1", 1);
+CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=" + NAME + ")", 1);
 
 ProducerTemplate myTemplate = ctx.createProducerTemplate();
 myTemplate.start();
@@ -76,7 +74,7 @@ public class OSGiBlueprintHelloWorldTest extends 
OSGiBlueprintTestSupport {
 
 bundle(newBundle()
 .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml"))
-.set(Constants.BUNDLE_SYMBOLICNAME, 
OSGiBlueprintHelloWorldTest.class.getName())
+.set(Constants.BUNDLE_SYMBOLICNAME, NAME)
 .build()).noStart(),
 
 // using the features to install the camel components

[1/4] git commit: CAMEL-7546: Avoid clash of CamelContext managementName in OSGi. Also reuse clash logic in finding free default context name and context management name.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 0164fbcfc -> 4450a6c11
  refs/heads/master d49bf78e1 -> 559197e60


CAMEL-7546: Avoid clash of CamelContext managementName in OSGi. Also reuse 
clash logic in finding free default context name and context management name.


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

Branch: refs/heads/master
Commit: d1ae8385f6efbab7a05bc2b4859c173b1f0a4863
Parents: d49bf78
Author: Claus Ibsen 
Authored: Thu Jun 26 18:44:51 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 19:52:05 2014 +0200

--
 .../core/osgi/OsgiCamelContextNameStrategy.java | 42 +
 .../core/osgi/OsgiCamelContextPublisher.java| 28 --
 .../core/osgi/OsgiManagementNameStrategy.java   |  7 ++
 .../camel/core/osgi/OsgiNamingHelper.java   | 91 
 4 files changed, 123 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d1ae8385/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
index a68c242..9e66e29 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextNameStrategy.java
@@ -18,13 +18,8 @@ package org.apache.camel.core.osgi;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelContextNameStrategy;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import static 
org.apache.camel.core.osgi.OsgiCamelContextPublisher.CONTEXT_NAME_PROPERTY;
 
@@ -37,7 +32,6 @@ import static 
org.apache.camel.core.osgi.OsgiCamelContextPublisher.CONTEXT_NAME_
  */
 public class OsgiCamelContextNameStrategy implements CamelContextNameStrategy {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(OsgiCamelContextNameStrategy.class);
 private static final AtomicInteger CONTEXT_COUNTER = new AtomicInteger(0);
 private final BundleContext context;
 private final String prefix = "camel";
@@ -57,35 +51,8 @@ public class OsgiCamelContextNameStrategy implements 
CamelContextNameStrategy {
 
 @Override
 public synchronized String getNextName() {
-String candidate = null;
-boolean clash = false;
-
-do {
-try {
-clash = false;
-
-// generate new candidate
-candidate = prefix + "-" + getNextCounter();
-LOG.trace("Checking OSGi Service Registry for existence of 
existing CamelContext with name: {}", candidate);
-
-ServiceReference[] refs = 
context.getServiceReferences(CamelContext.class.getName(), "(" + 
CONTEXT_NAME_PROPERTY + "=" + candidate + ")");
-if (refs != null && refs.length > 0) {
-for (ServiceReference ref : refs) {
-Object id = ref.getProperty(CONTEXT_NAME_PROPERTY);
-if (id != null && candidate.equals(id)) {
-clash = true;
-break;
-}
-}
-}
-} catch (InvalidSyntaxException e) {
-LOG.debug("Error finding free Camel name in OSGi Service 
Registry due " + e.getMessage() + ". This exception is ignored.", e);
-break;
-}
-} while (clash);
-
-LOG.debug("Generated CamelContext name for bundle id: {}, clash: {} -> 
{}", new Object[]{context.getBundle().getBundleId(), clash, candidate});
-return candidate;
+// false = do no check fist, but add the counter asap, so we have 
camel-1
+return OsgiNamingHelper.findFreeCamelContextName(context, prefix, 
CONTEXT_NAME_PROPERTY, CONTEXT_COUNTER, false);
 }
 
 @Override
@@ -93,9 +60,4 @@ public class OsgiCamelContextNameStrategy implements 
CamelContextNameStrategy {
 return false;
 }
 
-public static int getNextCounter() {
-// we want to start counting from 1, so increment first
-return CONTEXT_COUNTER.incrementAndGet();
-}
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/d

[3/3] git commit: CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle in OSGi service registry. This also fixes the camel karaf commands to show em all.

[davsclaus]

CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle 
in OSGi service registry. This also fixes the camel karaf commands to show em 
all.


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

Branch: refs/heads/camel-2.12.x
Commit: 741b0cab2f285de01d3979b77882d93ca2df5dfe
Parents: c251465
Author: Claus Ibsen 
Authored: Thu Jun 26 17:04:05 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 17:04:44 2014 +0200

--
 .../org/apache/camel/core/osgi/OsgiCamelContextPublisher.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/741b0cab/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index 4b0f42d..69c74f9 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -94,7 +94,10 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 
 public ServiceRegistration registerCamelContext(CamelContext camelContext) 
throws InvalidSyntaxException {
 // avoid registering the same service again
-String symbolicName = bundleContext.getBundle().getSymbolicName();
+// we must include unique camel management name so the symbolic name 
becomes unique,
+// in case the bundle has more than one CamelContext
+String name = camelContext.getName();
+String symbolicName = bundleContext.getBundle().getSymbolicName() + 
"-" + name;
 Version bundleVersion = getBundleVersion(bundleContext.getBundle());
 ServiceReference[] refs = 
bundleContext.getServiceReferences(CamelContext.class.getName(),
 "(&(" + CONTEXT_SYMBOLIC_NAME_PROPERTY + "=" + symbolicName + 
")(" + CONTEXT_VERSION_PROPERTY + "=" + bundleVersion + "))");
@@ -103,7 +106,7 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 Dictionary props = new Hashtable();
 props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, symbolicName);
 props.put(CONTEXT_VERSION_PROPERTY, bundleVersion);
-props.put(CONTEXT_NAME_PROPERTY, camelContext.getName());
+props.put(CONTEXT_NAME_PROPERTY, name);
 
 if (log.isDebugEnabled()) {
 log.debug("Registering CamelContext [{}] of in OSGi registry", 
camelContext.getName());

[2/3] git commit: CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle in OSGi service registry. This also fixes the camel karaf commands to show em all.

[davsclaus]

CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle 
in OSGi service registry. This also fixes the camel karaf commands to show em 
all.


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

Branch: refs/heads/camel-2.13.x
Commit: 0164fbcfc095c7270aed8808b45059b97570ec24
Parents: b69abf4
Author: Claus Ibsen 
Authored: Thu Jun 26 17:04:05 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 17:04:27 2014 +0200

--
 .../org/apache/camel/core/osgi/OsgiCamelContextPublisher.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0164fbcf/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index dd45c19..d932550 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -93,7 +93,10 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 
 public ServiceRegistration registerCamelContext(CamelContext camelContext) 
throws InvalidSyntaxException {
 // avoid registering the same service again
-String symbolicName = bundleContext.getBundle().getSymbolicName();
+// we must include unique camel management name so the symbolic name 
becomes unique,
+// in case the bundle has more than one CamelContext
+String name = camelContext.getName();
+String symbolicName = bundleContext.getBundle().getSymbolicName() + 
"-" + name;
 Version bundleVersion = getBundleVersion(bundleContext.getBundle());
 ServiceReference[] refs = 
bundleContext.getServiceReferences(CamelContext.class.getName(),
 "(&(" + CONTEXT_SYMBOLIC_NAME_PROPERTY + "=" + symbolicName + 
")(" + CONTEXT_VERSION_PROPERTY + "=" + bundleVersion + "))");
@@ -102,7 +105,7 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 Dictionary props = new Hashtable();
 props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, symbolicName);
 props.put(CONTEXT_VERSION_PROPERTY, bundleVersion);
-props.put(CONTEXT_NAME_PROPERTY, camelContext.getName());
+props.put(CONTEXT_NAME_PROPERTY, name);
 
 if (log.isDebugEnabled()) {
 log.debug("Registering CamelContext [{}] of in OSGi registry", 
camelContext.getName());

[1/3] git commit: CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle in OSGi service registry. This also fixes the camel karaf commands to show em all.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x c25146502 -> 741b0cab2
  refs/heads/camel-2.13.x b69abf49e -> 0164fbcfc
  refs/heads/master 1b07210d6 -> d49bf78e1


CAMEL-7545: Fixed camel osgi to regsiter all CamelContext from the same bundle 
in OSGi service registry. This also fixes the camel karaf commands to show em 
all.


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

Branch: refs/heads/master
Commit: d49bf78e1f62306cc1b448527ebb3ab8f3b82d47
Parents: 1b07210
Author: Claus Ibsen 
Authored: Thu Jun 26 17:04:05 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 17:04:05 2014 +0200

--
 .../org/apache/camel/core/osgi/OsgiCamelContextPublisher.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d49bf78e/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
--
diff --git 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index dd45c19..d932550 100644
--- 
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ 
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -93,7 +93,10 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 
 public ServiceRegistration registerCamelContext(CamelContext camelContext) 
throws InvalidSyntaxException {
 // avoid registering the same service again
-String symbolicName = bundleContext.getBundle().getSymbolicName();
+// we must include unique camel management name so the symbolic name 
becomes unique,
+// in case the bundle has more than one CamelContext
+String name = camelContext.getName();
+String symbolicName = bundleContext.getBundle().getSymbolicName() + 
"-" + name;
 Version bundleVersion = getBundleVersion(bundleContext.getBundle());
 ServiceReference[] refs = 
bundleContext.getServiceReferences(CamelContext.class.getName(),
 "(&(" + CONTEXT_SYMBOLIC_NAME_PROPERTY + "=" + symbolicName + 
")(" + CONTEXT_VERSION_PROPERTY + "=" + bundleVersion + "))");
@@ -102,7 +105,7 @@ public class OsgiCamelContextPublisher extends 
EventNotifierSupport {
 Dictionary props = new Hashtable();
 props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, symbolicName);
 props.put(CONTEXT_VERSION_PROPERTY, bundleVersion);
-props.put(CONTEXT_NAME_PROPERTY, camelContext.getName());
+props.put(CONTEXT_NAME_PROPERTY, name);
 
 if (log.isDebugEnabled()) {
 log.debug("Registering CamelContext [{}] of in OSGi registry", 
camelContext.getName());

git commit: Fixed wrong spring osgi import

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master d00f44409 -> 1b07210d6


Fixed wrong spring osgi import


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

Branch: refs/heads/master
Commit: 1b07210d6ac0db0890c86aa9ebf10da3556b5239
Parents: d00f444
Author: Claus Ibsen 
Authored: Thu Jun 26 16:32:02 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 16:32:02 2014 +0200

--
 parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1b07210d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e5b8c12..0aa72e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,8 +381,9 @@
 1.0.0-20090215
 1.3.1.RELEASE
 1.3.1.RELEASE_2
-1.0.3.RELEASE  
-[3.2,5)
+1.0.3.RELEASE
+  
+[3.2,4)
 ${spring32-version}   
 3.2.9.RELEASE
 4.0.5.RELEASE

svn commit: r913952 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html

[buildbot]

Author: buildbot
Date: Thu Jun 26 14:18:12 2014
New Revision: 913952

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2140-release.html
==
--- websites/production/camel/content/camel-2140-release.html (original)
+++ websites/production/camel/content/camel-2140-release.html Thu Jun 26 
14:18:12 2014
@@ -87,7 +87,7 @@
 
 
 Camel 2.14.0 
release (currently in progress)
-http://camel.apache.org/download.data/camel-box-v1.0-150x200.png"; 
style="border: 0px solid black">New 
and NoteworthyWelcome to the 2.14.0 release which approx XXX issues 
resolved (new features, improvements and bug fixes such 
as...)Support for running on Java 1.8 JVMsSpring 4.x 
supported.Simple language defined in routes using resultType as 
boolean is now evaluated as predicate instead of as 
expression.Introduced RuntimeEndpointRegistry to capture runtime usage 
of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.Added event notification for 
routes added and removed.Allow to configure cache size in Recipient 
List, Routing Slip and Dynamic Router EIPs; and as well turn caching 
off.Netty HTTP producer now supports the CamelHttpPath 
header to define a dynamic context-path and query parameters to call the remote 
http server.Polling Consumer allows to configure 
initial queue size and whether to block when full when using the 
default EventDrivenPollingConsumer which most components 
does. We now block by default, as otherwise the message may be lost if the 
queue was full, and a new message was offered.https://issues.apache.org/jira/browse/CAMEL-7435";>Added a generic 
callback to configure the APNS service 
builder.Added StreamList option to 
the JDBC 
componentAllow to define Simple expressions for sql parameters 
of the SQL component.Fixed IssuesTimer 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 https://camel.apache.org/mongodb.html";>MongoDB readPreference option
 which used to cause an IllegalArgumentException to 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 
with camel-test-blueprint component.Netty HTTP now https://issues.apache.org/jira/browse/CAMEL-7506";>removes 
headerFilterStrategy option after resolving itFixed POJO aggregating when the parameter type was 
referring to a type that was class annotated.New Enterprise Integration 
PatternsCircuit 
Breaker pattern implemented as a Load Balancer policyNew Componentscamel-ahc-wscamel-atmosphere-websocketcamel-openshiftcamel-gora<
 /a>New Camel Maven ArchetypesNew DSLNew AnnotationsNew Data Formatscamel-barcodeNew LanguagesNew 
ExamplesNew TutorialsNew ToolingAPI changesChanged 
...Known IssuesDep
 endency UpgradesYou can see any dependency changes using http://vdiff.notsoclever.cc/"; 
rel="nofollow">Camel Dependencies Version Differences web tool created by 
Tracy Snell from the Camel Team.The 
below list is a best effort, and we may miss some updates, its better to use 
the http://vdiff.notsoclever.cc/"; 
rel="nofollow">Camel Dependencies Version Differences web tool which uses 
the released projects for comparison.Atomikos 3.9.2 to 
3.9.3Commons-codec 1.8 to 1.9CXF 2.7.11 to 
3.0.0Dozer 5.4.0 to 5.5.1EhCache 2.8.1 to 
2.8.3Groovy 2.2.2 to 2.3.3Guava 16.0.1 to 17.0JRuby 
1.7.10 to 1.7.12MongoDB-Java-Driver 2.11.4 to 2.12.0RabbitMQ 
AMQ Client 3.2.2 to 3.3.0RxJava 0.17.5 to 0.19.1Scala 2.10.3 
to 2.10.4Snmp4j 2.2.5 to 2.3.0SSHD 0.10.1 to 0.11.0Internal changesChanged 
...Changes 
that may affect end usersPolling Consumer allows to configure 
initial queue size and whether to block when full when using the 
default EventDrivenPollingConsumer which most components 
does. We now block by default, as otherwise the message may be lost if the 
queue was full, and a new message was offered.Important 
changes to consider when upgradingJava 1.6 no longer supported.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip";>apache-camel-2.14.0.ziphttp://www.apache.org/dist/camel/apache-camel/2.14.0/apache-camel-2.14.0.zip.asc";>apache-camel-2.14.0.zip.ascUnix/Linux/Cygwin 
D

[2/4] git commit: CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel

[davsclaus]

CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel


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

Branch: refs/heads/camel-2.13.x
Commit: b69abf49e8588e1f8ffea659f67ee50ac87182fc
Parents: 6818b5a
Author: Claus Ibsen 
Authored: Thu Jun 26 16:07:07 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 16:07:50 2014 +0200

--
 .../test/blueprint/CustomIdIssuesTest.java  | 55 
 .../camel/test/blueprint/CustomIdIssuesTest.xml | 47 +
 2 files changed, 102 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b69abf49/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
new file mode 100644
index 000..8e14c38
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.blueprint;
+
+import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.LogDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.WhenDefinition;
+import org.junit.Test;
+
+public class CustomIdIssuesTest extends CamelBlueprintTestSupport {
+
+@Override
+protected String getBlueprintDescriptor() {
+return "org/apache/camel/test/blueprint/CustomIdIssuesTest.xml";
+}
+
+@Test
+public void testCustomId() {
+RouteDefinition route = context.getRouteDefinition("myRoute");
+assertNotNull(route);
+assertTrue(route.hasCustomIdAssigned());
+
+FromDefinition from = route.getInputs().get(0);
+assertEquals("fromFile", from.getId());
+assertTrue(from.hasCustomIdAssigned());
+
+ChoiceDefinition choice = (ChoiceDefinition) route.getOutputs().get(0);
+assertEquals("myChoice", choice.getId());
+assertTrue(choice.hasCustomIdAssigned());
+
+WhenDefinition when = choice.getWhenClauses().get(0);
+assertTrue(when.hasCustomIdAssigned());
+assertEquals("UK", when.getId());
+
+LogDefinition log = (LogDefinition) 
choice.getOtherwise().getOutputs().get(0);
+assertFalse(log.hasCustomIdAssigned());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/b69abf49/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
--
diff --git 
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
new file mode 100644
index 000..f940186
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
@@ -0,0 +1,47 @@
+
+
+http://www.osgi.org/xmlns/blueprint/v1.0.0";
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
+
+  http://camel.apache.org/schema/blueprint";>
+
+
+  here is a sample which processes the input files
+(leaving them in place - see the 'noop' flag)
+then performs content based routing on the message using 
XPath
+  
+
+  
+  
+
+  /person/city = 'London'
+  
+  
+  

[3/4] git commit: CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel

[davsclaus]

CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel


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

Branch: refs/heads/master
Commit: 83c66f4c8ae87dfc8e354abfa97d21a314e1147c
Parents: a76f818
Author: Claus Ibsen 
Authored: Thu Jun 26 15:47:01 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 16:08:00 2014 +0200

--
 .../core/xml/AbstractCamelFactoryBean.java  | 10 
 .../camel/spring/issues/CustomIdIssuesTest.java | 59 
 .../camel/spring/issues/CustomIdIssueTest.xml   | 47 
 3 files changed, 116 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/83c66f4c/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
--
diff --git 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
index d24d7a1..cae7a71 100644
--- 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
+++ 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
@@ -33,6 +33,8 @@ public abstract class AbstractCamelFactoryBean extends 
IdentifiedType impleme
 private String camelContextId;
 @XmlTransient
 private CamelContext camelContext;
+@XmlTransient
+private Boolean customId;
 
 public abstract T getObject() throws Exception;
 
@@ -82,6 +84,14 @@ public abstract class AbstractCamelFactoryBean extends 
IdentifiedType impleme
 this.camelContextId = camelContextId;
 }
 
+public Boolean getCustomId() {
+return customId;
+}
+
+public void setCustomId(Boolean customId) {
+this.customId = customId;
+}
+
 public boolean isSingleton() {
 return true;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/83c66f4c/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
new file mode 100644
index 000..43b6f02
--- /dev/null
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.issues;
+
+import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.LogDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.WhenDefinition;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version 
+ */
+public class CustomIdIssuesTest extends SpringTestSupport {
+
+@Override
+protected AbstractXmlApplicationContext createApplicationContext() {
+return new 
ClassPathXmlApplicationContext("org/apache/camel/spring/issues/CustomIdIssueTest.xml");
+}
+
+public void testCustomId() {
+RouteDefinition route = context.getRouteDefinition("myRoute");
+assertNotNull(route);
+assertTrue(route.hasCustomIdAssigned());
+
+FromDefinition from = route.getInputs().get(0);
+assertEquals("fromFile", from.getId());
+assertTrue(from.hasCustomIdAssigned());
+
+ChoiceDefinition choice = (ChoiceDefinition) route.getOutputs().get(0);
+assertEquals("myChoice", choice.getId());
+assertTrue(c

[1/4] git commit: CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 91f7e0d10 -> b69abf49e
  refs/heads/master a76f818a9 -> d00f44409


CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel


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

Branch: refs/heads/camel-2.13.x
Commit: 6818b5a5a261898ca8d27e681377d4a5e7abe259
Parents: 91f7e0d
Author: Claus Ibsen 
Authored: Thu Jun 26 15:47:01 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 16:07:43 2014 +0200

--
 .../core/xml/AbstractCamelFactoryBean.java  | 10 
 .../camel/spring/issues/CustomIdIssuesTest.java | 59 
 .../camel/spring/issues/CustomIdIssueTest.xml   | 47 
 3 files changed, 116 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6818b5a5/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
--
diff --git 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
index d24d7a1..cae7a71 100644
--- 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
+++ 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
@@ -33,6 +33,8 @@ public abstract class AbstractCamelFactoryBean extends 
IdentifiedType impleme
 private String camelContextId;
 @XmlTransient
 private CamelContext camelContext;
+@XmlTransient
+private Boolean customId;
 
 public abstract T getObject() throws Exception;
 
@@ -82,6 +84,14 @@ public abstract class AbstractCamelFactoryBean extends 
IdentifiedType impleme
 this.camelContextId = camelContextId;
 }
 
+public Boolean getCustomId() {
+return customId;
+}
+
+public void setCustomId(Boolean customId) {
+this.customId = customId;
+}
+
 public boolean isSingleton() {
 return true;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6818b5a5/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
--
diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
new file mode 100644
index 000..43b6f02
--- /dev/null
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CustomIdIssuesTest.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.issues;
+
+import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.LogDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.WhenDefinition;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version 
+ */
+public class CustomIdIssuesTest extends SpringTestSupport {
+
+@Override
+protected AbstractXmlApplicationContext createApplicationContext() {
+return new 
ClassPathXmlApplicationContext("org/apache/camel/spring/issues/CustomIdIssueTest.xml");
+}
+
+public void testCustomId() {
+RouteDefinition route = context.getRouteDefinition("myRoute");
+assertNotNull(route);
+assertTrue(route.hasCustomIdAssigned());
+
+FromDefinition from = route.getInputs().get(0);
+assertEquals("fromFile", from.getId());
+assertTrue(from.hasCustomIdAssigned());
+
+ChoiceDe

[4/4] git commit: CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel

[davsclaus]

CAMEL-7544: Fixed XML DSL with customId attribute set cannot be read by Camel


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

Branch: refs/heads/master
Commit: d00f4440904d9322ed2ffca6fffee10d2569aa62
Parents: 83c66f4
Author: Claus Ibsen 
Authored: Thu Jun 26 16:07:07 2014 +0200
Committer: Claus Ibsen 
Committed: Thu Jun 26 16:08:00 2014 +0200

--
 .../test/blueprint/CustomIdIssuesTest.java  | 55 
 .../camel/test/blueprint/CustomIdIssuesTest.xml | 47 +
 2 files changed, 102 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d00f4440/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
new file mode 100644
index 000..8e14c38
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/CustomIdIssuesTest.java
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.blueprint;
+
+import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.LogDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.WhenDefinition;
+import org.junit.Test;
+
+public class CustomIdIssuesTest extends CamelBlueprintTestSupport {
+
+@Override
+protected String getBlueprintDescriptor() {
+return "org/apache/camel/test/blueprint/CustomIdIssuesTest.xml";
+}
+
+@Test
+public void testCustomId() {
+RouteDefinition route = context.getRouteDefinition("myRoute");
+assertNotNull(route);
+assertTrue(route.hasCustomIdAssigned());
+
+FromDefinition from = route.getInputs().get(0);
+assertEquals("fromFile", from.getId());
+assertTrue(from.hasCustomIdAssigned());
+
+ChoiceDefinition choice = (ChoiceDefinition) route.getOutputs().get(0);
+assertEquals("myChoice", choice.getId());
+assertTrue(choice.hasCustomIdAssigned());
+
+WhenDefinition when = choice.getWhenClauses().get(0);
+assertTrue(when.hasCustomIdAssigned());
+assertEquals("UK", when.getId());
+
+LogDefinition log = (LogDefinition) 
choice.getOtherwise().getOutputs().get(0);
+assertFalse(log.hasCustomIdAssigned());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/d00f4440/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
--
diff --git 
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
new file mode 100644
index 000..f940186
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/CustomIdIssuesTest.xml
@@ -0,0 +1,47 @@
+
+
+http://www.osgi.org/xmlns/blueprint/v1.0.0";
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
+
+  http://camel.apache.org/schema/blueprint";>
+
+
+  here is a sample which processes the input files
+(leaving them in place - see the 'noop' flag)
+then performs content based routing on the message using 
XPath
+  
+
+  
+  
+
+  /person/city = 'London'
+  
+  
+
+  

[CONF] Apache Camel > Camel 2.14.0 Release

[willem jiang (Confluence)]

  


willem jiang edited the page:
 


Camel 2.14.0 Release   






...

Atomikos 3.9.2 to 3.9.3
Commons-codec 1.8 to 1.9
CXF 2.7.11 to 3.0.0
Dozer 5.4.0 to 5.5.1
EhCache 2.8.1 to 2.8.3
Groovy 2.2.2 to 2.3.3
Guava 16.0.1 to 17.0
JRuby 1.7.10 to 1.7.12
MongoDB-Java-Driver 2.11.4 to 2.12.0
RabbitMQ AMQ Client 3.2.2 to 3.3.0
RxJava 0.17.5 to 0.19.1
Scala 2.10.3 to 2.10.4
Snmp4j 2.2.5 to 2.3.0
SSHD 0.10.1 to 0.11.0
 spring-redis 1.1.0 to 1.3.0 

Internal changes

Changed ...

...






 View Online  · Like  · View Changes  
 Stop watching space  · Manage Notifications  


 


 


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

git commit: Upgraded the spring-redis version to 1.3.0

[ningjiang]

Repository: camel
Updated Branches:
  refs/heads/master 56fbbfd02 -> a76f818a9


Upgraded the spring-redis version to 1.3.0


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

Branch: refs/heads/master
Commit: a76f818a9407b35e35332e1c85b166d479907ebb
Parents: 56fbbfd
Author: Willem Jiang 
Authored: Thu Jun 26 21:51:52 2014 +0800
Committer: Willem Jiang 
Committed: Thu Jun 26 21:51:52 2014 +0800

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a76f818a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f699725..e5b8c12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,7 +376,7 @@
 2.2.5.RELEASE
 1.2.0
 1.5.0.RELEASE
-1.1.1.RELEASE
+1.3.0.RELEASE
 2.2.6.RELEASE
 1.0.0-20090215
 1.3.1.RELEASE

git commit: Fixed the WSSecurityRouteTest test error in JDK8

[ningjiang]

Repository: camel
Updated Branches:
  refs/heads/master eb0d2f8dc -> 56fbbfd02


Fixed the  WSSecurityRouteTest test error in JDK8


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

Branch: refs/heads/master
Commit: 56fbbfd0273118d9aa4deb9f67a0759b744fe265
Parents: eb0d2f8
Author: Willem Jiang 
Authored: Thu Jun 26 16:42:44 2014 +0800
Committer: Willem Jiang 
Committed: Thu Jun 26 16:42:44 2014 +0800

--
 .../camel/component/cxf/wssecurity/camel/camel-context.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/56fbbfd0/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
--
diff --git 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
 
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
index abccafe..bfe6640 100644
--- 
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
+++ 
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
@@ -26,7 +26,7 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 
-
+