svn commit: r1447146 - in /camel/trunk/components/camel-cxf: ./ src/main/java/org/apache/camel/component/cxf/ src/test/java/org/apache/camel/component/cxf/jms/ src/test/resources/org/apache/camel/comp
Author: ningjiang
Date: Mon Feb 18 08:27:17 2013
New Revision: 1447146
URL: http://svn.apache.org/r1447146
Log:
CAMEL-6084 Fix the issue that SOAP over JMS doesn't work with camel-cxf endpoint
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml
Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
Modified: camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1447146r1=1447145r2=1447146view=diff
==
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Mon Feb 18 08:27:17 2013
@@ -160,6 +160,26 @@
artifactIdcamel-test-spring/artifactId
scopetest/scope
/dependency
+
+!-- test for the cxf jms transport --
+dependency
+ groupIdorg.apache.activemq/groupId
+ artifactIdactivemq-broker/artifactId
+ scopetest/scope
+/dependency
+
+dependency
+groupIdorg.apache.activemq/groupId
+artifactIdactivemq-kahadb-store/artifactId
+scopetest/scope
+/dependency
+
+dependency
+ groupIdorg.apache.cxf/groupId
+ artifactIdcxf-rt-transports-jms/artifactId
+ version${cxf-version}/version
+ scopetest/scope
+/dependency
dependency
groupIdorg.apache.cxf/groupId
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1447146r1=1447145r2=1447146view=diff
==
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
Mon Feb 18 08:27:17 2013
@@ -76,7 +76,8 @@ public class CxfConsumer extends Default
}
}
-// NOTE this code cannot work with CXF 2.2.x
+// NOTE this code cannot work with CXF 2.2.x and JMSContinuation
+// as it doesn't break out the interceptor chain when we call it
private Object asyncInvoke(Exchange cxfExchange, final
Continuation continuation) {
synchronized (continuation) {
if (continuation.isNew()) {
@@ -114,7 +115,14 @@ public class CxfConsumer extends Default
private Continuation getContinuation(Exchange cxfExchange) {
ContinuationProvider provider =
(ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName());
-return provider == null ? null : provider.getContinuation();
+Continuation continuation = provider == null ? null :
provider.getContinuation();
+// Make sure we don't return the JMSContinuation, as it
doesn't support the Continuation we wants
+// Don't want to introduce the dependency of
cxf-rt-transprot-jms here
+if (continuation != null
continuation.getClass().getName().equals(org.apache.cxf.transport.jms.continuations.JMSContinuation))
{
+return null;
+} else {
+return continuation;
+}
}
private Object syncInvoke(Exchange cxfExchange) {
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java?rev=1447146view=auto
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
(added)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
Mon Feb 18 08:27:17 2013
@@ -0,0 +1,93 @@
+/**
+ * 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
svn commit: r1447153 - in /camel/branches/camel-2.10.x: ./ components/camel-cxf/ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/ components/camel-cxf/src/test/java/org/apache/camel/
Author: ningjiang
Date: Mon Feb 18 08:58:14 2013
New Revision: 1447153
URL: http://svn.apache.org/r1447153
Log:
CAMEL-6084 Fix the issue that SOAP over JMS doesn't work with camel-cxf endpoint
Merged revisions 1447146 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r1447146 | ningjiang | 2013-02-18 16:27:17 +0800 (Mon, 18 Feb 2013) | 1 line
CAMEL-6084 Fix the issue that SOAP over JMS doesn't work with camel-cxf
endpoint
Added:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/
- copied from r1447146,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
- copied unchanged from r1447146,
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/
- copied from r1447146,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml
- copied unchanged from r1447146,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cxf/pom.xml
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
camel/branches/camel-2.10.x/components/camel-jms/ (props changed)
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1447146
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/pom.xml?rev=1447153r1=1447152r2=1447153view=diff
==
--- camel/branches/camel-2.10.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/pom.xml Mon Feb 18
08:58:14 2013
@@ -150,6 +150,20 @@
artifactIdcamel-test-spring/artifactId
scopetest/scope
/dependency
+
+!-- test for the cxf jms transport --
+dependency
+ groupIdorg.apache.activemq/groupId
+ artifactIdactivemq-core/artifactId
+ scopetest/scope
+/dependency
+
+dependency
+ groupIdorg.apache.cxf/groupId
+ artifactIdcxf-rt-transports-jms/artifactId
+ version${cxf-version}/version
+ scopetest/scope
+/dependency
dependency
groupIdorg.apache.cxf/groupId
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1447153r1=1447152r2=1447153view=diff
==
---
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
Mon Feb 18 08:58:14 2013
@@ -76,7 +76,8 @@ public class CxfConsumer extends Default
}
}
-// NOTE this code cannot work with CXF 2.2.x
+// NOTE this code cannot work with CXF 2.2.x and JMSContinuation
+// as it doesn't break out the interceptor chain when we call it
private Object asyncInvoke(Exchange cxfExchange, final
Continuation continuation) {
synchronized (continuation) {
if (continuation.isNew()) {
@@ -114,7 +115,14 @@ public class CxfConsumer extends Default
private Continuation getContinuation(Exchange cxfExchange) {
ContinuationProvider provider =
(ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName());
-return provider == null ? null : provider.getContinuation();
+Continuation continuation = provider == null ? null :
provider.getContinuation();
+// Make sure we don't return the JMSContinuation, as it
doesn't support the Continuation we wants
+// Don't want to introduce the dependency of
cxf-rt-transprot-jms here
+if
svn commit: r1447190 - in /camel/branches/camel-2.10.x: ./ components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/ components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/
Author: bibryam
Date: Mon Feb 18 11:07:34 2013
New Revision: 1447190
URL: http://svn.apache.org/r1447190
Log:
Merged revisions 1410099 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r1410099 | bibryam | 2012-11-15 23:09:11 + (Thu, 15 Nov 2012) | 2 lines
Update aws library to 1.3.25
Introduced two new options for SQS consumer to enable long polling:
waitTimeSeconds and receiveMessageWaitTimeSeconds
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
camel/branches/camel-2.10.x/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
camel/branches/camel-2.10.x/components/camel-aws/src/test/resources/org/apache/camel/component/aws/sqs/SqsComponentSpringTest-context.xml
camel/branches/camel-2.10.x/components/camel-jms/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1410099
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java?rev=1447190r1=1447189r2=1447190view=diff
==
---
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
Mon Feb 18 11:07:34 2013
@@ -37,6 +37,7 @@ public class SqsConfiguration {
private Boolean deleteAfterRead = Boolean.TRUE;
private Integer visibilityTimeout;
private CollectionString attributeNames;
+private Integer waitTimeSeconds;
private Integer defaultVisibilityTimeout;
private Boolean extendMessageVisibility = Boolean.FALSE;
@@ -46,6 +47,7 @@ public class SqsConfiguration {
// queue properties
private Integer maximumMessageSize;
private Integer messageRetentionPeriod;
+private Integer receiveMessageWaitTimeSeconds;
private String policy;
public void setAmazonSQSEndpoint(String amazonSQSEndpoint) {
@@ -160,6 +162,22 @@ public class SqsConfiguration {
this.extendMessageVisibility = extendMessageVisibility;
}
+public Integer getReceiveMessageWaitTimeSeconds() {
+return receiveMessageWaitTimeSeconds;
+}
+
+public void setReceiveMessageWaitTimeSeconds(Integer
receiveMessageWaitTimeSeconds) {
+this.receiveMessageWaitTimeSeconds = receiveMessageWaitTimeSeconds;
+}
+
+public Integer getWaitTimeSeconds() {
+return waitTimeSeconds;
+}
+
+public void setWaitTimeSeconds(Integer waitTimeSeconds) {
+this.waitTimeSeconds = waitTimeSeconds;
+}
+
@Override
public String toString() {
return SqsConfiguration[queueName= + queueName
@@ -169,9 +187,11 @@ public class SqsConfiguration {
+ , deleteAfterRead= + deleteAfterRead
+ , visibilityTimeout= + visibilityTimeout
+ , attributeNames= + attributeNames
++ , waitTimeSeconds= + waitTimeSeconds
+ , defaultVisibilityTimeout= + defaultVisibilityTimeout
+ , maximumMessageSize= + maximumMessageSize
+ , messageRetentionPeriod= + messageRetentionPeriod
++ , receiveMessageWaitTimeSeconds= +
receiveMessageWaitTimeSeconds
+ , delaySeconds= + delaySeconds
+ , policy= + policy
+ , extendMessageVisibility= + extendMessageVisibility
Modified:
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java?rev=1447190r1=1447189r2=1447190view=diff
==
---
camel/branches/camel-2.10.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
(original)
+++
[CONF] Apache Camel Merging commits from trunk to fixes branch
Merging commits from trunk to fixes branch Page edited by Bilgin Ibryam Changes (1) ... h2. What should be merged The idea is to be able to apply bug fixes and backwards compatible improvements and new features to our Camel maintenance branches (for example 2.7.x 2.10.x and 2.89.x) while leaving *NONE* backwards compatible changes on the trunk. The idea is to give our users the best experience possible on any supported branch as long we have 100% backward compatibility on patch versions. h3. What should be considered as NOT backwards compatible ... Full Content The Camel 2.x branches are here: https://svn.apache.org/repos/asf/camel/branches/ What should be merged The idea is to be able to apply bug fixes and backwards compatible improvements and new features to our Camel maintenance branches (for example 2.10.x and 2.9.x) while leaving NONE backwards compatible changes on the trunk. The idea is to give our users the best experience possible on any supported branch as long we have 100% backward compatibility on patch versions. What should be considered as NOT backwards compatible change in our public API change in the behavior of a component change in a default value of a component Changes which SHOULD apply to maintenance branches Bug fix which is backwards compatible Smaller improvement which is backwards compatible Small new feature which is backwards compatible Third party dependency updates on micro/patch versions (3rd digit) Changes which MUST NOT be applied to maintenance branches Bug fix which is NOT backwards compatible Improvement which is NOT backwards compatible New feature which is NOT backwards compatible Non trivial refactoring Changes which MAY be applied to maintenance branches For all the changes in this category we have to be especially carefully to not break backwards compatibly. Again, the goal is to be 100% backward compatibility on patch versions. Take extra time to review and test your change. Even better, send a [HEADS UP] on the dev@ mailing list and ask for assistance/review. Non trivial improvement which is backwards compatible Non trivial new feature which is backwards compatible Third party dependency updates on major or minor versions (1st and 2nd digit) Trivial refactoring Who should do the merge It is preferred that the committer who applied the change to trunk also merge it back to the maintenance branches. He knows best whether this fix should go into the maintenance branche(s) or not and he can also make sure the WIKI pages are up to date. However, other people may also merge fixes back if they require it there. In that case, those people should pay extra attention to make sure the changes meet the above criteria. How to merge Using svnmerge.py script I've set up svnmerge.py to track commits from the trunk to the 2.x branches. Example workflow: 1. You just committed a fix to the trunk in revision 123456 and think that it would be back ported to Camel 2.8.x users 2. Check out the branch svn co https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x camel-2.8.x 3. In camel-2.8.x directory, you can get a list of commits available from the trunk svnmerge.py avail 4. Merge your commit by running svnmerge.py merge -r 123456 5. Resolve any conflicts in the merge 6. Commit it by running svn ci -F svnmerge-commit-message.txt 7. If you have a JIRA associated with this fix, make sure it says fix for 2.8.x. Trouble with svnmerge.py If you have trouble with the svnmerge.py file such as Claus Ibsen had, then he attached an older svnmerge.py file, to this wiki page that works. Using DoMerges tool If you look in: http://svn.apache.org/repos/asf/cxf/trunk/bin/ there is a DoMerges.java file in there that you can compile and run from a fixes branch checkout. It pretty much walks you through the entire process of backporting fixes. It lists all the outstanding commits that haven't been reviewed, allows you to merge commits individually, block commits, show the diffs, etc. For the most part, it's quite easy to walk through a bunch of commits and merge things back with it. Takes very little time. To run the file do, from the directory with the branch. java DoMerges You need svnmerge.py to be runnable from the command line. There is a compiled .class of the DoMerges attached to this wiki page you can download. However its easy to compile the source file, as it has no other dependencies so its all plain javac DoMerges.java Using git If you already use git-svn, you could consider using the great git merge capabilities. Create a local branch from the remote tracking branch (e.g. camel-2.8.x) git checkout -b camel-2.8.x
svn commit: r1447205 - in /camel/branches/camel-2.9.x: ./ components/camel-cxf/ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/ components/camel-cxf/src/test/java/org/apache/camel/c
Author: ningjiang
Date: Mon Feb 18 11:39:58 2013
New Revision: 1447205
URL: http://svn.apache.org/r1447205
Log:
CAMEL-6084 Fix the issue that SOAP over JMS doesn't work with camel-cxf endpoint
Merged revisions 1447153 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
r1447153 | ningjiang | 2013-02-18 16:58:14 +0800 (Mon, 18 Feb 2013) | 10 lines
Merged revisions 1447146 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
r1447146 | ningjiang | 2013-02-18 16:27:17 +0800 (Mon, 18 Feb 2013) | 1 line
CAMEL-6084 Fix the issue that SOAP over JMS doesn't work with camel-cxf
endpoint
Added:
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/
- copied from r1447153,
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
- copied unchanged from r1447153,
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jms/CxfEndpointJMSConsumerTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/
- copied from r1447153,
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/
camel/branches/camel-2.9.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml
- copied unchanged from r1447153,
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
camel/branches/camel-2.9.x/components/camel-jms/ (props changed)
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1447146
Merged /camel/branches/camel-2.10.x:r1447153
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/pom.xml?rev=1447205r1=1447204r2=1447205view=diff
==
--- camel/branches/camel-2.9.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/pom.xml Mon Feb 18 11:39:58
2013
@@ -150,6 +150,20 @@
artifactIdcamel-test/artifactId
scopetest/scope
/dependency
+
+!-- test for the cxf jms transport --
+dependency
+ groupIdorg.apache.activemq/groupId
+ artifactIdactivemq-core/artifactId
+ scopetest/scope
+/dependency
+
+dependency
+ groupIdorg.apache.cxf/groupId
+ artifactIdcxf-rt-transports-jms/artifactId
+ version${cxf-version}/version
+ scopetest/scope
+/dependency
dependency
groupIdorg.apache.cxf/groupId
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1447205r1=1447204r2=1447205view=diff
==
---
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
Mon Feb 18 11:39:58 2013
@@ -76,7 +76,8 @@ public class CxfConsumer extends Default
}
}
-// NOTE this code cannot work with CXF 2.2.x
+// NOTE this code cannot work with CXF 2.2.x and JMSContinuation
+// as it doesn't break out the interceptor chain when we call it
private Object asyncInvoke(Exchange cxfExchange, final
Continuation continuation) {
synchronized (continuation) {
if (continuation.isNew()) {
@@ -114,7 +115,14 @@ public class CxfConsumer extends Default
private Continuation getContinuation(Exchange cxfExchange) {
ContinuationProvider provider =
(ContinuationProvider)cxfExchange.getInMessage().get(ContinuationProvider.class.getName());
-return provider == null ? null : provider.getContinuation();
+
svn commit: r850927 - in /websites/production/camel/content: articles.html cache/main.pageCache
Author: buildbot Date: Mon Feb 18 12:18:58 2013 New Revision: 850927 Log: Production update by buildbot for camel Modified: websites/production/camel/content/articles.html websites/production/camel/content/cache/main.pageCache Modified: websites/production/camel/content/articles.html == --- websites/production/camel/content/articles.html (original) +++ websites/production/camel/content/articles.html Mon Feb 18 12:18:58 2013 @@ -151,7 +151,7 @@ h2a shape=rect name=Articles-PodcastswhereCamelistakingpart/aPodcasts where Camel is taking part/h2 -ullia shape=rect class=external-link href=http://macstrac.blogspot.com/; rel=nofollowJames Strachan/a was a shape=rect class=external-link href=http://briefingsdirect.blogspot.com/2007/08/apache-camel-addresses-need-for.html; rel=nofollowinterviewed/a by a shape=rect class=external-link href=http://www.zoominfo.com/Search/PersonDetail.aspx?PersonID=338181amp;QueryID=0b37845a-9e13-492a-92e6-7ac8ac9707b7; rel=nofollowDana Gardner/a on a shape=rect href=index.html title=IndexApache Camel/a and its a shape=rect href=dsl.html title=DSLDSL/a and support for a shape=rect href=enterprise-integration-patterns.html title=Enterprise Integration PatternsEnterprise Integration Patterns/a. Read the a shape=rect class=external-link href=http://briefingsdirect.blogspot.com/2007/08/apache-camel-addresses-need-for.html; rel=nofollowtranscript/a or check out the a shape=rect class=external-link href=http://int erarbor.libsyn.com/index.php?post_id=245998 rel=nofollowpodcast/a/lilia shape=rect class=external-link href=http://techcast.chariotsolutions.com/index.php?post_id=503319; rel=nofollowEpisode 35 - A few beers with Chariot's Open Source Integration Experts/a - Chariot TechCast Episode 35 where they talk about: ServiceMix, Camel, FUSE, Mule, Spring Integration, EIP, ESB etc./lilia shape=rect class=external-link href=http://basementcoders.com/?p=684; rel=nofollowThe Basement Coders Episode 14 - Apache Camel/a - Basement Coders discusses Apache Camel. You may want to skip to the 25 minute where they start talking about Camel./lilia shape=rect class=external-link href=http://jbosscommunityasylum.libsyn.com/podcast-28-fuse-stories; rel=nofollowJBoss Asylum Podcast Episode 28 - Fuse stories/a - Podcast from January 2013 with James Strachan and Rob Davies with the background history and how they got into creating Apache Camel, and ho w they tink Camel has become such successful./li/ul +ullia shape=rect class=external-link href=http://macstrac.blogspot.com/; rel=nofollowJames Strachan/a was a shape=rect class=external-link href=http://briefingsdirect.blogspot.com/2007/08/apache-camel-addresses-need-for.html; rel=nofollowinterviewed/a by a shape=rect class=external-link href=http://www.zoominfo.com/Search/PersonDetail.aspx?PersonID=338181amp;QueryID=0b37845a-9e13-492a-92e6-7ac8ac9707b7; rel=nofollowDana Gardner/a on a shape=rect href=index.html title=IndexApache Camel/a and its a shape=rect href=dsl.html title=DSLDSL/a and support for a shape=rect href=enterprise-integration-patterns.html title=Enterprise Integration PatternsEnterprise Integration Patterns/a. Read the a shape=rect class=external-link href=http://briefingsdirect.blogspot.com/2007/08/apache-camel-addresses-need-for.html; rel=nofollowtranscript/a or check out the a shape=rect class=external-link href=http://int erarbor.libsyn.com/index.php?post_id=245998 rel=nofollowpodcast/a/lilia shape=rect class=external-link href=http://techcast.chariotsolutions.com/index.php?post_id=503319; rel=nofollowEpisode 35 - A few beers with Chariot's Open Source Integration Experts/a - Chariot TechCast Episode 35 where they talk about: ServiceMix, Camel, FUSE, Mule, Spring Integration, EIP, ESB etc./lilia shape=rect class=external-link href=http://basementcoders.com/?p=684; rel=nofollowThe Basement Coders Episode 14 - Apache Camel/a - Basement Coders discusses Apache Camel. You may want to skip to the 25 minute where they start talking about Camel./lilia shape=rect class=external-link href=http://jbosscommunityasylum.libsyn.com/podcast-28-fuse-stories; rel=nofollowJBoss Asylum Podcast Episode 28 - Fuse stories/a - Podcast from January 2013 with James Strachan and Rob Davies with the background history and how they got into creating Apache Camel, and ho w they tink Camel has become such successful./lilia shape=rect class=external-link href=http://cloudevangelist.org/2013/02/18/podcast-james-strachan-mr-apache-camel/; rel=nofollowPodcast James Strachan - Mr Apache Camel/a - Podcast from February 2013 with James Strachan about Apache Camel, integration and the cloud./li/ul Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available.
[CONF] Apache Camel AWS-SNS
AWS-SNS
Page edited by Bilgin Ibryam
Changes (1)
...
h3. URI Options || Name || Default Value || Context || Description ||
|amazonSNSClient | {{null}} | Producer | Reference to a {{com.amazonaws.services.sqns.AmazonSNSClient}} in the [Registry]. |
|accessKey | {{null}} | Producer | Amazon AWS Access Key | |secretKey | {{null}} | Producer | Amazon AWS Secret Key |
...
Full Content
SNS Component
Available as of Camel 2.8
The SNS component allows messages to be sent to an Amazon Simple Notification Topic. The implementation of the Amazon API is provided by theAWS SDK.
PrerequisitesYou must have a valid Amazon Web Services developer account, and be signed up to use Amazon SNS. More information are available at Amazon SNS.
URI Format
aws-sns://topicName[?options]
The topic will be created if they don't already exists.
You can append query options to the URI in the following format, ?options=valueoption2=value...
URI Options
Name
Default Value
Context
Description
amazonSNSClient
null
Producer
Reference to a com.amazonaws.services.sns.AmazonSNSClient in the Registry.
accessKey
null
Producer
Amazon AWS Access Key
secretKey
null
Producer
Amazon AWS Secret Key
subject
null
Producer
The subject which is used if the message header 'CamelAwsSnsSubject' is not present.
amazonSNSEndpoint
null
Producer
The region with which the AWS-SNS client wants to work with.
policy
null
Producer
Camel 2.8.4: The policy for this queue to set in the com.amazonaws.services.sns.model.SetTopicAttributesRequest.
Required SNS component optionsYou have to provide the amazonSNSClient in the Registry or your accessKey and secretKey to access the Amazon's SNS.
Usage
Message headers evaluated by the SNS producer
Header
Type
Description
CamelAwsSnsSubject
String
The Amazon SNS message subject. If not set, the subject from the SnsConfiguration is used.
Message headers set by the SNS producer
Header
Type
Description
CamelAwsSnsMessageId
String
The Amazon SNS message ID.
Advanced AmazonSNSClient configuration
If you need more control over the AmazonSNSClient configuration you can create your own instance and refer to it from the URI:
from("direct:start")
.to("aws-sns://MyTopic?amazonSNSClient=#amazonSNSClient");
The #amazonSNSClient refers to a AmazonSNSClient in the Registry.
For example if your Camel Application is running behind a firewall:
AWSCredentials awsCredentials = new BasicAWSCredentials("myAccessKey", "mySecretKey");
ClientConfiguration clientConfiguration = new ClientConfiguration();
clientConfiguration.setProxyHost("http://myProxyHost");
clientConfiguration.setProxyPort(8080);
AmazonSNSClient amazonSNSClient = new AmazonSNSClient(awsCredentials, clientConfiguration);
Dependencies
Maven users will need to add the following dependency to their pom.xml.
pom.xml
dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-aws/artifactId
version${camel-version}/version
/dependency
where ${camel-version} must be replaced by the actual version of Camel (2.8 or higher).
See Also
Configuring Camel
Component
Endpoint
Getting Started
AWS Component
Change Notification Preferences
View Online
|
View Changes
|
Add Comment
svn commit: r850964 - in /websites/production/camel/content: aws-sns.html cache/main.pageCache
Author: buildbot Date: Mon Feb 18 14:18:48 2013 New Revision: 850964 Log: Production update by buildbot for camel Modified: websites/production/camel/content/aws-sns.html websites/production/camel/content/cache/main.pageCache Modified: websites/production/camel/content/aws-sns.html == --- websites/production/camel/content/aws-sns.html (original) +++ websites/production/camel/content/aws-sns.html Mon Feb 18 14:18:48 2013 @@ -93,7 +93,7 @@ You can append query options to the URI h3a shape=rect name=AWS-SNS-URIOptions/aURI Options/h3 div class=table-wrap -table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Name /thth colspan=1 rowspan=1 class=confluenceTh Default Value /thth colspan=1 rowspan=1 class=confluenceTh Context /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTdamazonSNSClient /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Reference to a ttcom.amazonaws.services.sqs.AmazonSNSClient/tt in the a shape=rect href=registry.html title=RegistryRegistry/a. /td/trtrtd colspan=1 rowspan=1 class=confluenceTdaccessKey /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Amazon AWS Access Key /td/trtrtd colspan=1 rowspan=1 class=confluenceTdsecretKey /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Amazon AWS Secret Key /td/trtrtd colspan=1 rowspan=1 class=confluenceTdsubject /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd The subject which is used if the message header 'CamelAwsSnsSubject' is not present. /td/trtrtd colspan=1 rowspan=1 class=confluenceTdamazonSNSEndpoint /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd The region with which the AWS-SNS client wants to work with. /td/trtrtd colspan=1 row span=1 class=confluenceTdpolicy /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd bCamel 2.8.4/b: The policy for this queue to set in the ttcom.amazonaws.services.sns.model.SetTopicAttributesRequest/tt. /td/tr/tbody/table +table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Name /thth colspan=1 rowspan=1 class=confluenceTh Default Value /thth colspan=1 rowspan=1 class=confluenceTh Context /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTdamazonSNSClient /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Reference to a ttcom.amazonaws.services.sns.AmazonSNSClient/tt in the a shape=rect href=registry.html title=RegistryRegistry/a. /td/trtrtd colspan=1 rowspan=1 class=confluenceTdaccessKey /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Amazon AWS Access Key /td/trtrtd colspan=1 rowspan=1 class=confluenceTdsecretKey /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd Amazon AWS Secret Key /td/trtrtd colspan=1 rowspan=1 class=confluenceTdsubject /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd The subject which is used if the message header 'CamelAwsSnsSubject' is not present. /td/trtrtd colspan=1 rowspan=1 class=confluenceTdamazonSNSEndpoint /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd The region with which the AWS-SNS client wants to work with. /td/trtrtd colspan=1 row span=1 class=confluenceTdpolicy /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Producer /tdtd colspan=1 rowspan=1 class=confluenceTd bCamel 2.8.4/b: The policy for this queue to set in the ttcom.amazonaws.services.sns.model.SetTopicAttributesRequest/tt. /td/tr/tbody/table /div Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available.
[CONF] Apache Camel Tools
Tools Page edited by James Strachan Changes (1) ... * [Creating a new Camel Component] using a maven archetype * [JBI Service Unit Archetype] for creating a new [JBI] based Service Unit project h3. External Open Source Tools * [hawt.io|http://hawt.io/] is an open source HTML5 web application for visualising, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc * [Fuse IDE|https://github.com/fusesource/fuseide] is an open source set of eclipse plugins for creating Apache Camel projects, editing Camel routes, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. Full Content Tools This page gives a list of the various tools available for Camel Maven Tools Camel Maven Plugin for booting up Camel applications directly in maven to test it Creating a new Spring based Camel Route using a maven archetype Creating a new Camel Component using a maven archetype JBI Service Unit Archetype for creating a new JBI based Service Unit project External Open Source Tools hawt.io is an open source HTML5 web application for visualising, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc Fuse IDE is an open source set of eclipse plugins for creating Apache Camel projects, editing Camel routes, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. Change Notification Preferences View Online | View Changes | Add Comment
[CONF] Apache Camel Tools
Tools Page edited by James Strachan Changes (1) ... h3. External Open Source Tools * [hawt.io|http://hawt.io/] is an open source HTML5 web application for visualising, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. * [Fuse IDE|https://github.com/fusesource/fuseide] is an open source set of eclipse plugins for creating Apache Camel projects, editing Camel routes, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. Full Content Tools This page gives a list of the various tools available for Camel Maven Tools Camel Maven Plugin for booting up Camel applications directly in maven to test it Creating a new Spring based Camel Route using a maven archetype Creating a new Camel Component using a maven archetype JBI Service Unit Archetype for creating a new JBI based Service Unit project External Open Source Tools hawtio is an open source HTML5 web application for visualising, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. Fuse IDE is an open source set of eclipse plugins for creating Apache Camel projects, editing Camel routes, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc. Change Notification Preferences View Online | View Changes | Add Comment
svn commit: r1447385 - in /camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands: AbstractRouteCommand.java RouteResume.java RouteStart.java RouteStop.java
Author: cschneider
Date: Mon Feb 18 16:42:58 2013
New Revision: 1447385
URL: http://svn.apache.org/r1447385
Log:
CAMEL-5968 Consolidate route commands using actract command, solve
classnotfound exception with websphere jms
Added:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
- copied unchanged from r1436431,
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java?rev=1447385r1=1447384r2=1447385view=diff
==
---
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
Mon Feb 18 16:42:58 2013
@@ -16,44 +16,20 @@
*/
package org.apache.camel.karaf.commands;
-import java.util.List;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
-import org.apache.camel.karaf.commands.internal.RegexUtil;
-import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Command to resume a route.
*/
@Command(scope = camel, name = route-resume, description = Resume a Camel
route or a group of routes.)
-public class RouteResume extends OsgiCommandSupport {
-
-@Argument(index = 0, name = route, description = The Camel route ID or
a wildcard expression., required = true, multiValued = false)
-String route;
-
-@Argument(index = 1, name = context, description = The Camel context
name., required = false, multiValued = false)
-String context;
-
-private CamelController camelController;
-
-public void setCamelController(CamelController camelController) {
-this.camelController = camelController;
-}
+public class RouteResume extends AbstractRouteCommand {
-public Object doExecute() throws Exception {
-ListRoute camelRoutes = camelController.getRoutes(context,
RegexUtil.wildcardAsRegex(route));
-if (camelRoutes == null) {
-System.err.println(Camel routes using + route + not found.);
-return null;
-}
-for (Route camelRoute : camelRoutes) {
-CamelContext camelContext =
camelRoute.getRouteContext().getCamelContext();
-camelContext.resumeRoute(camelRoute.getId());
-}
-return null;
-}
+ @Override
+ public void executeOnRoute(CamelContext camelContext, Route camelRoute)
+ throws Exception {
+ camelContext.resumeRoute(camelRoute.getId());
+ }
}
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java?rev=1447385r1=1447384r2=1447385view=diff
==
---
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
Mon Feb 18 16:42:58 2013
@@ -16,45 +16,19 @@
*/
package org.apache.camel.karaf.commands;
-import java.util.List;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
-import org.apache.camel.karaf.commands.internal.RegexUtil;
-import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
* Command to start a route.
*/
@Command(scope = camel, name = route-start, description = Start a Camel
route or a group of routes)
-public class RouteStart extends OsgiCommandSupport {
-
-@Argument(index = 0, name = route, description = The Camel route ID or
a wildcard expression, required = true, multiValued = false)
-String route;
-
-
svn commit: r1447397 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/aggregate/ main/java/org/apache/camel/spi/ test/java/org/apache/camel/processor/aggregator/
Author: davsclaus
Date: Mon Feb 18 17:17:29 2013
New Revision: 1447397
URL: http://svn.apache.org/r1447397
Log:
CAMEL-6042: Polished. Thanks to Aaron Whiteside for the patch.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockingAwareAggregationStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AbstractDistributedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedCompletionIntervalTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockingAwareAggregationStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockingAwareAggregationStrategy.java?rev=1447397r1=1447396r2=1447397view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockingAwareAggregationStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockingAwareAggregationStrategy.java
Mon Feb 18 17:17:29 2013
@@ -22,14 +22,18 @@ import org.apache.camel.Exchange;
* A specialized {@link AggregationStrategy} which gets a callback when the
aggregated {@link Exchange} fails to add
* in the {@link org.apache.camel.spi.OptimisticLockingAggregationRepository}
because of
* an {@link
org.apache.camel.spi.OptimisticLockingAggregationRepository.OptimisticLockingException}.
- *
+ * p/
* Please note that when aggregating {@link Exchange}'s to be careful not to
modify and return the {@code oldExchange}
- * from the {@code aggregate()} method. If you are using the default
MemoryAggregationRepository this will mean you have
- * modified the value of an object already referenced/stored by the
MemoryAggregationRepository. This makes it impossible
- * for optimistic locking to work correctly with the
MemoryAggregationRepository.
- *
+ * from the {@link AggregationStrategy#aggregate(org.apache.camel.Exchange,
org.apache.camel.Exchange)} method.
+ * If you are using the default MemoryAggregationRepository this will mean you
have modified the value of an object
+ * already referenced/stored by the MemoryAggregationRepository. This makes it
impossible for optimistic locking
+ * to work correctly with the MemoryAggregationRepository.
+ * p/
* You should instead return either the new {@code newExchange} or a
completely new instance of {@link Exchange}. This
- * is due to the nature of how the underlying {@link
java.util.concurrent.ConcurrentHashMap} performs CAS operations on the value
identity.
+ * is due to the nature of how the underlying {@link
java.util.concurrent.ConcurrentHashMap} performs CAS operations
+ * on the value identity.
+ *
+ * @see java.util.concurrent.ConcurrentHashMap
*
* @version
*/
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java?rev=1447397r1=1447396r2=1447397view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
Mon Feb 18 17:17:29 2013
@@ -26,6 +26,8 @@ import org.apache.camel.Exchange;
* If the underlying implementation cannot perform optimistic locking, it
should
* not implement this interface.
*
+ * @see org.apache.camel.processor.aggregate.MemoryAggregationRepository
+ *
* @version
*/
public interface OptimisticLockingAggregationRepository extends
AggregationRepository {
@@ -40,8 +42,27 @@ public interface OptimisticLockingAggreg
/**
* Add the given {@link org.apache.camel.Exchange} under the correlation
key.
* p/
- * Will perform optimistic locking to replace expected existing exchange
with
- * the new supplied exchange.
+ * Will perform optimistic locking to replace expected existing exchange
with the new supplied exchange.
+ * p/
+ * If the {@code oldExchange} is null the underlying implementation is to
assume this is the very first Exchange for the
+ * supplied correlation key. When the implementation comes to store to the
Exchange if there is already an existing
+ * Exchange present for this correlation key the implementation should
throw an OptimisticLockingException.
+ * p/
+ * If the {@code oldExchange} is not null the underlying implementation
should use it to compare with the existing exchange
+ * when doing an
svn commit: r851013 - in /websites/production/camel/content: cache/main.pageCache tools.html
Author: buildbot Date: Mon Feb 18 17:18:22 2013 New Revision: 851013 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/tools.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/tools.html == --- websites/production/camel/content/tools.html (original) +++ websites/production/camel/content/tools.html Mon Feb 18 17:18:22 2013 @@ -82,6 +82,11 @@ h3a shape=rect name=Tools-MavenTools/aMaven Tools/h3 ullia shape=rect href=camel-maven-plugin.html title=Camel Maven PluginCamel Maven Plugin/a for booting up Camel applications directly in maven to test it/lilia shape=rect href=creating-a-new-spring-based-camel-route.html title=Creating a new Spring based Camel RouteCreating a new Spring based Camel Route/a using a maven archetype/lilia shape=rect href=creating-a-new-camel-component.html title=Creating a new Camel ComponentCreating a new Camel Component/a using a maven archetype/lilia shape=rect href=jbi-service-unit-archetype.html title=JBI Service Unit ArchetypeJBI Service Unit Archetype/a for creating a new a shape=rect href=jbi.html title=JBIJBI/a based Service Unit project/li/ul + + +h3a shape=rect name=Tools-ExternalOpenSourceTools/aExternal Open Source Tools/h3 + +ullia shape=rect class=external-link href=http://hawt.io/; rel=nofollowhawtio/a is an open source HTML5 web application for visualising, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc./lilia shape=rect class=external-link href=https://github.com/fusesource/fuseide; rel=nofollowFuse IDE/a is an open source set of eclipse plugins for creating Apache Camel projects, editing Camel routes, starting/stopping and tracing Apache Camel routes, browsing endpoints, sending messages to endpoints as well as browsing and sending to ActiveMQ destinations, viewing logs and metric charting etc./li/ul /div /td td valign=top
[CONF] Apache Camel Spring LDAP
Spring LDAP Page added by Leonid Kof Specification of the component to come soon. Change Notification Preferences View Online | Add Comment
svn commit: r851048 - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html components.html spring-ldap.html transport.html uris.
Author: buildbot Date: Mon Feb 18 20:24:07 2013 New Revision: 851048 Log: Production update by buildbot for camel Added: websites/production/camel/content/spring-ldap.html Modified: websites/production/camel/content/book-architecture.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/component-list.html websites/production/camel/content/components.html websites/production/camel/content/transport.html websites/production/camel/content/uris.html Modified: websites/production/camel/content/book-architecture.html == --- websites/production/camel/content/book-architecture.html (original) +++ websites/production/camel/content/book-architecture.html Mon Feb 18 20:24:07 2013 @@ -612,7 +612,7 @@ sips://user@host[:port]?[options] pre class=code-xml sjms:[topic:]destinationName?[options] /pre -/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd A ground up implementation of a JMS client /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=mail.html title=MailSMTP/a / camel-mail +/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd A ground up implementation of a JMS client /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=mail.html title=MailSMTP/a / camel-mail div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-xml smtp://user-info@host[:port] @@ -642,7 +642,12 @@ spring-batch:job[?options] pre class=code-xml spring-integration:defaultChannelName /pre -/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd The bridge component of Camel and a shape=rect class=external-link href=http://www.springframework.org/spring-integration; rel=nofollowSpring Integration/a /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=spring-web-services.html title=Spring Web ServicesSpring Web Services/a / camel-spring-ws +/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd The bridge component of Camel and a shape=rect class=external-link href=http://www.springframework.org/spring-integration; rel=nofollowSpring Integration/a /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=spring-ldap.html title=Spring LDAPSpring LDAP/a / camel-spring-ldap +div class=code panel style=border-width: 1px;div class=codeContent panelContent +pre class=code-xml +spring-ldap:spring-ldap-template-bean?options +/pre +/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Camel wrapper for a shape=rect class=external-link href=http://www.springsource.org/ldap; rel=nofollowSpring LDAP/a /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=spring-web-services.html title=Spring Web ServicesSpring Web Services/a / camel-spring-ws div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-xml spring-ws:[mapping-type:]address[?options] @@ -662,7 +667,7 @@ ssh:[username[:password]@]host[:port][?o pre class=code-xml stax:contentHandlerClassName /pre -/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Process messages through a SAX a shape=rect class=external-link href=http://download.oracle.com/javase/6/docs/api/org/xml/sax/ContentHandler.html; rel=nofollowContentHandler/a. /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=stream.html title=StreamStream/a / camel-stream +/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Process messages through a SAX a shape=rect class=external-link href=http://download.oracle.com/javase/6/docs/api/org/xml/sax/ContentHandler.html; rel=nofollowContentHandler/a. /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=stream.html title=StreamStream/a / camel-stream div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-xml stream:[in|out|err|file] @@ -725,22 +730,22 @@ websocket://host:port/path /div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Communicating with a shape=rect class=external-link href=http://wiki.eclipse.org/Jetty/Feature/WebSockets; rel=nofollowWebsocket/a clients /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=xmpp.html title=XMPP and Jabber supportXMPP/a / camel-xmpp div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-xml -xmpp://host:port/room +xmpp://host:port/room /pre -/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Working with XMPP and Jabber /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=xquery-endpoint.html title=XQuery EndpointXQuery/a / camel-saxon +/div/div /tdtd colspan=1 rowspan=1 class=confluenceTd Working with XMPP and Jabber /td/trtrtd colspan=1 rowspan=1 class=confluenceTd a shape=rect href=xquery-endpoint.html title=XQuery EndpointXQuery/a / camel-saxon div class=code panel style=border-width:
svn commit: r1447597 - in /camel/branches/camel-2.10.x/platforms/karaf/features: pom.xml src/main/resources/features.xml
Author: hadrian
Date: Tue Feb 19 06:02:15 2013
New Revision: 1447597
URL: http://svn.apache.org/r1447597
Log:
Feature validation: use patch version for cxf features
Modified:
camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml?rev=1447597r1=1447596r2=1447597view=diff
==
--- camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml Tue Feb 19
06:02:15 2013
@@ -53,6 +53,7 @@
commons-math-version2.2/commons-math-version
commons-dbcp-bundle-version1.4_3/commons-dbcp-bundle-version
commons-lang-version-xmljson2.5/commons-lang-version-xmljson
+ cxf-features-version2.6.6.1/cxf-features-version
dom4j-bundle-version1.6.1_5/dom4j-bundle-version
el-api-1.0-version1.0.1/el-api-1.0-version
ezmorph-bundle-version1.0.6_1/ezmorph-bundle-version
Modified:
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml?rev=1447597r1=1447596r2=1447597view=diff
==
---
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/features/src/main/resources/features.xml
Tue Feb 19 06:02:15 2013
@@ -18,7 +18,8 @@
--
features name='camel-${project.version}'
-
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
+
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-features-version}/xml/features/repository
+ !--
repositorymvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features/repository
--
repositorymvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features/repository
feature name='xml-specs-api' version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'
