git commit: fixed the wrong maven module version number
Updated Branches: refs/heads/camel-2.11.x 448f53880 - c9acef1af fixed the wrong maven module version number Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9acef1a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9acef1a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9acef1a Branch: refs/heads/camel-2.11.x Commit: c9acef1af5b9b900bf21ab7d8e37c620104fd415 Parents: 448f538 Author: cmueller cmuel...@apache.org Authored: Mon May 6 23:20:50 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 6 23:20:50 2013 +0200 -- components/camel-ical/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c9acef1a/components/camel-ical/pom.xml -- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index 2e297f3..4f4c197 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -7,7 +7,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.12-SNAPSHOT/version +version2.11.1-SNAPSHOT/version /parent artifactIdcamel-ical/artifactId
git commit: fixed the wrong maven module version number
Updated Branches: refs/heads/camel-2.10.x b9b2617a4 - 865ab1af8 fixed the wrong maven module version number Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/865ab1af Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/865ab1af Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/865ab1af Branch: refs/heads/camel-2.10.x Commit: 865ab1af83f7b50c750d03dfc4bc347fa0c808ce Parents: b9b2617 Author: cmueller cmuel...@apache.org Authored: Mon May 6 23:24:39 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Mon May 6 23:24:39 2013 +0200 -- components/camel-ical/pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/865ab1af/components/camel-ical/pom.xml -- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index 2e297f3..63c91c5 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -7,7 +7,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.12-SNAPSHOT/version +version2.10.5-SNAPSHOT/version /parent artifactIdcamel-ical/artifactId
svn commit: r1477291 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint: RsClientDefinitionParser.java RsServerDefinitionParser.java
Author: cmueller
Date: Mon Apr 29 19:35:42 2013
New Revision: 1477291
URL: http://svn.apache.org/r1477291
Log:
fixed the sonar issue: Correctness - An apparent infinite loop
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1477291r1=1477290r2=1477291view=diff
==
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
Mon Apr 29 19:35:42 2013
@@ -56,8 +56,7 @@ public class RsClientDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name) || headers.equals(name)) {
Metadata map = parseMapData(context, beanMetadata, elem);
@@ -80,7 +79,6 @@ public class RsClientDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1477291r1=1477290r2=1477291view=diff
==
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Mon Apr 29 19:35:42 2013
@@ -56,8 +56,7 @@ public class RsServerDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name)
|| extensionMappings.equals(name)
@@ -83,7 +82,6 @@ public class RsServerDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
svn commit: r1477304 - in /camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint: RsClientDefinitionParser.java RsServerDefinitionParser.java
Author: cmueller
Date: Mon Apr 29 19:52:31 2013
New Revision: 1477304
URL: http://svn.apache.org/r1477304
Log:
fixed the sonar issue: Correctness - An apparent infinite loop
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1477304r1=1477303r2=1477304view=diff
==
---
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
(original)
+++
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
Mon Apr 29 19:52:31 2013
@@ -56,8 +56,7 @@ public class RsClientDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name) || headers.equals(name)) {
Metadata map = parseMapData(context, beanMetadata, elem);
@@ -80,7 +79,6 @@ public class RsClientDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1477304r1=1477303r2=1477304view=diff
==
---
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
(original)
+++
camel/branches/camel-2.11.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Mon Apr 29 19:52:31 2013
@@ -56,8 +56,7 @@ public class RsServerDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name)
|| extensionMappings.equals(name)
@@ -83,7 +82,6 @@ public class RsServerDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
svn commit: r1477313 - in /camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint: RsClientDefinitionParser.java RsServerDefinitionParser.java
Author: cmueller
Date: Mon Apr 29 20:10:59 2013
New Revision: 1477313
URL: http://svn.apache.org/r1477313
Log:
fixed the sonar issue: Correctness - An apparent infinite loop
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1477313r1=1477312r2=1477313view=diff
==
---
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
Mon Apr 29 20:10:59 2013
@@ -56,8 +56,7 @@ public class RsClientDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name) || headers.equals(name)) {
Metadata map = parseMapData(context, beanMetadata, elem);
@@ -80,7 +79,6 @@ public class RsClientDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java?rev=1477313r1=1477312r2=1477313view=diff
==
---
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsServerDefinitionParser.java
Mon Apr 29 20:10:59 2013
@@ -56,8 +56,7 @@ public class RsServerDefinitionParser ex
}
}
-Element elem = DOMUtils.getFirstElement(element);
-while (elem != null) {
+for (Element elem = DOMUtils.getFirstElement(element); elem != null;
elem = DOMUtils.getNextElement(elem)) {
String name = elem.getLocalName();
if (properties.equals(name)
|| extensionMappings.equals(name)
@@ -83,7 +82,6 @@ public class RsServerDefinitionParser ex
} else {
setFirstChildAsProperty(elem, context, beanMetadata, name);
}
-elem = DOMUtils.getNextElement(elem);
}
if (StringUtils.isEmpty(bus)) {
svn commit: r1477321 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/component/bean/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/processor/re
Author: cmueller
Date: Mon Apr 29 20:29:56 2013
New Revision: 1477321
URL: http://svn.apache.org/r1477321
Log:
fixed some sonar issue: Empty If Stmt
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1477321r1=1477320r2=1477321view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Mon Apr 29 20:29:56 2013
@@ -407,8 +407,6 @@ public class BeanInfo {
LOG.trace(Parameter #{} is the body parameter using
expression {}, i, expression);
parameterInfo.setExpression(expression);
bodyParameters.add(parameterInfo);
-} else {
-// will ignore the expression for parameter evaluation
}
}
LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1477321r1=1477320r2=1477321view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Mon Apr 29 20:29:56 2013
@@ -2014,9 +2014,7 @@ public class DefaultCamelContext extends
// check in existing already started as well
for (RouteStartupOrder order : routeStartupOrder) {
String otherId = order.getRoute().getId();
-if (answer.getRoute().getId().equals(otherId)) {
-// its the same route id so skip clash check as its the same
route (can happen when using suspend/resume)
-} else if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getStartupOrder() == order.getStartupOrder()) {
throw new
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash.
Route + otherId + already has startupOrder
+ answer.getStartupOrder() + configured which this route
have as well. Please correct startupOrder to be unique among all your routes.);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=1477321r1=1477320r2=1477321view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
Mon Apr 29 20:29:56 2013
@@ -224,11 +224,7 @@ public class ResequencerEngineE {
}
// start delivery if current element is successor of last delivered
element
-if (successorOfLastDelivered(element)) {
-// nothing to schedule
-} else if (sequence.predecessor(element) != null) {
-// nothing to schedule
-} else {
+if (!successorOfLastDelivered(element)
sequence.predecessor(element) != null) {
element.schedule(defineTimeout());
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1477321r1=1477320r2=1477321view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Mon Apr 29 20:29:56 2013
@@ -260,9 +260,7 @@ public final class ExchangeHelper {
if (result == source) {
// we just
svn commit: r1477324 - in /camel/branches/camel-2.11.x: camel-core/src/main/java/org/apache/camel/component/bean/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/ca
Author: cmueller
Date: Mon Apr 29 20:32:18 2013
New Revision: 1477324
URL: http://svn.apache.org/r1477324
Log:
fixed some sonar issue: Empty If Stmt
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/branches/camel-2.11.x/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/branches/camel-2.11.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1477324r1=1477323r2=1477324view=diff
==
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Mon Apr 29 20:32:18 2013
@@ -407,8 +407,6 @@ public class BeanInfo {
LOG.trace(Parameter #{} is the body parameter using
expression {}, i, expression);
parameterInfo.setExpression(expression);
bodyParameters.add(parameterInfo);
-} else {
-// will ignore the expression for parameter evaluation
}
}
LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1477324r1=1477323r2=1477324view=diff
==
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Mon Apr 29 20:32:18 2013
@@ -2014,9 +2014,7 @@ public class DefaultCamelContext extends
// check in existing already started as well
for (RouteStartupOrder order : routeStartupOrder) {
String otherId = order.getRoute().getId();
-if (answer.getRoute().getId().equals(otherId)) {
-// its the same route id so skip clash check as its the same
route (can happen when using suspend/resume)
-} else if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getStartupOrder() == order.getStartupOrder()) {
throw new
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash.
Route + otherId + already has startupOrder
+ answer.getStartupOrder() + configured which this route
have as well. Please correct startupOrder to be unique among all your routes.);
}
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=1477324r1=1477323r2=1477324view=diff
==
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
Mon Apr 29 20:32:18 2013
@@ -224,11 +224,7 @@ public class ResequencerEngineE {
}
// start delivery if current element is successor of last delivered
element
-if (successorOfLastDelivered(element)) {
-// nothing to schedule
-} else if (sequence.predecessor(element) != null) {
-// nothing to schedule
-} else {
+if (!successorOfLastDelivered(element)
sequence.predecessor(element) != null) {
element.schedule(defineTimeout());
}
}
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1477324r1=1477323r2=1477324view=diff
svn commit: r1477325 - in /camel/branches/camel-2.10.x: camel-core/src/main/java/org/apache/camel/component/bean/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/ca
Author: cmueller
Date: Mon Apr 29 20:33:20 2013
New Revision: 1477325
URL: http://svn.apache.org/r1477325
Log:
fixed some sonar issue: Empty If Stmt
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/branches/camel-2.10.x/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1477325r1=1477324r2=1477325view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Mon Apr 29 20:33:20 2013
@@ -388,8 +388,6 @@ public class BeanInfo {
LOG.trace(Parameter #{} is the body parameter using
expression {}, i, expression);
parameterInfo.setExpression(expression);
bodyParameters.add(parameterInfo);
-} else {
-// will ignore the expression for parameter evaluation
}
}
LOG.trace(Parameter #{} has parameter info: , i, parameterInfo);
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1477325r1=1477324r2=1477325view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Mon Apr 29 20:33:20 2013
@@ -1985,9 +1985,7 @@ public class DefaultCamelContext extends
// check in existing already started as well
for (RouteStartupOrder order : routeStartupOrder) {
String otherId = order.getRoute().getId();
-if (answer.getRoute().getId().equals(otherId)) {
-// its the same route id so skip clash check as its the same
route (can happen when using suspend/resume)
-} else if (answer.getStartupOrder() == order.getStartupOrder()) {
+if (answer.getStartupOrder() == order.getStartupOrder()) {
throw new
FailedToStartRouteException(answer.getRoute().getId(), startupOrder clash.
Route + otherId + already has startupOrder
+ answer.getStartupOrder() + configured which this route
have as well. Please correct startupOrder to be unique among all your routes.);
}
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=1477325r1=1477324r2=1477325view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
Mon Apr 29 20:33:20 2013
@@ -205,11 +205,7 @@ public class ResequencerEngineE {
}
// start delivery if current element is successor of last delivered
element
-if (successorOfLastDelivered(element)) {
-// nothing to schedule
-} else if (sequence.predecessor(element) != null) {
-// nothing to schedule
-} else {
+if (!successorOfLastDelivered(element)
sequence.predecessor(element) != null) {
element.schedule(defineTimeout());
}
}
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1477325r1=1477324r2=1477325view=diff
svn commit: r1875 - /release/camel/apache-camel/2.9.7/
Author: cmueller Date: Sun Apr 28 08:43:01 2013 New Revision: 1875 Log: Apache Camel 2.9.7 release distro placeholder. Added: release/camel/apache-camel/2.9.7/
svn commit: r860164 [3/3] - in /websites/production/camel/content/manual: camel-manual-2.9.7.html camel-manual-2.9.7.pdf
Added: websites/production/camel/content/manual/camel-manual-2.9.7.pdf == Binary file - no diff available. Propchange: websites/production/camel/content/manual/camel-manual-2.9.7.pdf -- svn:mime-type = application/pdf
svn commit: r860164 [1/3] - in /websites/production/camel/content/manual: camel-manual-2.9.7.html camel-manual-2.9.7.pdf
Author: cmueller Date: Sun Apr 28 09:03:07 2013 New Revision: 860164 Log: Uploading released manuals for camel-2.9.7 Added: websites/production/camel/content/manual/camel-manual-2.9.7.html websites/production/camel/content/manual/camel-manual-2.9.7.pdf (with props)
svn commit: r1476791 - in /camel/branches/camel-2.9.x: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Sun Apr 28 15:59:29 2013 New Revision: 1476791 URL: http://svn.apache.org/r1476791 Log: updated the version numbers with was not updated by the maven release plugin Modified: camel/branches/camel-2.9.x/etc/pom.xml camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml camel/branches/camel-2.9.x/tests/camel-performance/pom.xml Modified: camel/branches/camel-2.9.x/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/etc/pom.xml?rev=1476791r1=1476790r2=1476791view=diff == --- camel/branches/camel-2.9.x/etc/pom.xml (original) +++ camel/branches/camel-2.9.x/etc/pom.xml Sun Apr 28 15:59:29 2013 @@ -25,7 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.8-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId Modified: camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml?rev=1476791r1=1476790r2=1476791view=diff == --- camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml Sun Apr 28 15:59:29 2013 @@ -25,7 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.8-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml?rev=1476791r1=1476790r2=1476791view=diff == --- camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml Sun Apr 28 15:59:29 2013 @@ -24,7 +24,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.8-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/pom.xml?rev=1476791r1=1476790r2=1476791view=diff == --- camel/branches/camel-2.9.x/tests/camel-performance/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/pom.xml Sun Apr 28 15:59:29 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.9.7-SNAPSHOT/version +version2.9.8-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1476796 - in /camel/branches/camel-2.9.x/components: camel-cxf/src/main/resources/META-INF/ camel-spring-integration/src/main/resources/META-INF/ camel-spring-security/src/main/resources/
Author: cmueller
Date: Sun Apr 28 16:55:00 2013
New Revision: 1476796
URL: http://svn.apache.org/r1476796
Log:
add the release version number to the spring schema files
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1476796r1=1476795r2=1476796view=diff
==
---
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Sun Apr 28 16:55:00 2013
@@ -48,4 +48,5 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.7.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1476796r1=1476795r2=1476796view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Sun Apr 28 16:55:00 2013
@@ -47,4 +47,5 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.7.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1476796r1=1476795r2=1476796view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Sun Apr 28 16:55:00 2013
@@ -41,4 +41,5 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.4.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.5.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.6.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.7.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas?rev=1476796r1=1476795r2=1476796view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Sun Apr 28 16:55:00 2013
@@ -49,6 +49,7 @@ http\://camel.apache.org/schema/spring/c
http\://camel.apache.org/schema/spring/camel-spring-2.9.4.xsd=camel-spring.xsd
http
svn commit: r860267 - /websites/production/camel/content/cache/main.pageCache
Author: cmueller Date: Mon Apr 29 05:39:20 2013 New Revision: 860267 Log: trigger a full site export Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r1471336 - in /camel/branches/camel-2.9.x: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Wed Apr 24 09:55:17 2013 New Revision: 1471336 URL: http://svn.apache.org/r1471336 Log: fixed the version number which was not incremented by the maven release plugin Modified: camel/branches/camel-2.9.x/etc/pom.xml camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml camel/branches/camel-2.9.x/tests/camel-performance/pom.xml Modified: camel/branches/camel-2.9.x/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/etc/pom.xml?rev=1471336r1=1471335r2=1471336view=diff == --- camel/branches/camel-2.9.x/etc/pom.xml (original) +++ camel/branches/camel-2.9.x/etc/pom.xml Wed Apr 24 09:55:17 2013 @@ -25,8 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.3-SNAPSHOT/version -relativePath../parent/relativePath +version2.9.7-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId Modified: camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml?rev=1471336r1=1471335r2=1471336view=diff == --- camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-itest-karaf/pom.xml Wed Apr 24 09:55:17 2013 @@ -25,7 +25,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.1-SNAPSHOT/version +version2.9.7-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml?rev=1471336r1=1471335r2=1471336view=diff == --- camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-itest-osgi/pom.xml Wed Apr 24 09:55:17 2013 @@ -24,7 +24,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.5-SNAPSHOT/version +version2.9.7-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/pom.xml?rev=1471336r1=1471335r2=1471336view=diff == --- camel/branches/camel-2.9.x/tests/camel-performance/pom.xml (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/pom.xml Wed Apr 24 09:55:17 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.9.6-SNAPSHOT/version +version2.9.7-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1471581 [2/2] - in /camel/branches/camel-2.9.x: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/came
Modified: camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml Wed Apr 24 18:18:48 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version /parent artifactIdcamel-xmlsecurity/artifactId Modified: camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml Wed Apr 24 18:18:48 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/components/camel-xstream/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xstream/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/components/camel-xstream/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xstream/pom.xml Wed Apr 24 18:18:48 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml Wed Apr 24 18:18:48 2013 @@ -22,7 +22,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.9.7-SNAPSHOT/version +version2.9.7/version /parent artifactIdcamel-zookeeper/artifactId Modified: camel/branches/camel-2.9.x/components/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/components/pom.xml (original) +++ camel/branches/camel-2.9.x/components/pom.xml Wed Apr 24 18:18:48 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version relativePath../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml Wed Apr 24 18:18:48 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdexamples/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version relativePath../relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml?rev=1471581r1=1471580r2=1471581view=diff == --- camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml Wed Apr 24 18:18:48 2013 @@ -24,7 +24,7 @@ parent groupIdorg.apache.camel/groupId artifactIdexamples/artifactId -version2.9.7-SNAPSHOT/version +version2.9.7/version relativePath../relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-cafe/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-cafe/pom.xml?rev=1471581r1=1471580r2=1471581view=diff ==
svn commit: r1471584 - /camel/tags/camel-2.9.7/
Author: cmueller Date: Wed Apr 24 18:20:30 2013 New Revision: 1471584 URL: http://svn.apache.org/r1471584 Log: [maven-release-plugin] copy for tag camel-2.9.7 Added: camel/tags/camel-2.9.7/ (props changed) - copied from r1471583, camel/branches/camel-2.9.x/ Propchange: camel/tags/camel-2.9.7/ -- --- svn:ignore (added) +++ svn:ignore Wed Apr 24 18:20:30 2013 @@ -0,0 +1,16 @@ +.pmd +.checkstyle +.ruleset +target +.settings +.classpath +.project +.wtpmodules +prj.el +.jdee_classpath +.jdee_sources +velocity.log +eclipse-classes +*.ipr +*.iml +*.iws Propchange: camel/tags/camel-2.9.7/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Apr 24 18:20:30 2013 @@ -0,0 +1,2 @@ +/camel/branches/camel-2.10.x:1359022,1359231,1359269,1359343,1360041,1360530,1360659,1360663,1360727,1361198,1361207,1361920,1365016,1365071,1365629,1366590,1366592,1369492,1369672,1370656,1370787,1372247,1372249,1372330,1372356,1372487,1372834,1372846,1372865,1373709-1373714,1373725,1374134,1374291,1374384,1374391,1374535,1374891,1375442,1375937,1376895,1377249,1377273,1377403,1377408,1377415,1377611,1379322,1379326,1380237,1380418,1381138,1381183,1382047,1382417,1382897,1383231,1383835,1383837,1383859,1384125,1384240,1384318,1384375,1384453,1384616,1384818,1386595,1386609,1387024,1387029,1387588,1388763,1389253,1389329,1389815,1390890,1390947,1391009,1391024,1391045,1391341,1391349,1391374,1391379,1391440,1391469,1391956,1391960,1392870,1393292,1394389,1394409,1394481,1394933-1394934,1394978,1394992,1395050,1395228,1395582,1395646,1395884,1398790,1398814,1399324,1399335,1399520,1399809,1400352,1400404,1400833,1400864,1401173,1401210,1401266,1402468,1402502,1403972,1403975, 1403998,1404028,1404057,1404061,1404295,1404558,1404935,1405314,1405679,1406086,1406515,1406957,1407397,1407753,1407766,1408696,1410235,1410955,1410960,1411079,1411232,1411417,1412126,1412147,1412775,1413326,1414025,1414823,1414837,1414858,1415130,1415565,1418242,1418618,1418710,1419244,1419248,1419316,1419760,1420526-1420527,1420537,1421314,1421713,1421730-1421731,1421769,1422233,1422247,1422793,1422808,1422959,1422966,1423309,1423317,1424439,1425263,1426749,1427682,1427844,1427854,1428477,1429219,1429516,1429711,1430732,1430868,1431281,1431338,1431630,1431644,1431655,1431706,1431788,1431833-1431834,1431840,1431900-1431904,1431939,1433892,1435220,1435498,1435581,1436246,1436442,1436945,1436981,1437285,1438031,1438364,1438381,1438525,1438677,1439643,1439773,1440281,1441337,1442493,1443516,1443542,1443645,1444367,1445065,1445069,1445484,1446239,1446861,1447153,1448498,1451546,1452380,1453733,1453804,1455433,1461750,1467172,1467330,1467886,1468007,1469705,1470421 +/camel/trunk:1292164,1300914,1326358,1326469,1326481,1326487,1326525,1326975,1327399,1327402,1327435,1327447,1327449-1327450,1327493,1327566,1328278,1328392,1328614,1328675,1328722,1328814,1328822,1328837,1328841,1328843,1328854,1328885,1329068,1329079,1329091,1329109,1329135,1329190,1329365,1330140,1330208,1330225,1330654,1330670,1331273,1331278,1331542,1331758,1331764,1331907,1331910,1331928,1332061,1332115,1332533-1332534,1332647,165,1333436,1333772,1334332,1335527,1335969,1336004,1336507,1337464,1337495,1339962,1340689,1340733,1340818,1340961,1340972,1341227,1341383,1341441,1341811,1341908,1341957,1341978,1342143,1342218,1342278,1342300-1342301,1342313,1342317,1343635,1343704,1343758,1344532-1344533,1344595,1344597,1344631,1345499,1345633,1345844,1345906,1345931,1346059,1346281,1346811,1347682,1347886,1347901,1348116,1348138,1348341,1348732,1349330,1349704,1349765,1350031,1350662,1350909,1351237,1351342,1351972,1352108,1352451,1352459,1353601,1353613,1354863,1354942, 1355003,1355261,1355270,1355326,1355404,1355428,1355774,1357114,1357244,1357254,1358701,1358941,1358963,1359013,1359226,1359265,1359341,1360031,1360527,1360581,1360583,1360719,1361116-1361117,1361919,1365013,1365061,1365616,1365917,1365939,1366272,1369490,1369671,1370254,1370783,1371570,1371967,1372244-1372245,1372329,1372354,1372485,1372833,1372845,1372863,1373374,1373691-1373692,1373722,1374110,1374133,1374290,1374388,1374530,1374582-1374584,1374709,1375439,1375936,1376870,1377243,1377272,1377402,1377407,1377413,1377608,1378825,1378827,1379320,1379324,1379354,1380157,1380232,1381089,1381182,1382039,1382416,1383220,1383824,1383826,1383858,1384122,1384226,1384316,1384369,1384447,1384609,1384815,1386495,1386607,1387019-1387020,1387545,1387808,1388762,1389251,1389326,1389813,1390820,1390946,1391008,1391021,1391044,1391339,1391346,1391373,1391378,1391439,1391466,1391954,1391958,1392188,1392869,1393291,1393962,1394388,1394408,1394479,1394577,1394932,1394991,1395226,1395580,13956
svn commit: r1471588 [2/2] - in /camel/branches/camel-2.9.x: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/came
Modified: camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xmlsecurity/pom.xml Wed Apr 24 18:23:52 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcomponents/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version /parent artifactIdcamel-xmlsecurity/artifactId Modified: camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xmpp/pom.xml Wed Apr 24 18:23:52 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/components/camel-xstream/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-xstream/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/components/camel-xstream/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-xstream/pom.xml Wed Apr 24 18:23:52 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version relativePath../../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-zookeeper/pom.xml Wed Apr 24 18:23:52 2013 @@ -22,7 +22,7 @@ parent artifactIdcomponents/artifactId groupIdorg.apache.camel/groupId -version2.9.7/version +version2.9.8-SNAPSHOT/version /parent artifactIdcamel-zookeeper/artifactId Modified: camel/branches/camel-2.9.x/components/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/components/pom.xml (original) +++ camel/branches/camel-2.9.x/components/pom.xml Wed Apr 24 18:23:52 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version relativePath../parent/relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-aggregate/pom.xml Wed Apr 24 18:23:52 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdexamples/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version relativePath../relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml?rev=1471588r1=1471587r2=1471588view=diff == --- camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-bam/pom.xml Wed Apr 24 18:23:52 2013 @@ -24,7 +24,7 @@ parent groupIdorg.apache.camel/groupId artifactIdexamples/artifactId -version2.9.7/version +version2.9.8-SNAPSHOT/version relativePath../relativePath /parent Modified: camel/branches/camel-2.9.x/examples/camel-example-cafe/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-cafe/pom.xml?rev=1471588r1=1471587r2=1471588view=diff ==
svn commit: r859560 - /websites/production/camel/content/cache/main.pageCache
Author: cmueller Date: Tue Apr 23 06:02:54 2013 New Revision: 859560 Log: trigger a full export of the Camel WIKI sites Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r1471174 - /camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
Author: cmueller
Date: Tue Apr 23 22:01:41 2013
New Revision: 1471174
URL: http://svn.apache.org/r1471174
Log:
use a logger instead of System.out.println()
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java?rev=1471174r1=1471173r2=1471174view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
Tue Apr 23 22:01:41 2013
@@ -179,7 +179,7 @@ public class ComponentConfigurationTest
configuration.setParameter(doesNotExist, 1000);
fail(Should have got InvalidPropertyException thrown!);
} catch (InvalidPropertyException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
SedaEndpoint endpoint = TestSupport
@@ -198,7 +198,7 @@ public class ComponentConfigurationTest
configuration.setEndpointParameter(endpoint, doesNotExist, 1000);
fail(Should have got InvalidPropertyException thrown!);
} catch (InvalidPropertyException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
}
@@ -221,7 +221,7 @@ public class ComponentConfigurationTest
assertEquals(foo, xyz, endpoint.getFoo());
assertEquals(bar, 5, endpoint.getBar());
-System.out.println(Created endpoint + endpoint + on URI +
endpoint.getEndpointUri());
+LOG.info(Created endpoint + endpoint + on URI +
endpoint.getEndpointUri());
// lets try configure a parameter
configuration.setEndpointParameter(endpoint, bar, 6);
@@ -232,7 +232,7 @@ public class ComponentConfigurationTest
configuration.setEndpointParameter(endpoint, doesNotExist, 1000);
fail(Should have got InvalidPropertyException thrown!);
} catch (InvalidPropertyException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
ComponentConfiguration badConfiguration =
component.createComponentConfiguration();
@@ -249,9 +249,8 @@ public class ComponentConfigurationTest
badConfiguration.createEndpoint();
fail(Should have got ResolveEndpointFailedException thrown!);
} catch (ResolveEndpointFailedException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
-
}
/**
@@ -275,7 +274,7 @@ public class ComponentConfigurationTest
assertEquals(concurrentConsumersConfig.getParameterType(), int.class,
concurrentConsumersConfig.getParameterType());
-System.out.println(component + has has configuration properties +
parameterMap.keySet());
+LOG.info({} has has configuration properties {}, component,
parameterMap.keySet());
}
/**
@@ -333,7 +332,7 @@ public class ComponentConfigurationTest
configuration.setEndpointParameter(endpoint, doesNotExist, 1000);
fail(Should have got InvalidPropertyException thrown!);
} catch (InvalidPropertyException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
}
@@ -366,7 +365,7 @@ public class ComponentConfigurationTest
configuration.setEndpointParameter(endpoint, doesNotExist, 1000);
fail(Should have got InvalidPropertyException thrown!);
} catch (InvalidPropertyException e) {
-System.out.println(Got expected exception: + e);
+LOG.info(Got expected exception: + e);
}
}
svn commit: r1471180 - /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java
Author: cmueller
Date: Tue Apr 23 22:11:34 2013
New Revision: 1471180
URL: http://svn.apache.org/r1471180
Log:
use a logger instead of System.out.println()
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java?rev=1471180r1=1471179r2=1471180view=diff
==
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationTest.java
Tue Apr 23 22:11:34 2013
@@ -20,11 +20,12 @@ package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.ComponentConfiguration;
-import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ParameterConfiguration;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jms.ConnectionFactory;
@@ -38,6 +39,9 @@ import static org.apache.camel.component
* Lets test the use of the ComponentConfiguration on the JMS endpoint
*/
public class JmsComponentConfigurationTest extends CamelTestSupport {
+
+private static final Logger LOG =
LoggerFactory.getLogger(JmsComponentConfigurationTest.class);
+
protected String componentName = activemq456;
protected boolean verbose = false;
@@ -51,7 +55,7 @@ public class JmsComponentConfigurationTe
for (Map.EntryString, ParameterConfiguration entry : entries) {
String name = entry.getKey();
ParameterConfiguration config = entry.getValue();
-System.out.println(Has name: + name + with type +
config.getParameterType().getName());
+LOG.info(Has name: {} with type {}, name,
config.getParameterType().getName());
}
}
svn commit: r859490 - /websites/production/camel/content/cache/main.pageCache
Author: cmueller Date: Mon Apr 22 19:26:08 2013 New Revision: 859490 Log: trigger a full export of the Camel WIKI Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r1470677 - in /camel/trunk/components: camel-cxf/src/main/resources/META-INF/ camel-spring-integration/src/main/resources/META-INF/ camel-spring-security/src/main/resources/META-INF/ camel
Author: cmueller
Date: Mon Apr 22 19:38:15 2013
New Revision: 1470677
URL: http://svn.apache.org/r1470677
Log:
Add the release version number to the spring.schemas files
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/trunk/components/camel-spring/src/main/resources/META-INF/spring.schemas
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1470677r1=1470676r2=1470677view=diff
==
--- camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++ camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:38:15 2013
@@ -49,8 +49,11 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1470677r1=1470676r2=1470677view=diff
==
---
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/trunk/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:38:15 2013
@@ -46,8 +46,11 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.11.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
Modified:
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1470677r1=1470676r2=1470677view=diff
==
---
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/trunk/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:38:15 2013
@@ -40,8 +40,11 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.4.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.5.xsd
svn commit: r1470687 - in /camel/branches/camel-2.11.x/components: camel-cxf/src/main/resources/META-INF/ camel-spring-integration/src/main/resources/META-INF/ camel-spring-security/src/main/resources
Author: cmueller
Date: Mon Apr 22 19:55:36 2013
New Revision: 1470687
URL: http://svn.apache.org/r1470687
Log:
Add the release version number to the spring.schemas files
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.11.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.11.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.11.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Modified:
camel/branches/camel-2.11.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1470687r1=1470686r2=1470687view=diff
==
---
camel/branches/camel-2.11.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.11.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:55:36 2013
@@ -49,8 +49,11 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.11.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/branches/camel-2.11.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1470687r1=1470686r2=1470687view=diff
==
---
camel/branches/camel-2.11.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.11.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:55:36 2013
@@ -46,8 +46,11 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.4.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.11.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
\ No newline at end of file
Modified:
camel/branches/camel-2.11.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1470687r1=1470686r2=1470687view=diff
==
---
camel/branches/camel-2.11.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.11.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:55:36 2013
@@ -40,8 +40,11 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security
svn commit: r1470689 - in /camel/branches/camel-2.10.x/components: camel-cxf/src/main/resources/META-INF/ camel-spring-integration/src/main/resources/META-INF/ camel-spring-security/src/main/resources
Author: cmueller
Date: Mon Apr 22 19:59:02 2013
New Revision: 1470689
URL: http://svn.apache.org/r1470689
Log:
Add the release version number to the spring.schemas files
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.10.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.10.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.10.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1470689r1=1470688r2=1470689view=diff
==
---
camel/branches/camel-2.10.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:59:02 2013
@@ -49,8 +49,10 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.0.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.1.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.2.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.10.3.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.10.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/branches/camel-2.10.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1470689r1=1470688r2=1470689view=diff
==
---
camel/branches/camel-2.10.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.10.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:59:02 2013
@@ -46,8 +46,10 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.0.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.1.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.2.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.3.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.10.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
Modified:
camel/branches/camel-2.10.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1470689r1=1470688r2=1470689view=diff
==
---
camel/branches/camel-2.10.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.10.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Mon Apr 22 19:59:02 2013
@@ -40,8 +40,10 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.4.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel
svn commit: r1470692 - in /camel/branches/camel-2.9.x/components: camel-cxf/src/main/resources/META-INF/ camel-spring-integration/src/main/resources/META-INF/ camel-spring-security/src/main/resources/
Author: cmueller
Date: Mon Apr 22 20:00:55 2013
New Revision: 1470692
URL: http://svn.apache.org/r1470692
Log:
Add the release version number to the spring.schemas files
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas?rev=1470692r1=1470691r2=1470692view=diff
==
---
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-cxf/src/main/resources/META-INF/spring.schemas
Mon Apr 22 20:00:55 2013
@@ -47,4 +47,5 @@ http\://camel.apache.org/schema/cxf/came
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.3.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.4.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-2.9.5.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.9.6.xsd=schema/cxfEndpoint.xsd
http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas?rev=1470692r1=1470691r2=1470692view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
Mon Apr 22 20:00:55 2013
@@ -46,4 +46,5 @@ http\://camel.apache.org/schema/spring/i
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.3.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.4.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.5.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.9.6.xsd=schema/camel-spring-integration.xsd
http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas?rev=1470692r1=1470691r2=1470692view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
Mon Apr 22 20:00:55 2013
@@ -40,4 +40,5 @@ http\://camel.apache.org/schema/spring-s
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.3.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.4.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.5.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.9.6.xsd=schema/camel-spring-security.xsd
http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
Modified:
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas?rev=1470692r1=1470691r2=1470692view=diff
==
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/resources/META-INF/spring.schemas
Mon Apr 22 20:00:55 2013
@@ -48,6 +48,7 @@ http\://camel.apache.org/schema/spring/c
http\://camel.apache.org/schema/spring/camel-spring-2.9.3.xsd=camel-spring.xsd
http
svn commit: r1822 - /release/camel/apache-camel/2.11.0/
Author: cmueller Date: Sun Apr 21 10:47:17 2013 New Revision: 1822 Log: Apache Camel 2.11.0 release distro placeholder. Added: release/camel/apache-camel/2.11.0/
svn commit: r1823 - /release/camel/apache-camel/2.11.0/
Author: cmueller Date: Sun Apr 21 11:19:51 2013 New Revision: 1823 Log: Apache Camel 2.11.0 released artifacts. Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.asc (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.asc.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.asc.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz.asc (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz.asc.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz.asc.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.tar.gz.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip.asc (with props) release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip.asc.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip.asc.sha1 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip.md5 release/camel/apache-camel/2.11.0/apache-camel-2.11.0.zip.sha1 Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip -- svn:mime-type = application/zip Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc == Binary file - no diff available. Propchange: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.md5 == --- release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.md5 (added) +++ release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.md5 Sun Apr 21 11:19:51 2013 @@ -0,0 +1 @@ +25197ea25575855b905bfe1923426bfb \ No newline at end of file Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.sha1 == --- release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.sha1 (added) +++ release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.asc.sha1 Sun Apr 21 11:19:51 2013 @@ -0,0 +1 @@ +03fe0d224351bf6475fb9651e7761d50fe965c1f \ No newline at end of file Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.md5 == --- release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.md5 (added) +++ release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.md5 Sun Apr 21 11:19:51 2013 @@ -0,0 +1 @@ +0097d983e35a9bee769dfe6c44d24b80 \ No newline at end of file Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.sha1 == --- release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.sha1 (added) +++ release/camel/apache-camel/2.11.0/apache-camel-2.11.0-src.zip.sha1 Sun Apr 21 11:19:51 2013 @@ -0,0 +1 @@ +e06455cdd0401cabdfe89e44c4292e2189676bbc \ No newline at end of file Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom == Binary file - no diff available. Propchange: release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom -- svn:mime-type = application/xml Added: release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.asc == Binary file - no diff available. Propchange: release/camel/apache-camel/2.11.0/apache-camel-2.11.0.pom.asc
svn commit: r1470283 - /camel/trunk/etc/scripts/release-distro.sh
Author: cmueller
Date: Sun Apr 21 11:32:28 2013
New Revision: 1470283
URL: http://svn.apache.org/r1470283
Log:
fix the release distro script (at least for me)
Modified:
camel/trunk/etc/scripts/release-distro.sh
Modified: camel/trunk/etc/scripts/release-distro.sh
URL:
http://svn.apache.org/viewvc/camel/trunk/etc/scripts/release-distro.sh?rev=1470283r1=1470282r2=1470283view=diff
==
--- camel/trunk/etc/scripts/release-distro.sh (original)
+++ camel/trunk/etc/scripts/release-distro.sh Sun Apr 21 11:32:28 2013
@@ -63,7 +63,7 @@ echo ##
mkdir -p ${DOWNLOAD}/dist 2/dev/null
svn mkdir ${DIST_REPO}/${VERSION} -m Apache Camel ${VERSION} release distro
placeholder.
cd ${DOWNLOAD}/dist; svn co ${DIST_REPO}/${VERSION}
-cp ${DOWNLOAD}/${VERSION}/org/apache/camel/apache-camel/${VERSION}/*
${DOWNLOAD}/dist/${VERSION}/
+cp ${DOWNLOAD}/${VERSION}/org/apache/camel/apache-camel/${VERSION}/*
${DOWNLOAD}/dist/${VERSION}/
cd ${DOWNLOAD}/dist/${VERSION}/; svn add *
echo
svn commit: r859326 [1/3] - in /websites/production/camel/content/manual: camel-manual-2.11.0.html camel-manual-2.11.0.pdf
Author: cmueller Date: Sun Apr 21 11:57:44 2013 New Revision: 859326 Log: Uploading released manuals for camel-2.11.0 Added: websites/production/camel/content/manual/camel-manual-2.11.0.html websites/production/camel/content/manual/camel-manual-2.11.0.pdf (with props)
svn commit: r859326 [3/3] - in /websites/production/camel/content/manual: camel-manual-2.11.0.html camel-manual-2.11.0.pdf
Added: websites/production/camel/content/manual/camel-manual-2.11.0.pdf == Binary file - no diff available. Propchange: websites/production/camel/content/manual/camel-manual-2.11.0.pdf -- svn:mime-type = application/pdf
svn commit: r1470289 - in /camel/trunk/etc/scripts: release-distro.sh release-website.sh
Author: cmueller
Date: Sun Apr 21 11:57:52 2013
New Revision: 1470289
URL: http://svn.apache.org/r1470289
Log:
fix the release distro and release website script
Modified:
camel/trunk/etc/scripts/release-distro.sh
camel/trunk/etc/scripts/release-website.sh
Modified: camel/trunk/etc/scripts/release-distro.sh
URL:
http://svn.apache.org/viewvc/camel/trunk/etc/scripts/release-distro.sh?rev=1470289r1=1470288r2=1470289view=diff
==
--- camel/trunk/etc/scripts/release-distro.sh (original)
+++ camel/trunk/etc/scripts/release-distro.sh Sun Apr 21 11:57:52 2013
@@ -34,7 +34,7 @@ SITE_DIR=/www/camel.apache.org
if [ -z ${VERSION} -o ! -d ${DOWNLOAD} ]
then
- echo Usage: publish_camel-distro.sh camel-version [temp-directory]
+ echo Usage: release-distro.sh camel-version [temp-directory]
exit 1
fi
Modified: camel/trunk/etc/scripts/release-website.sh
URL:
http://svn.apache.org/viewvc/camel/trunk/etc/scripts/release-website.sh?rev=1470289r1=1470288r2=1470289view=diff
==
--- camel/trunk/etc/scripts/release-website.sh (original)
+++ camel/trunk/etc/scripts/release-website.sh Sun Apr 21 11:57:52 2013
@@ -24,7 +24,6 @@ mkdir ${DOWNLOAD} 2/dev/null
RUNDIR=$(cd ${0%/*} echo $PWD)
COMPLIST=( camel-spring:spring
camel-cxf:cxf
- camel-osgi:osgi
camel-spring-integration:spring/integration
camel-spring-security:spring-security
camel-blueprint:blueprint )
@@ -34,7 +33,7 @@ WEBSITE_URL=https://svn.apache.org/repo
if [ -z ${VERSION} -o ! -d ${DOWNLOAD} ]
then
- echo Usage: publish_camel-distro.sh camel-version [temp-directory]
+ echo Usage: release-website.sh camel-version [temp-directory]
exit 1
fi
svn commit: r1470234 - in /camel/trunk: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-itest-performance/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Sat Apr 20 21:20:53 2013 New Revision: 1470234 URL: http://svn.apache.org/r1470234 Log: manually update the version for the modules the maven-release-plugin skip Modified: camel/trunk/etc/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-performance/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1470234r1=1470233r2=1470234view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Sat Apr 20 21:20:53 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1470234r1=1470233r2=1470234view=diff == --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Sat Apr 20 21:20:53 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-karaf/artifactId Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1470234r1=1470233r2=1470234view=diff == --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Sat Apr 20 21:20:53 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-osgi/artifactId Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=1470234r1=1470233r2=1470234view=diff == --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Sat Apr 20 21:20:53 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId Modified: camel/trunk/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/pom.xml?rev=1470234r1=1470233r2=1470234view=diff == --- camel/trunk/tests/camel-performance/pom.xml (original) +++ camel/trunk/tests/camel-performance/pom.xml Sat Apr 20 21:20:53 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1468764 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Wed Apr 17 06:45:52 2013 New Revision: 1468764 URL: http://svn.apache.org/r1468764 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/ - copied from r1468763, camel/trunk/
svn commit: r1468753 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Wed Apr 17 05:51:08 2013 New Revision: 1468753 URL: http://svn.apache.org/r1468753 Log: redo the Camel 2.11.0 release Removed: camel/tags/camel-2.11.0/
svn commit: r1467787 - /camel/trunk/examples/camel-example-osgi-rmi/README.txt
Author: cmueller
Date: Sun Apr 14 15:01:55 2013
New Revision: 1467787
URL: http://svn.apache.org/r1467787
Log:
updated the camel-example-osgi-rmi README file
Modified:
camel/trunk/examples/camel-example-osgi-rmi/README.txt
Modified: camel/trunk/examples/camel-example-osgi-rmi/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi-rmi/README.txt?rev=1467787r1=1467786r2=1467787view=diff
==
--- camel/trunk/examples/camel-example-osgi-rmi/README.txt (original)
+++ camel/trunk/examples/camel-example-osgi-rmi/README.txt Sun Apr 14 15:01:55
2013
@@ -23,21 +23,11 @@ If using Apache Karaf / Apache ServiceMi
from the shell
First the camel-rmi feature must be installed
-
+ features:addUrl
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
features:install camel-rmi
Then install the example
-
- osgi:install mvn:org.apache.camel/camel-example-osgi-rmi/2.8.0
-
- (substitute 2.8.0 with the Camel version number)
-
-Then start the bundle by starting the id it was assigned during installation
-
- osgi:start 182
-
- (substitute 182 with the id of the bundle)
-
+ osgi:install -s mvn:org.apache.camel/camel-example-osgi-rmi/${version}
If you hit an problems please let us know on the Camel Forums
http://camel.apache.org/discussion-forums.html
svn commit: r1467788 - /camel/trunk/examples/camel-example-osgi/README.txt
Author: cmueller
Date: Sun Apr 14 15:07:44 2013
New Revision: 1467788
URL: http://svn.apache.org/r1467788
Log:
updated the camel-example-osgi README file
Modified:
camel/trunk/examples/camel-example-osgi/README.txt
Modified: camel/trunk/examples/camel-example-osgi/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-osgi/README.txt?rev=1467788r1=1467787r2=1467788view=diff
==
--- camel/trunk/examples/camel-example-osgi/README.txt (original)
+++ camel/trunk/examples/camel-example-osgi/README.txt Sun Apr 14 15:07:44 2013
@@ -20,20 +20,12 @@ Running inside OSGi container
=
You will need to compile and install this example first:
- mvn compile install
+ mvn install
If using Apache Karaf / Apache ServiceMix you can install this example
from the shell
-
- osgi:install mvn:org.apache.camel/camel-example-osgi/${version}
-
-
-Then start the bundle by starting the id it was assigned during installation
-
- osgi:start 182
-
- (substitute 182 with the id of the bundle)
-
+ features:addUrl
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+ osgi:install -s mvn:org.apache.camel/camel-example-osgi/${version}
If you hit any problems please let us know on the Camel Forums
http://camel.apache.org/discussion-forums.html
svn commit: r1467809 - /camel/trunk/examples/camel-example-servlet-tomcat/README.txt
Author: cmueller
Date: Sun Apr 14 18:13:01 2013
New Revision: 1467809
URL: http://svn.apache.org/r1467809
Log:
updated the camel-example-servlet-tomcat README file
Modified:
camel/trunk/examples/camel-example-servlet-tomcat/README.txt
Modified: camel/trunk/examples/camel-example-servlet-tomcat/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/README.txt?rev=1467809r1=1467808r2=1467809view=diff
==
--- camel/trunk/examples/camel-example-servlet-tomcat/README.txt (original)
+++ camel/trunk/examples/camel-example-servlet-tomcat/README.txt Sun Apr 14
18:13:01 2013
@@ -11,10 +11,10 @@ deploy folder of Apache Tomcat.
And then hit this url from a webbrowser which has further
instructions (use correct version number)
- http://localhost:8080/camel-example-servlet-tomcat-2.7.0
+ http://localhost:8080/camel-example-servlet-tomcat-{version}
The servlet is located at (use correct version number)
- http://localhost:8080/camel-example-servlet-tomcat-2.7.0/camel
+ http://localhost:8080/camel-example-servlet-tomcat-{version}/camel/hello
This example is documented at
http://camel.apache.org/servlet-tomcat-example.html
svn commit: r1467814 - /camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
Author: cmueller
Date: Sun Apr 14 19:17:18 2013
New Revision: 1467814
URL: http://svn.apache.org/r1467814
Log:
updated the camel-example-servlet-tomcat-no-spring README file
Modified:
camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
Modified: camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt?rev=1467814r1=1467813r2=1467814view=diff
==
--- camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
(original)
+++ camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt Sun
Apr 14 19:17:18 2013
@@ -12,10 +12,10 @@ deploy folder of Apache Tomcat.
And then hit this url from a webbrowser which has further
instructions (use correct version number)
- http://localhost:8080/camel-example-servlet-tomcat-no-spring-2.11.0
+ http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}
The servlet is located at (use correct version number)
- http://localhost:8080/camel-example-servlet-tomcat-no-spring-2.11.0/camel
+ http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}/camel
This example is documented at
http://camel.apache.org/servlet-tomcat-example-no-spring.html
svn commit: r1467826 - in /camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi: pom.xml src/main/resources/META-INF/spring/camel-context.xml
Author: cmueller
Date: Sun Apr 14 20:32:30 2013
New Revision: 1467826
URL: http://svn.apache.org/r1467826
Log:
CAMEL-6257: CXF Example OSGi fail in Karaf
Thanks Krzysztof Sobkowiak for reporting and the suggested solution
Modified:
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml?rev=1467826r1=1467825r2=1467826view=diff
==
--- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml Sun Apr
14 20:32:30 2013
@@ -115,7 +115,6 @@
Bundle-SymbolicName${project.groupId}.${project.artifactId}/Bundle-SymbolicName
Export-Packageorg.apache.camel.example.reportincident*/Export-Package
Import-Package
-META-INF.cxf,
org.apache.cxf,
org.apache.cxf.binding,
org.apache.cxf.binding.corba,
Modified:
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1467826r1=1467825r2=1467826view=diff
==
---
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
Sun Apr 14 20:32:30 2013
@@ -25,8 +25,6 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd;
- import resource=classpath:META-INF/cxf/cxf.xml/
-
cxf:cxfEndpoint id=reportIncident
address=/camel-example-cxf-osgi/webservices/incident
wsdlURL=META-INF/wsdl/report_incident.wsdl
svn commit: r1467829 - /camel/trunk/examples/camel-example-route-throttling/pom.xml
Author: cmueller Date: Sun Apr 14 21:04:21 2013 New Revision: 1467829 URL: http://svn.apache.org/r1467829 Log: CAMEL-6275: camel-example-route-throttling failed Modified: camel/trunk/examples/camel-example-route-throttling/pom.xml Modified: camel/trunk/examples/camel-example-route-throttling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/pom.xml?rev=1467829r1=1467828r2=1467829view=diff == --- camel/trunk/examples/camel-example-route-throttling/pom.xml (original) +++ camel/trunk/examples/camel-example-route-throttling/pom.xml Sun Apr 14 21:04:21 2013 @@ -53,6 +53,10 @@ groupIdorg.apache.activemq/groupId artifactIdactivemq-camel/artifactId /dependency +dependency +groupIdorg.apache.activemq/groupId +artifactIdactivemq-kahadb-store/artifactId +/dependency !-- xbean is required for ActiveMQ broker configuration in the spring xml file -- dependency
svn commit: r1467653 - /camel/trunk/etc/pom.xml
Author: cmueller Date: Sat Apr 13 16:14:11 2013 New Revision: 1467653 URL: http://svn.apache.org/r1467653 Log: Manually updating version numbers which are not updated by the maven-release-plugin Modified: camel/trunk/etc/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1467653r1=1467652r2=1467653view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Sat Apr 13 16:14:11 2013 @@ -23,8 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version -relativePath../parent/relativePath +version2.12-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId
svn commit: r1467657 - /camel/trunk/examples/camel-example-cxf-proxy/README.txt
Author: cmueller Date: Sat Apr 13 16:51:22 2013 New Revision: 1467657 URL: http://svn.apache.org/r1467657 Log: Fixed the README file for camel-example-cxf-proxy because we use dynamic port numbers Modified: camel/trunk/examples/camel-example-cxf-proxy/README.txt Modified: camel/trunk/examples/camel-example-cxf-proxy/README.txt URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/README.txt?rev=1467657r1=1467656r2=1467657view=diff == --- camel/trunk/examples/camel-example-cxf-proxy/README.txt (original) +++ camel/trunk/examples/camel-example-cxf-proxy/README.txt Sat Apr 13 16:51:22 2013 @@ -10,18 +10,19 @@ To run the example type: mvn camel:run The proxied webservice is located at - http://localhost:9080/camel-example-cxf-proxy/webservices/incident + http://localhost:port 1/camel-example-cxf-proxy/webservices/incident The real webservice is located at - http://localhost:9081/real-webservice + http://localhost:port 2/real-webservice The webservice WSDL is exposed at: - http://localhost:9080/camel-example-cxf-proxy/webservices/incident?wsdl + http://localhost:port 1/camel-example-cxf-proxy/webservices/incident?wsdl +Because we use dynamic port numbers, you have to check the console to get the used one. To stop the example hit ctrl + c To make a SOAP call open soapUI or another SOAP query tool and create a new -project w/WSDL of http://localhost:9080/camel-example-cxf-proxy/webservices/incident?wsdl. +project w/WSDL of http://localhost:port 1/camel-example-cxf-proxy/webservices/incident?wsdl. Then make SOAP requests of this format: soapenv:Envelope xmlns:soapenv=http://schemas.xmlsoap.org/soap/envelope/;
svn commit: r1466666 - in /camel/trunk: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-itest-performance/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Wed Apr 10 20:59:26 2013 New Revision: 146 URL: http://svn.apache.org/r146 Log: Revert r1466172: Manually updating version numbers which are not updated by the maven-release-plugin Modified: camel/trunk/etc/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-performance/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=146r1=145r2=146view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Wed Apr 10 20:59:26 2013 @@ -23,7 +23,8 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version +relativePath../parent/relativePath /parent artifactIdcamel-etc/artifactId Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=146r1=145r2=146view=diff == --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Wed Apr 10 20:59:26 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-karaf/artifactId Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=146r1=145r2=146view=diff == --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Wed Apr 10 20:59:26 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-osgi/artifactId Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=146r1=145r2=146view=diff == --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Wed Apr 10 20:59:26 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId Modified: camel/trunk/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/pom.xml?rev=146r1=145r2=146view=diff == --- camel/trunk/tests/camel-performance/pom.xml (original) +++ camel/trunk/tests/camel-performance/pom.xml Wed Apr 10 20:59:26 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1466686 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Wed Apr 10 21:13:27 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1466686r1=1466685r2=1466686view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Wed Apr 10 21:13:27 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version relativePath../parent/relativePath /parent
svn commit: r1466698 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Wed Apr 10 21:43:55 2013 New Revision: 1466698 URL: http://svn.apache.org/r1466698 Log: redo the Camel 2.11.0 release Removed: camel/tags/camel-2.11.0/
svn commit: r1466700 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Wed Apr 10 21:49:54 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1466700r1=1466699r2=1466700view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Wed Apr 10 21:49:54 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version relativePath../parent/relativePath /parent
svn commit: r1466701 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Wed Apr 10 21:51:07 2013 New Revision: 1466701 URL: http://svn.apache.org/r1466701 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/ - copied from r1466700, camel/trunk/
svn commit: r1465896 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Tue Apr 9 06:19:19 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465896r1=1465895r2=1465896view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Tue Apr 9 06:19:19 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version relativePath../parent/relativePath /parent
svn commit: r1465897 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Tue Apr 9 06:24:57 2013 New Revision: 1465897 URL: http://svn.apache.org/r1465897 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/ - copied from r1465896, camel/trunk/
svn commit: r1466172 - in /camel/trunk: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-itest-performance/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Tue Apr 9 18:37:42 2013 New Revision: 1466172 URL: http://svn.apache.org/r1466172 Log: Manually updating version numbers which are not updated by the maven-release-plugin Modified: camel/trunk/etc/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-performance/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1466172r1=1466171r2=1466172view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Tue Apr 9 18:37:42 2013 @@ -23,8 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version -relativePath../parent/relativePath +version2.12-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1466172r1=1466171r2=1466172view=diff == --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Tue Apr 9 18:37:42 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-karaf/artifactId Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1466172r1=1466171r2=1466172view=diff == --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Tue Apr 9 18:37:42 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-osgi/artifactId Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=1466172r1=1466171r2=1466172view=diff == --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Tue Apr 9 18:37:42 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId Modified: camel/trunk/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/pom.xml?rev=1466172r1=1466171r2=1466172view=diff == --- camel/trunk/tests/camel-performance/pom.xml (original) +++ camel/trunk/tests/camel-performance/pom.xml Tue Apr 9 18:37:42 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1466236 - in /camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi: README.txt pom.xml
Author: cmueller
Date: Tue Apr 9 21:05:16 2013
New Revision: 1466236
URL: http://svn.apache.org/r1466236
Log:
CAMEL-6257: CXF Example OSGi fail in Karaf
Modified:
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/README.txt
camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/README.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/README.txt?rev=1466236r1=1466235r2=1466236view=diff
==
--- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/README.txt
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/README.txt Tue
Apr 9 21:05:16 2013
@@ -55,9 +55,9 @@ port 8181 for http. If you would like to
${KARAF_HOME}/etc/org.ops4j.pax.web.cfg. The immediate extension after the
hostname and port (cxf in
the below URL) is configured via the org.apache.cxf.osgi.cfg file (Please see
http://team.ops4j.org/wiki//display/paxweb/Pax+Web for more information on PAX
Web).
-
+
http://localhost:8181/cxf/camel-example-cxf-osgi/webservices/incident?wsdl
-
+
5) Start SOAPUI (2.x or later)
Create a new project called camel-example-cxf-osgi
Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml?rev=1466236r1=1466235r2=1466236view=diff
==
--- camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-cxf-osgi/pom.xml Tue Apr
9 21:05:16 2013
@@ -115,6 +115,7 @@
Bundle-SymbolicName${project.groupId}.${project.artifactId}/Bundle-SymbolicName
Export-Packageorg.apache.camel.example.reportincident*/Export-Package
Import-Package
+META-INF.cxf,
org.apache.cxf,
org.apache.cxf.binding,
org.apache.cxf.binding.corba,
svn commit: r1465787 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Mon Apr 8 21:08:20 2013 New Revision: 1465787 URL: http://svn.apache.org/r1465787 Log: undo the Camel 2.11.0 release Removed: camel/tags/camel-2.11.0/
svn commit: r1465792 - in /camel/trunk: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-itest-performance/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Mon Apr 8 21:13:50 2013 New Revision: 1465792 URL: http://svn.apache.org/r1465792 Log: Revert: Manually updating version numbers which are not updated by the maven-release-plugin Modified: camel/trunk/etc/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-performance/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1465792r1=1465791r2=1465792view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Mon Apr 8 21:13:50 2013 @@ -23,7 +23,8 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version +relativePath../parent/relativePath /parent artifactIdcamel-etc/artifactId Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1465792r1=1465791r2=1465792view=diff == --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Mon Apr 8 21:13:50 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-karaf/artifactId Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1465792r1=1465791r2=1465792view=diff == --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon Apr 8 21:13:50 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-osgi/artifactId Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=1465792r1=1465791r2=1465792view=diff == --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Mon Apr 8 21:13:50 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId Modified: camel/trunk/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/pom.xml?rev=1465792r1=1465791r2=1465792view=diff == --- camel/trunk/tests/camel-performance/pom.xml (original) +++ camel/trunk/tests/camel-performance/pom.xml Mon Apr 8 21:13:50 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1465799 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Mon Apr 8 21:30:15 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465799r1=1465798r2=1465799view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Mon Apr 8 21:30:15 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version relativePath../parent/relativePath /parent
svn commit: r1465805 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Mon Apr 8 22:06:46 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465805r1=1465804r2=1465805view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Mon Apr 8 22:06:46 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version relativePath../parent/relativePath /parent
svn commit: r1465806 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Mon Apr 8 22:07:46 2013 New Revision: 1465806 URL: http://svn.apache.org/r1465806 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/ - copied from r1465805, camel/trunk/
svn commit: r1465884 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Tue Apr 9 05:28:24 2013 New Revision: 1465884 URL: http://svn.apache.org/r1465884 Log: undo the Camel 2.11.0 release Removed: camel/tags/camel-2.11.0/
svn commit: r1465889 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Tue Apr 9 05:43:16 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465889r1=1465888r2=1465889view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Tue Apr 9 05:43:16 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.12-SNAPSHOT/version +version2.11-SNAPSHOT/version relativePath../parent/relativePath /parent
svn commit: r1465416 - in /camel/trunk: etc/pom.xml tests/camel-itest-karaf/pom.xml tests/camel-itest-osgi/pom.xml tests/camel-itest-performance/pom.xml tests/camel-performance/pom.xml
Author: cmueller Date: Sun Apr 7 16:03:54 2013 New Revision: 1465416 URL: http://svn.apache.org/r1465416 Log: Manually updating version numbers which are not updated by the maven-release-plugin Modified: camel/trunk/etc/pom.xml camel/trunk/tests/camel-itest-karaf/pom.xml camel/trunk/tests/camel-itest-osgi/pom.xml camel/trunk/tests/camel-itest-performance/pom.xml camel/trunk/tests/camel-performance/pom.xml Modified: camel/trunk/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1465416r1=1465415r2=1465416view=diff == --- camel/trunk/etc/pom.xml (original) +++ camel/trunk/etc/pom.xml Sun Apr 7 16:03:54 2013 @@ -23,8 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version -relativePath../parent/relativePath +version2.12-SNAPSHOT/version /parent artifactIdcamel-etc/artifactId Modified: camel/trunk/tests/camel-itest-karaf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1465416r1=1465415r2=1465416view=diff == --- camel/trunk/tests/camel-itest-karaf/pom.xml (original) +++ camel/trunk/tests/camel-itest-karaf/pom.xml Sun Apr 7 16:03:54 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-karaf/artifactId Modified: camel/trunk/tests/camel-itest-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1465416r1=1465415r2=1465416view=diff == --- camel/trunk/tests/camel-itest-osgi/pom.xml (original) +++ camel/trunk/tests/camel-itest-osgi/pom.xml Sun Apr 7 16:03:54 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-osgi/artifactId Modified: camel/trunk/tests/camel-itest-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-performance/pom.xml?rev=1465416r1=1465415r2=1465416view=diff == --- camel/trunk/tests/camel-itest-performance/pom.xml (original) +++ camel/trunk/tests/camel-itest-performance/pom.xml Sun Apr 7 16:03:54 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-itest-performance/artifactId Modified: camel/trunk/tests/camel-performance/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/pom.xml?rev=1465416r1=1465415r2=1465416view=diff == --- camel/trunk/tests/camel-performance/pom.xml (original) +++ camel/trunk/tests/camel-performance/pom.xml Sun Apr 7 16:03:54 2013 @@ -22,7 +22,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtests/artifactId -version2.11-SNAPSHOT/version +version2.12-SNAPSHOT/version /parent artifactIdcamel-performance/artifactId
svn commit: r1465209 - /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
Author: cmueller Date: Sat Apr 6 08:10:22 2013 New Revision: 1465209 URL: http://svn.apache.org/r1465209 Log: fixed CS error Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java?rev=1465209r1=1465208r2=1465209view=diff == --- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java (original) +++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java Sat Apr 6 08:10:22 2013 @@ -78,7 +78,7 @@ public class JmsInOutTransferExchangeTes assertNotNull(transferMessage.getBody(SerializableRequestDto.class)); assertNotNull(transferMessage.getHeader(requestObject, SerializableRequestDto.class)); assertEquals(Boolean.TRUE, transferMessage.getHeader(boolean, Boolean.class)); -assertEquals((Long) 123l, transferMessage.getHeader(long, Long.class)); +assertEquals((Long) 123L, transferMessage.getHeader(long, Long.class)); assertEquals((Double) 1.23, transferMessage.getHeader(double, Double.class)); assertEquals(hello, transferMessage.getHeader(string, String.class)); assertNotNull(transferExchange.getProperty(requestObjectProperty, SerializableRequestDto.class)); @@ -88,7 +88,7 @@ public class JmsInOutTransferExchangeTes assertNotNull(resultMessage.getBody(SerializableResponseDto.class)); assertNotNull(resultMessage.getHeader(requestObject, SerializableRequestDto.class)); assertEquals(Boolean.TRUE, resultMessage.getHeader(boolean, Boolean.class)); -assertEquals((Long) 123l, resultMessage.getHeader(long, Long.class)); +assertEquals((Long) 123L, resultMessage.getHeader(long, Long.class)); assertEquals((Double) 1.23, resultMessage.getHeader(double, Double.class)); assertEquals(hello, resultMessage.getHeader(string, String.class)); assertNotNull(resultMessage.getHeader(responseHeader, SerializableResponseDto.class));
svn commit: r1465211 - /camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
Author: cmueller Date: Sat Apr 6 08:52:54 2013 New Revision: 1465211 URL: http://svn.apache.org/r1465211 Log: fixed CS error Modified: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java Modified: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1465211r1=1465210r2=1465211view=diff == --- camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java (original) +++ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java Sat Apr 6 08:52:54 2013 @@ -42,8 +42,6 @@ import org.apache.camel.dataformat.soap. import org.apache.camel.dataformat.soap.name.TypeNameStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xml.sax.SAXException; - /** * Data format supporting SOAP 1.1 and 1.2.
svn commit: r1465239 - /camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: cmueller
Date: Sat Apr 6 13:32:17 2013
New Revision: 1465239
URL: http://svn.apache.org/r1465239
Log:
allign the quotes
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1465239r1=1465238r2=1465239view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Apr 6 13:32:17 2013
@@ -68,7 +68,7 @@
/feature
feature name='camel-apns' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
-bundle
dependency=truemvn:org.apache.mina/mina-core/${mina2-version}/bundle
+bundle
dependency='true'mvn:org.apache.mina/mina-core/${mina2-version}/bundle
bundle
dependency='true'mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-apns/${project.version}/bundle
@@ -231,16 +231,16 @@
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-dozer/${project.version}/bundle
/feature
- feature name=camel-elasticsearch version=${project.version}
resolver=(obr) start-level=50
+ feature name='camel-elasticsearch' version='${project.version}'
resolver='(obr)' start-level='50'
feature version='${project.version}'camel-core/feature
featurehttp/feature
-bundle
dependency=truemvn:com.google.guava/guava/${google-guava-version}/bundle
-bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}/bundle
-bundle
dependency=truemvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle
-bundle
dependency=truemvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}/bundle
-bundle
dependency=truemvn:joda-time/joda-time/${jodatime-bundle-version}/bundle
-bundle
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}/bundle
-bundle dependency=truemvn:org.mvel/mvel2/${mvel-version}/bundle
+bundle
dependency='true'mvn:com.google.guava/guava/${google-guava-version}/bundle
+bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}/bundle
+bundle
dependency='true'mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}/bundle
+bundle
dependency='true'mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}/bundle
+bundle
dependency='true'mvn:joda-time/joda-time/${jodatime-bundle-version}/bundle
+bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}/bundle
+bundle dependency='true'mvn:org.mvel/mvel2/${mvel-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-elasticsearch/${project.version}/bundle
@@ -283,7 +283,7 @@
feature name='camel-gae' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
feature version='${project.version}'camel-servlet/feature
-bundle
dependency=truemvn:com.google.guava/guava/${google-guava-version}/bundle
+bundle
dependency='true'mvn:com.google.guava/guava/${google-guava-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gdata/${google-gdata-bundle-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gae/${google-app-engine-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-gae/${project.version}/bundle
@@ -336,7 +336,7 @@
bundle
dependency='true'mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}/bundle
bundle
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}/bundle
bundle
dependency='true'mvn:javax.mail/mail/${javax-mail-version}/bundle
-bundle
dependency=truemvn:com.google.guava/guava/${google-guava-version}/bundle
+bundle
dependency
svn commit: r1465241 - /camel/trunk/platforms/karaf/features/src/main/resources/config.properties
Author: cmueller
Date: Sat Apr 6 13:32:45 2013
New Revision: 1465241
URL: http://svn.apache.org/r1465241
Log:
CAMEL-6249: Update the config.properties to mach the exported packages for
Karaf 2.3.x
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1465241r1=1465240r2=1465241view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties
Sat Apr 6 13:32:45 2013
@@ -20,30 +20,36 @@
#
# Framework config properties.
#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
- org.osgi.framework.launch; version=1.0.0, \
- org.osgi.framework.hooks.service; version=1.0.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.0 \
- ${jre-${java.specification.version}}
+org.osgi.framework.system.packages= \
+ org.osgi.framework.startlevel;uses:=org.osgi.framework;version=1.0, \
+
org.osgi.framework.wiring;uses:=org.osgi.resource,org.osgi.framework;version=1.1,
\
+ org.osgi.framework.hooks.bundle;uses:=org.osgi.framework;version=1.1, \
+ org.osgi.framework.hooks.service;uses:=org.osgi.framework;version=1.1, \
+
org.osgi.framework.hooks.resolver;uses:=org.osgi.framework.wiring;version=1.0,
\
+ org.osgi.framework.launch;uses:=org.osgi.framework;version=1.1, \
+ org.osgi.framework.namespace;uses:=org.osgi.resource;version=1.0, \
+ org.osgi.framework;version=1.7,\
+
org.osgi.framework.hooks.weaving;uses:=org.osgi.framework.wiring;version=1.0,\
+ org.osgi.resource;version=1.0,org.osgi.service.url;version=1.0,\
+ org.osgi.service.startlevel;uses:=org.osgi.framework;version=1.1,\
+ org.osgi.service.packageadmin;uses:=org.osgi.framework;version=1.2,\
+ org.osgi.service.url;version=1.0, \
+ org.osgi.util.tracker;uses:=org.osgi.framework;version=1.5.1, \
+ org.apache.karaf.jaas.boot;version=2.3.1, \
+ org.apache.karaf.jaas.boot.principal;version=2.3.1, \
+ org.apache.karaf.version;version=2.3.1, \
+ ${jre-${java.specification.version}}
-org.osgi.framework.bootdelegation=sun.*,com.sun*,javax.transaction,javax.transaction.*
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
# Standard package set. Note that:
-# - some com.sun.org.apache.* are exported
-# - com.sun.jndi.ldap package is exported
-# - javax.transaction* is exported with a mandatory attribute
-# Added the javax.script into jre-1.5 to workaround the configure issue of
karaf feature plugin
-jre-1.5=, \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.xni, \
- com.sun.jndi.ldap, \
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.6= \
javax.accessibility, \
+ javax.activation;version=1.1, \
javax.activity, \
+ javax.annotation, \
+ javax.annotation.processing, \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -54,6 +60,12 @@ jre-1.5=, \
javax.imageio.plugins.jpeg, \
javax.imageio.spi, \
javax.imageio.stream, \
+ javax.jws, \
+ javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
javax.management, \
javax.management.loading, \
javax.management.modelmbean, \
@@ -111,16 +123,43 @@ jre-1.5=, \
javax.swing.text.rtf, \
javax.swing.tree, \
javax.swing.undo, \
- javax.transaction, javax.transaction.xa, \
+ javax.tools, \
+ javax.transaction, \
+ javax.transaction.xa, \
javax.xml, \
+ javax.xml.bind;version=2.2.1, \
+ javax.xml.bind.annotation;version=2.2.1, \
+ javax.xml.bind.annotation.adapters;version=2.2.1, \
+ javax.xml.bind.attachment;version=2.2.1, \
+ javax.xml.bind.helpers;version=2.2.1, \
+ javax.xml.bind.util;version=2.2.1, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
+ javax.xml.soap;version=1.3, \
+ javax.xml.stream;version=1.2, \
+ javax.xml.stream.events;version=1.2, \
+ javax.xml.stream.util;version=1.2, \
javax.xml.transform, \
javax.xml.transform.dom, \
javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
javax.xml.transform.stream, \
javax.xml.validation, \
+ javax.xml.ws;version=2.2, \
+ javax.xml.ws.handler;version=2.2, \
+ javax.xml.ws.handler.soap;version=2.2, \
+ javax.xml.ws.http;version=2.2, \
+ javax.xml.ws.soap;version
svn commit: r1465264 - /camel/trunk/components/camel-rx/
Author: cmueller Date: Sat Apr 6 15:50:12 2013 New Revision: 1465264 URL: http://svn.apache.org/r1465264 Log: added target directory to svn:ignore Modified: camel/trunk/components/camel-rx/ (props changed) Propchange: camel/trunk/components/camel-rx/ -- --- svn:ignore (added) +++ svn:ignore Sat Apr 6 15:50:12 2013 @@ -0,0 +1 @@ +target
svn commit: r1465270 - /camel/trunk/README.txt
Author: cmueller Date: Sat Apr 6 16:34:52 2013 New Revision: 1465270 URL: http://svn.apache.org/r1465270 Log: little change to test my svn settings Modified: camel/trunk/README.txt Modified: camel/trunk/README.txt URL: http://svn.apache.org/viewvc/camel/trunk/README.txt?rev=1465270r1=1465269r2=1465270view=diff == --- camel/trunk/README.txt (original) +++ camel/trunk/README.txt Sat Apr 6 16:34:52 2013 @@ -108,4 +108,3 @@ software: * camel-mail can be configured for secure communications * camel-nagios can be configured for secure communications * camel-xmlsecurity can be configured for secure communications -
svn commit: r1465273 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Sat Apr 6 17:09:32 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465273r1=1465272r2=1465273view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Sat Apr 6 17:09:32 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version relativePath../parent/relativePath /parent
svn commit: r1465275 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Sat Apr 6 17:18:46 2013 New Revision: 1465275 URL: http://svn.apache.org/r1465275 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/ - copied from r1465273, camel/trunk/
svn commit: r1465277 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Sat Apr 6 17:25:05 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465277r1=1465276r2=1465277view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Sat Apr 6 17:25:05 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11.0/version +version2.11-SNAPSHOT/version relativePath../parent/relativePath /parent
svn commit: r1465282 [3/3] - in /camel/trunk: ./ apache-camel/ buildingtools/ camel-core/ components/ components/camel-ahc/ components/camel-amqp/ components/camel-apns/ components/camel-atom/ compone
Modified: camel/trunk/tooling/camel-manual/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/camel-manual/pom.xml (original) +++ camel/trunk/tooling/camel-manual/pom.xml Sat Apr 6 18:00:36 2013 @@ -23,7 +23,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-manual/artifactId Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/camel-package-maven-plugin/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdcamel-package-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original) +++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdguice-maven-plugin/artifactId Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original) +++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdmaven-plugins/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-html-to-pdf/artifactId Modified: camel/trunk/tooling/maven/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/maven/pom.xml (original) +++ camel/trunk/tooling/maven/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdtooling/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version /parent artifactIdmaven-plugins/artifactId Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1465282r1=1465281r2=1465282view=diff == --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Sat Apr 6 18:00:36 2013 @@ -21,7 +21,7 @@ parent groupIdorg.apache.camel/groupId artifactIdcamel-parent/artifactId -version2.11-SNAPSHOT/version +version2.11.0/version relativePath../parent/relativePath /parent
svn commit: r1465307 - /camel/tags/camel-2.11.0/trunk/
Author: cmueller Date: Sat Apr 6 22:34:45 2013 New Revision: 1465307 URL: http://svn.apache.org/r1465307 Log: [maven-release-plugin] copy for tag camel-2.11.0 Added: camel/tags/camel-2.11.0/trunk/ - copied from r1465306, camel/trunk/
svn commit: r1465130 - in /camel/trunk/examples/camel-example-cxf-blueprint: README.txt src/main/resources/META-INF/wsdl/report_incident.wsdl
Author: cmueller
Date: Fri Apr 5 21:13:26 2013
New Revision: 1465130
URL: http://svn.apache.org/r1465130
Log:
fixed the description of camel-example-cxf-blueprint
Modified:
camel/trunk/examples/camel-example-cxf-blueprint/README.txt
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
Modified: camel/trunk/examples/camel-example-cxf-blueprint/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/README.txt?rev=1465130r1=1465129r2=1465130view=diff
==
--- camel/trunk/examples/camel-example-cxf-blueprint/README.txt (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/README.txt Fri Apr 5
21:13:26 2013
@@ -13,23 +13,19 @@ the same port.
You will need to compile this example first:
mvn install
-To run the example on Apache ServiceMix 4.x or Apache Karaf 2.2.5 or better
+To run the example on Apache Karaf 2.3.1 or better
1) launch the server
- karaf.bat
+ karaf / karaf.bat
-Note for Karaf 2.2.5 onwards:
- a) copy the etc/jre.properties.cxf to override the existing
etc/jre.properties file
-
-
2) Add features required
- features:addUrl
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+ features:chooseurl camel ${version}
features:install war
features:install cxf
features:install camel-jaxb
+ features:install camel-blueprint
features:install camel-cxf
-
3) Deploy the example
osgi:install -s mvn:org.apache.camel/camel-example-cxf-blueprint/${version}
Modified:
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1465130r1=1465129r2=1465130view=diff
==
---
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
(original)
+++
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
Fri Apr 5 21:13:26 2013
@@ -85,7 +85,7 @@
!-- Service definition --
wsdl:service name=ReportIncidentEndpointService
wsdl:port name=ReportIncidentService
binding=tns:ReportIncidentBinding
-soap:address
location=http://localhost:9080/part-five/webservices/incident/
+soap:address
location=http://localhost:8181/cxf/camel-example-cxf-blueprint/webservices/incident/
/wsdl:port
/wsdl:service
svn commit: r1463208 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ components/camel-jaxb/src/test/
Author: cmueller
Date: Mon Apr 1 17:10:08 2013
New Revision: 1463208
URL: http://svn.apache.org/r1463208
Log:
CAMEL-5278: Allow JaxbDataFormat to (un)marshall with strict schema validation
Added:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
camel/trunk/components/camel-jaxb/src/test/resources/address.xsd
camel/trunk/components/camel-jaxb/src/test/resources/person.xsd
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=1463208r1=1463207r2=1463208view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
Mon Apr 1 17:10:08 2013
@@ -37,6 +37,8 @@ public class JaxbDataFormat extends Data
@XmlAttribute(required = true)
private String contextPath;
@XmlAttribute
+private String schema;
+@XmlAttribute
private Boolean prettyPrint;
@XmlAttribute
private Boolean ignoreJAXBElement;
@@ -71,6 +73,14 @@ public class JaxbDataFormat extends Data
this.contextPath = contextPath;
}
+public String getSchema() {
+return schema;
+}
+
+public void setSchema(String schema) {
+this.schema = schema;
+}
+
public Boolean getPrettyPrint() {
return prettyPrint;
}
@@ -174,6 +184,8 @@ public class JaxbDataFormat extends Data
setProperty(dataFormat, namespacePrefixRef, namespacePrefixRef);
}
setProperty(dataFormat, contextPath, contextPath);
+if (schema != null) {
+setProperty(dataFormat, schema, schema);
+}
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1463208r1=1463207r2=1463208view=diff
==
---
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
(original)
+++
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
Mon Apr 1 17:10:08 2013
@@ -16,22 +16,35 @@
*/
package org.apache.camel.converter.jaxb;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Map;
+
+import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.ValidationEventHandler;
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.xml.sax.SAXException;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -42,6 +55,7 @@ import
svn commit: r1463278 - in /camel/trunk/components/camel-jaxb/src/test: java/org/apache/camel/converter/jaxb/ resources/org/apache/camel/converter/ resources/org/apache/camel/converter/jaxb/
Author: cmueller
Date: Mon Apr 1 20:12:04 2013
New Revision: 1463278
URL: http://svn.apache.org/r1463278
Log:
CAMEL-5278: Allow JaxbDataFormat to (un)marshall with strict schema validation
Added:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/converter/
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/converter/jaxb/
camel/trunk/components/camel-jaxb/src/test/resources/org/apache/camel/converter/jaxb/context.xml
Added:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java?rev=1463278view=auto
==
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
(added)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
Mon Apr 1 20:12:04 2013
@@ -0,0 +1,131 @@
+/**
+ * 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.converter.jaxb;
+
+import java.io.IOException;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxb.address.Address;
+import org.apache.camel.converter.jaxb.person.Person;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class JaxbDataFormatSchemaValidationSpringTest extends
CamelSpringTestSupport {
+
+@EndpointInject(uri = mock:marshall)
+private MockEndpoint mockMarshall;
+
+@EndpointInject(uri = mock:unmarshall)
+private MockEndpoint mockUnmarshall;
+
+@Test
+public void testMarshallSuccess() throws Exception {
+mockMarshall.expectedMessageCount(1);
+
+Address address = new Address();
+address.setAddressLine1(Hauptstr. 1; 01129 Entenhausen);
+Person person = new Person();
+person.setFirstName(Christian);
+person.setLastName(Mueller);
+person.setAge(Integer.valueOf(36));
+person.setAddress(address);
+
+template.sendBody(direct:marshall, person);
+
+assertMockEndpointsSatisfied();
+
+String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
+log.info(payload);
+
+assertTrue(payload.startsWith(?xml version=\1.0\
encoding=\UTF-8\ standalone=\yes\?));
+assertTrue(payload.contains(person
xmlns=\person.jaxb.converter.camel.apache.org\
xmlns:ns2=\address.jaxb.converter.camel.apache.org\));
+assertTrue(payload.contains(firstNameChristian/firstName));
+assertTrue(payload.contains(lastNameMueller/lastName));
+assertTrue(payload.contains(age36/age));
+assertTrue(payload.contains(address));
+assertTrue(payload.contains(ns2:addressLine1Hauptstr. 1; 01129
Entenhausen/ns2:addressLine1));
+assertTrue(payload.contains(/address));
+assertTrue(payload.contains(/person));
+}
+
+@Test
+public void testMarshallWithValidationException() throws Exception {
+try {
+template.sendBody(direct:marshall, new Person());
+fail(CamelExecutionException expected);
+} catch (CamelExecutionException e) {
+Throwable cause = e.getCause();
+assertIsInstanceOf(IOException.class, cause);
+
assertTrue(cause.getMessage().contains(javax.xml.bind.MarshalException));
+
assertTrue(cause.getMessage().contains(org.xml.sax.SAXParseException));
+assertTrue(cause.getMessage().contains(Invalid content was
found
svn commit: r1461997 - in /camel/trunk: apache-camel/ apache-camel/src/main/descriptors/ components/ components/camel-spring-neo4j/ components/camel-spring-neo4j/src/main/java/org/apache/camel/compone
Author: cmueller Date: Thu Mar 28 08:57:46 2013 New Revision: 1461997 URL: http://svn.apache.org/r1461997 Log: Revert CAMEL-5483: Component for neo4j - because of possible license issue Removed: camel/trunk/components/camel-spring-neo4j/pom.xml camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/BasicRelationship.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jComponent.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jEndpoint.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jException.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jOperation.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java camel/trunk/components/camel-spring-neo4j/src/main/java/org/apache/camel/component/neo4j/SpringDataRelationship.java camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/LICENSE.txt camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/NOTICE.txt camel/trunk/components/camel-spring-neo4j/src/main/resources/META-INF/services/org/apache/camel/component/spring-neo4j camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jComponentTest.java camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jEndpointTest.java camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/Neo4jProducerTest.java camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateNodeIntegrationTest.java camel/trunk/components/camel-spring-neo4j/src/test/java/org/apache/camel/component/neo4j/RestNeo4jProducerCreateRelationshipIntegrationTest.java camel/trunk/components/camel-spring-neo4j/src/test/resources/log4j.properties camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringNeo4jTest.java Modified: camel/trunk/apache-camel/pom.xml camel/trunk/apache-camel/src/main/descriptors/common-bin.xml camel/trunk/components/pom.xml camel/trunk/parent/pom.xml camel/trunk/platforms/karaf/features/src/main/resources/features.xml Modified: camel/trunk/apache-camel/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1461997r1=1461996r2=1461997view=diff == --- camel/trunk/apache-camel/pom.xml (original) +++ camel/trunk/apache-camel/pom.xml Thu Mar 28 08:57:46 2013 @@ -496,10 +496,6 @@ /dependency dependency groupIdorg.apache.camel/groupId - artifactIdcamel-spring-neo4j/artifactId -/dependency -dependency - groupIdorg.apache.camel/groupId artifactIdcamel-spring-redis/artifactId /dependency dependency Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1461997r1=1461996r2=1461997view=diff == --- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original) +++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Mar 28 08:57:46 2013 @@ -136,7 +136,6 @@ includeorg.apache.camel:camel-spring-integration/include includeorg.apache.camel:camel-spring-javaconfig/include includeorg.apache.camel:camel-spring-ldap/include -includeorg.apache.camel:camel-spring-neo4j/include includeorg.apache.camel:camel-spring-redis/include includeorg.apache.camel:camel-spring-security/include includeorg.apache.camel:camel-spring-ws/include Modified: camel/trunk/components/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1461997r1=1461996r2=1461997view=diff == --- camel/trunk/components/pom.xml (original) +++ camel/trunk/components/pom.xml Thu Mar 28 08:57:46 2013 @@ -154,7 +154,6 @@ modulecamel-spring-javaconfig/module modulecamel-spring-integration/module modulecamel-spring-ldap/module -modulecamel-spring-neo4j/module modulecamel-spring-redis/module modulecamel-spring-security/module modulecamel-spring-ws/module Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1461997r1=1461996r2=1461997view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Thu Mar 28 08:57:46 2013 @@ -271,8 +271,6 @@ maven-surefire-report-plugin-version2.13/maven
svn commit: r1462005 - in /camel/trunk: parent/pom.xml pom.xml
Author: cmueller
Date: Thu Mar 28 09:31:14 2013
New Revision: 1462005
URL: http://svn.apache.org/r1462005
Log:
moved the apache-rat-plugin configuration to our root pom. Otherwise our
exclusions do not work.
Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1462005r1=1462004r2=1462005view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Mar 28 09:31:14 2013
@@ -2281,11 +2281,6 @@
version${maven-surefire-report-plugin-version}/version
/plugin
plugin
- groupIdorg.apache.rat/groupId
- artifactIdapache-rat-plugin/artifactId
- version0.8/version
-/plugin
-plugin
groupIdorg.apache.servicemix.tooling/groupId
artifactIddepends-maven-plugin/artifactId
version1.2/version
@@ -2479,38 +2474,6 @@
/execution
/executions
/plugin
- plugin
-groupIdorg.apache.rat/groupId
-artifactIdapache-rat-plugin/artifactId
-configuration
- excludeSubProjectsfalse/excludeSubProjects
- excludes
-exclude**/README/exclude
-exclude**/README.txt/exclude
-exclude**/resources/**/*.xsd/exclude
-exclude**/webapp/js/**/*/exclude
-exclude**/test/resources/**/*/exclude
-exclude**/test/data*/**/*/exclude
-exclude.gitignore/exclude
-exclude.git/**/*/exclude
-!-- tooling/camel-manual/src/styles/print.css use a different
- license --
-exclude**/src/styles/print.css/exclude
-!-- cxf does not handle comments here --
-
excludes**/src/main/resources/META-INF/cxf/cxf.extension/excludes
-
excludes**/src/main/resources/META-INF/cxf/bus-extensions.txt/excludes
-!-- generated files --
-exclude**/target/**/*/exclude
-exclude**/eclipse-classes/**/*/exclude
-exclude**/.*/exclude
-exclude**/.settings/**/*/exclude
-exclude**/*.iml/exclude
-exclude.idea/**/*/exclude
-exclude**/avro/**/*.avpr/exclude
-exclude**/OSGI-INF/bundle.info/exclude
- /excludes
-/configuration
- /plugin
/plugins
/build
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1462005r1=1462004r2=1462005view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu Mar 28 09:31:14 2013
@@ -160,6 +160,40 @@
downloadJavadocsfalse/downloadJavadocs
/configuration
/plugin
+
+ plugin
+groupIdorg.apache.rat/groupId
+artifactIdapache-rat-plugin/artifactId
+version0.8/version
+configuration
+ excludeSubProjectsfalse/excludeSubProjects
+ excludes
+exclude**/README/exclude
+exclude**/README.txt/exclude
+exclude**/resources/**/*.xsd/exclude
+exclude**/webapp/js/**/*/exclude
+exclude**/test/resources/**/*/exclude
+exclude**/test/data*/**/*/exclude
+exclude.gitignore/exclude
+exclude.git/**/*/exclude
+!-- tooling/camel-manual/src/styles/print.css use a different
+ license --
+exclude**/src/styles/print.css/exclude
+!-- cxf does not handle comments here --
+
excludes**/src/main/resources/META-INF/cxf/cxf.extension/excludes
+
excludes**/src/main/resources/META-INF/cxf/bus-extensions.txt/excludes
+!-- generated files --
+exclude**/target/**/*/exclude
+exclude**/eclipse-classes/**/*/exclude
+exclude**/.*/exclude
+exclude**/.settings/**/*/exclude
+exclude**/*.iml/exclude
+exclude.idea/**/*/exclude
+exclude**/avro/**/*.avpr/exclude
+exclude**/OSGI-INF/bundle.info/exclude
+ /excludes
+/configuration
+ /plugin
/plugins
/pluginManagement
/build
svn commit: r1462021 - in /camel/trunk: parent/pom.xml pom.xml
Author: cmueller
Date: Thu Mar 28 10:30:41 2013
New Revision: 1462021
URL: http://svn.apache.org/r1462021
Log:
moved the maven-release-plugin configuration to our root pom. Otherwise the
configuration has no effect.
Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1462021r1=1462020r2=1462021view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Mar 28 10:30:41 2013
@@ -260,7 +260,6 @@
maven-jar-plugin-version2.4/maven-jar-plugin-version
maven-javadoc-plugin-version2.9/maven-javadoc-plugin-version
maven-plugin-plugin-version3.2/maven-plugin-plugin-version
-maven-release-plugin-version2.4/maven-release-plugin-version
maven-remote-resources-plugin-version1.4/maven-remote-resources-plugin-version
maven-resources-plugin-version2.6/maven-resources-plugin-version
maven-reporting-api-version2.2.1/maven-reporting-api-version
@@ -2212,19 +2211,6 @@
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-release-plugin/artifactId
- version${maven-release-plugin-version}/version
- configuration
-tagBasehttps://svn.apache.org/repos/asf/camel/tags/tagBase
-useReleaseProfilefalse/useReleaseProfile
-preparationGoalsclean install/preparationGoals
-goalsdeploy/goals
-
arguments-Papache-release,enable-schemagen,sourcecheck,validate,hibernate-derby/arguments
-autoVersionSubmodulestrue/autoVersionSubmodules
- /configuration
-/plugin
-plugin
- groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-remote-resources-plugin/artifactId
version${maven-remote-resources-plugin-version}/version
/plugin
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1462021r1=1462020r2=1462021view=diff
==
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu Mar 28 10:30:41 2013
@@ -195,6 +195,20 @@
/excludes
/configuration
/plugin
+
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-release-plugin/artifactId
+ version2.4/version
+ configuration
+tagBasehttps://svn.apache.org/repos/asf/camel/tags/tagBase
+useReleaseProfilefalse/useReleaseProfile
+preparationGoalsclean install/preparationGoals
+goalsdeploy/goals
+
arguments-Papache-release,enable-schemagen,sourcecheck,validate,hibernate-derby/arguments
+autoVersionSubmodulestrue/autoVersionSubmodules
+ /configuration
+/plugin
/plugins
/pluginManagement
/build
svn commit: r1462068 - /camel/trunk/pom.xml
Author: cmueller Date: Thu Mar 28 12:19:06 2013 New Revision: 1462068 URL: http://svn.apache.org/r1462068 Log: renamed the profile dependency because we renamed the profile in the past Modified: camel/trunk/pom.xml Modified: camel/trunk/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1462068r1=1462067r2=1462068view=diff == --- camel/trunk/pom.xml (original) +++ camel/trunk/pom.xml Thu Mar 28 12:19:06 2013 @@ -205,7 +205,7 @@ useReleaseProfilefalse/useReleaseProfile preparationGoalsclean install/preparationGoals goalsdeploy/goals - arguments-Papache-release,enable-schemagen,sourcecheck,validate,hibernate-derby/arguments + arguments-Papache-release,enable-schemagen,sourcecheck,validate,hibernate/arguments autoVersionSubmodulestrue/autoVersionSubmodules /configuration /plugin
svn commit: r1462077 - /camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
Author: cmueller Date: Thu Mar 28 13:03:38 2013 New Revision: 1462077 URL: http://svn.apache.org/r1462077 Log: fixed CS error Modified: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java Modified: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java?rev=1462077r1=1462076r2=1462077view=diff == --- camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java (original) +++ camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java Thu Mar 28 13:03:38 2013 @@ -82,4 +82,5 @@ public class CamelSpringDelegatingTestCo errorEndpoint.assertIsSatisfied(); } } -//END SNIPPET: example \ No newline at end of file +//END SNIPPET: example +
svn commit: r1462081 - in /camel/trunk/components/camel-rx/src: main/java/org/apache/camel/rx/ main/java/org/apache/camel/rx/support/ test/java/org/apache/camel/rx/
Author: cmueller Date: Thu Mar 28 13:12:22 2013 New Revision: 1462081 URL: http://svn.apache.org/r1462081 Log: fixed CS reported errors Modified: camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/RuntimeCamelRxException.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointObservable.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObserverSender.java camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java camel/trunk/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java Modified: camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java?rev=1462081r1=1462080r2=1462081view=diff == --- camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java (original) +++ camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java Thu Mar 28 13:12:22 2013 @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, Modified: camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java?rev=1462081r1=1462080r2=1462081view=diff == --- camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java (original) +++ camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableMessage.java Thu Mar 28 13:12:22 2013 @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, Modified: camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java?rev=1462081r1=1462080r2=1462081view=diff == --- camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java (original) +++ camel/trunk/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java Thu Mar 28 13:12:22 2013 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache
svn commit: r1462136 - /camel/trunk/components/camel-web/pom.xml
Author: cmueller Date: Thu Mar 28 14:53:37 2013 New Revision: 1462136 URL: http://svn.apache.org/r1462136 Log: added correct dependency to commons-io after it was moved in Maven central Modified: camel/trunk/components/camel-web/pom.xml Modified: camel/trunk/components/camel-web/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1462136r1=1462135r2=1462136view=diff == --- camel/trunk/components/camel-web/pom.xml (original) +++ camel/trunk/components/camel-web/pom.xml Thu Mar 28 14:53:37 2013 @@ -304,6 +304,13 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-javadoc-plugin/artifactId +dependencies +dependency +groupIdorg.apache.commons/groupId +artifactIdcommons-io/artifactId +version1.3.2/version +/dependency +/dependencies executions execution goals
svn commit: r1461475 - in /camel/trunk/components/camel-flatpack/src: main/java/org/apache/camel/component/flatpack/ test/data/delimLong/ test/data/delimMixed/ test/data/delimShort/ test/java/org/apac
Author: cmueller
Date: Wed Mar 27 09:44:29 2013
New Revision: 1461475
URL: http://svn.apache.org/r1461475
Log:
CAMEL-6178: Camel Flatpack should respect the ignoreExtraColumns and
allowShortLines options for delimited files
Thanks to Chris Geer for the patch
Added:
camel/trunk/components/camel-flatpack/src/test/data/delimLong/
camel/trunk/components/camel-flatpack/src/test/data/delimLong/INVENTORY-CommaDelimitedWithQualifier.txt
camel/trunk/components/camel-flatpack/src/test/data/delimMixed/
camel/trunk/components/camel-flatpack/src/test/data/delimMixed/INVENTORY-CommaDelimitedWithQualifier.txt
camel/trunk/components/camel-flatpack/src/test/data/delimShort/
camel/trunk/components/camel-flatpack/src/test/data/delimShort/INVENTORY-CommaDelimitedWithQualifier.txt
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java?rev=1461475r1=1461474r2=1461475view=diff
==
---
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
(original)
+++
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
Wed Mar 27 09:44:29 2013
@@ -51,7 +51,16 @@ public class DelimitedEndpoint extends F
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
definition);
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader, bodyReader,
delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+if (isAllowShortLines()) {
+parser.setHandlingShortLines(true);
+parser.setIgnoreParseWarnings(true);
+}
+if (isIgnoreExtraColumns()) {
+parser.setIgnoreExtraColumns(true);
+parser.setIgnoreParseWarnings(true);
+}
+return parser;
}
}
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java?rev=1461475r1=1461474r2=1461475view=diff
==
---
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
(original)
+++
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Wed Mar 27 09:44:29 2013
@@ -205,7 +205,16 @@ public class FlatpackDataFormat implemen
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(),
getDefinition());
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+if (allowShortLines) {
+parser.setHandlingShortLines(true);
+parser.setIgnoreParseWarnings(true);
+}
+if (ignoreExtraColumns) {
+parser.setIgnoreExtraColumns(true
svn commit: r1461479 - in /camel/branches/camel-2.10.x/components/camel-flatpack/src: main/java/org/apache/camel/component/flatpack/ test/data/delimLong/ test/data/delimMixed/ test/data/delimShort/ te
Author: cmueller
Date: Wed Mar 27 09:47:40 2013
New Revision: 1461479
URL: http://svn.apache.org/r1461479
Log:
CAMEL-6178: Camel Flatpack should respect the ignoreExtraColumns and
allowShortLines options for delimited files
Thanks to Chris Geer for the patch
Added:
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimLong/
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimLong/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimMixed/
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimMixed/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimShort/
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/data/delimShort/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml
camel/branches/camel-2.10.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml
Modified:
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Modified:
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java?rev=1461479r1=1461478r2=1461479view=diff
==
---
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
Wed Mar 27 09:47:40 2013
@@ -51,7 +51,16 @@ public class DelimitedEndpoint extends F
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
definition);
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader, bodyReader,
delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+if (isAllowShortLines()) {
+parser.setHandlingShortLines(true);
+parser.setIgnoreParseWarnings(true);
+}
+if (isIgnoreExtraColumns()) {
+parser.setIgnoreExtraColumns(true);
+parser.setIgnoreParseWarnings(true);
+}
+return parser;
}
}
Modified:
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java?rev=1461479r1=1461478r2=1461479view=diff
==
---
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Wed Mar 27 09:47:40 2013
@@ -205,7 +205,16 @@ public class FlatpackDataFormat implemen
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(),
getDefinition());
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader
svn commit: r1461666 - in /camel/branches/camel-2.10.x/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/SmppComponent.java test/java/org/apache/camel/component/smpp/SmppComponentTe
Author: cmueller
Date: Wed Mar 27 15:51:09 2013
New Revision: 1461666
URL: http://svn.apache.org/r1461666
Log:
CAMEL-6117: Allow empty system_type
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461666r1=1461665r2=1461666view=diff
==
---
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 15:51:09 2013
@@ -52,6 +52,11 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+// special handling to set the system type to an empty string
+if (parameters.containsKey(systemType)
parameters.get(systemType) == null) {
+config.setSystemType();
+parameters.remove(systemType);
+}
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461666r1=1461665r2=1461666view=diff
==
---
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 15:51:09 2013
@@ -125,6 +125,16 @@ public class SmppComponentTest {
}
@Test
+public void allowEmptySystemTypeOption() throws Exception {
+MapString, String parameters = new HashMapString, String();
+parameters.put(systemType, null);
+Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775, ?systemType=,
parameters);
+SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
+
+assertEquals(, smppEndpoint.getConfiguration().getSystemType());
+}
+
+@Test
public void createEndpointSmppConfigurationShouldReturnASmppEndpoint()
throws Exception {
SmppConfiguration configuration = new SmppConfiguration();
Endpoint endpoint = component.createEndpoint(configuration);
svn commit: r1461668 - in /camel/branches/camel-2.10.x/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/SmppComponent.java test/java/org/apache/camel/component/smpp/SmppComponentTe
Author: cmueller
Date: Wed Mar 27 15:51:40 2013
New Revision: 1461668
URL: http://svn.apache.org/r1461668
Log:
CAMEL-6117: Allow empty service_type and system_type
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461668r1=1461667r2=1461668view=diff
==
---
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 15:51:40 2013
@@ -52,11 +52,17 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+// TODO Camel 3.0 cmueller: We should change the default in Camel 3.0
to '' so that we can remove this special handling
// special handling to set the system type to an empty string
if (parameters.containsKey(systemType)
parameters.get(systemType) == null) {
config.setSystemType();
parameters.remove(systemType);
}
+// special handling to set the service type to an empty string
+if (parameters.containsKey(serviceType)
parameters.get(serviceType) == null) {
+config.setServiceType();
+parameters.remove(serviceType);
+}
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461668r1=1461667r2=1461668view=diff
==
---
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 15:51:40 2013
@@ -125,13 +125,15 @@ public class SmppComponentTest {
}
@Test
-public void allowEmptySystemTypeOption() throws Exception {
+public void allowEmptySystemTypeAndServiceTypeOption() throws Exception {
MapString, String parameters = new HashMapString, String();
parameters.put(systemType, null);
-Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775, ?systemType=,
parameters);
+parameters.put(serviceType, null);
+Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775,
?systemType=serviceType=, parameters);
SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
assertEquals(, smppEndpoint.getConfiguration().getSystemType());
+assertEquals(, smppEndpoint.getConfiguration().getServiceType());
}
@Test
svn commit: r1461676 - in /camel/branches/camel-2.9.x/components/camel-flatpack/src: main/java/org/apache/camel/component/flatpack/ test/data/delimLong/ test/data/delimMixed/ test/data/delimShort/ tes
Author: cmueller
Date: Wed Mar 27 16:00:08 2013
New Revision: 1461676
URL: http://svn.apache.org/r1461676
Log:
CAMEL-6178: Camel Flatpack should respect the ignoreExtraColumns and
allowShortLines options for delimited files
Thanks to Chris Geer for the patch
Added:
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimLong/
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimLong/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimMixed/
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimMixed/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimShort/
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/data/delimShort/INVENTORY-CommaDelimitedWithQualifier.txt
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowLongTest.java
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest.java
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedAllowShortTest.java
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml
camel/branches/camel-2.9.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml
Modified:
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Modified:
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java?rev=1461676r1=1461675r2=1461676view=diff
==
---
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DelimitedEndpoint.java
Wed Mar 27 16:00:08 2013
@@ -52,7 +52,16 @@ public class DelimitedEndpoint extends F
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
definition);
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader, bodyReader,
delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+if (isAllowShortLines()) {
+parser.setHandlingShortLines(true);
+parser.setIgnoreParseWarnings(true);
+}
+if (isIgnoreExtraColumns()) {
+parser.setIgnoreExtraColumns(true);
+parser.setIgnoreParseWarnings(true);
+}
+return parser;
}
}
Modified:
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java?rev=1461676r1=1461675r2=1461676view=diff
==
---
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Wed Mar 27 16:00:08 2013
@@ -205,7 +205,16 @@ public class FlatpackDataFormat implemen
} else {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(),
getDefinition());
InputStreamReader reader = new InputStreamReader(is,
IOHelper.getCharsetName(exchange));
-return getParserFactory().newDelimitedParser(reader,
bodyReader, delimiter, textQualifier, ignoreFirstRecord);
+Parser parser = getParserFactory().newDelimitedParser(reader,
bodyReader
svn commit: r1461677 - in /camel/branches/camel-2.9.x/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/SmppComponent.java test/java/org/apache/camel/component/smpp/SmppComponentTes
Author: cmueller
Date: Wed Mar 27 16:00:30 2013
New Revision: 1461677
URL: http://svn.apache.org/r1461677
Log:
CAMEL-6117: Allow empty system_type
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461677r1=1461676r2=1461677view=diff
==
---
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 16:00:30 2013
@@ -52,6 +52,11 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+// special handling to set the system type to an empty string
+if (parameters.containsKey(systemType)
parameters.get(systemType) == null) {
+config.setSystemType();
+parameters.remove(systemType);
+}
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461677r1=1461676r2=1461677view=diff
==
---
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 16:00:30 2013
@@ -125,6 +125,16 @@ public class SmppComponentTest {
}
@Test
+public void allowEmptySystemTypeOption() throws Exception {
+MapString, String parameters = new HashMapString, String();
+parameters.put(systemType, null);
+Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775, ?systemType=,
parameters);
+SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
+
+assertEquals(, smppEndpoint.getConfiguration().getSystemType());
+}
+
+@Test
public void createEndpointSmppConfigurationShouldReturnASmppEndpoint()
throws Exception {
SmppConfiguration configuration = new SmppConfiguration();
Endpoint endpoint = component.createEndpoint(configuration);
svn commit: r1461680 - in /camel/branches/camel-2.9.x/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/SmppComponent.java test/java/org/apache/camel/component/smpp/SmppComponentTes
Author: cmueller
Date: Wed Mar 27 16:00:56 2013
New Revision: 1461680
URL: http://svn.apache.org/r1461680
Log:
CAMEL-6117: Allow empty service_type and system_type
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1461680r1=1461679r2=1461680view=diff
==
---
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Wed Mar 27 16:00:56 2013
@@ -52,11 +52,17 @@ public class SmppComponent extends Defau
SmppConfiguration config = this.configuration.copy();
config.configureFromURI(new URI(uri));
+// TODO Camel 3.0 cmueller: We should change the default in Camel 3.0
to '' so that we can remove this special handling
// special handling to set the system type to an empty string
if (parameters.containsKey(systemType)
parameters.get(systemType) == null) {
config.setSystemType();
parameters.remove(systemType);
}
+// special handling to set the service type to an empty string
+if (parameters.containsKey(serviceType)
parameters.get(serviceType) == null) {
+config.setServiceType();
+parameters.remove(serviceType);
+}
setProperties(config, parameters);
return createEndpoint(uri, config);
Modified:
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1461680r1=1461679r2=1461680view=diff
==
---
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Wed Mar 27 16:00:56 2013
@@ -125,13 +125,15 @@ public class SmppComponentTest {
}
@Test
-public void allowEmptySystemTypeOption() throws Exception {
+public void allowEmptySystemTypeAndServiceTypeOption() throws Exception {
MapString, String parameters = new HashMapString, String();
parameters.put(systemType, null);
-Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775, ?systemType=,
parameters);
+parameters.put(serviceType, null);
+Endpoint endpoint =
component.createEndpoint(smpp://smppclient@localhost:2775,
?systemType=serviceType=, parameters);
SmppEndpoint smppEndpoint = (SmppEndpoint) endpoint;
assertEquals(, smppEndpoint.getConfiguration().getSystemType());
+assertEquals(, smppEndpoint.getConfiguration().getServiceType());
}
@Test
svn commit: r1460139 - /camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
Author: cmueller Date: Sat Mar 23 13:24:33 2013 New Revision: 1460139 URL: http://svn.apache.org/r1460139 Log: fixed unit tests which fails from time to time on slow CI servers Modified: camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Modified: camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java?rev=1460139r1=1460138r2=1460139view=diff == --- camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java (original) +++ camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Sat Mar 23 13:24:33 2013 @@ -35,7 +35,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, hello.txt); -Thread.sleep(500); +Thread.sleep(800); File file = new File(getScpPath() + /hello.txt); assertFileExists(file.getAbsolutePath()); @@ -48,7 +48,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, mysub/bye.txt); -Thread.sleep(500); +Thread.sleep(800); File file = new File(getScpPath() + /mysub/bye.txt); assertFileExists(file.getAbsolutePath()); @@ -61,7 +61,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, mysub/mysubsub/farewell.txt); -Thread.sleep(500); +Thread.sleep(800); File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt); assertFileExists(file.getAbsolutePath()); @@ -74,7 +74,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminchmod=640knownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, monde.txt); -Thread.sleep(500); +Thread.sleep(800); File file = new File(getScpPath() + /monde.txt); assertFileExists(file.getAbsolutePath()); @@ -89,7 +89,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, welt.txt); -Thread.sleep(500); +Thread.sleep(800); File file = new File(getScpPath() + /welt.txt); assertFileExists(file.getAbsolutePath());
svn commit: r1460204 - in /camel/trunk/components/camel-avro/src/test: java/org/apache/camel/component/avro/ resources/org/apache/camel/component/avro/
Author: cmueller
Date: Sat Mar 23 18:43:16 2013
New Revision: 1460204
URL: http://svn.apache.org/r1460204
Log:
simplyfied the Avro tests
Modified:
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpSpringProducerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringConsumerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-http-consumer.xml
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-netty-consumer.xml
camel/trunk/components/camel-avro/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml
Modified:
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java?rev=1460204r1=1460203r2=1460204view=diff
==
---
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
(original)
+++
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
Sat Mar 23 18:43:16 2013
@@ -28,6 +28,7 @@ import org.apache.camel.avro.generated.K
import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -40,14 +41,15 @@ public abstract class AvroConsumerTestSu
protected abstract void initializeTranceiver() throws IOException;
@Override
+@After
public void tearDown() throws Exception {
super.tearDown();
+
if (transceiver != null) {
transceiver.close();
}
}
-
@Test
public void testInOnly() throws Exception {
initializeTranceiver();
@@ -57,7 +59,6 @@ public abstract class AvroConsumerTestSu
requestor.request(put, request);
}
-
@Test
public void testInOut() throws Exception {
initializeTranceiver();
Modified:
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java?rev=1460204r1=1460203r2=1460204view=diff
==
---
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
(original)
+++
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
Sat Mar 23 18:43:16 2013
@@ -22,7 +22,6 @@ import java.net.URL;
import org.apache.avro.ipc.HttpTransceiver;
import org.apache.avro.ipc.specific.SpecificRequestor;
-
import org.apache.camel.avro.generated.KeyValueProtocol;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.avro.processors.GetProcessor;
@@ -30,8 +29,6 @@ import org.apache.camel.component.avro.p
public class AvroHttpConsumerTest extends AvroConsumerTestSupport {
-static int avroPort = setupFreePort(avroport);
-
@Override
protected void initializeTranceiver() throws IOException {
transceiver = new HttpTransceiver(new URL(http://localhost:; +
avroPort));
@@ -44,8 +41,8 @@ public class AvroHttpConsumerTest extend
public void configure() throws Exception {
//In Only
from(avro:http:localhost: + avroPort).choice()
-.when().el(${in.headers. +
AvroConstants.AVRO_MESSAGE_NAME + == 'put'}).process(new
PutProcessor(keyValue))
-.when().el(${in.headers. +
AvroConstants.AVRO_MESSAGE_NAME + == 'get
svn commit: r1459666 - /camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
Author: cmueller Date: Fri Mar 22 08:48:14 2013 New Revision: 1459666 URL: http://svn.apache.org/r1459666 Log: fixed unit test which fails from time to time Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java?rev=1459666r1=1459665r2=1459666view=diff == --- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java (original) +++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java Fri Mar 22 08:48:14 2013 @@ -45,6 +45,7 @@ public class HttpNoConnectionTest extend String url = http4:// + getHostName() + : + getPort() + /search; // stop server so there are no connection localServer.stop(); +localServer.awaitTermination(1000); Exchange reply = template.request(url, null); Exception e = reply.getException();
svn commit: r1459670 - /camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
Author: cmueller Date: Fri Mar 22 08:54:52 2013 New Revision: 1459670 URL: http://svn.apache.org/r1459670 Log: fixed unit test which fails from time to time Modified: camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java Modified: camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java?rev=1459670r1=1459669r2=1459670view=diff == --- camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java (original) +++ camel/branches/camel-2.9.x/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java Fri Mar 22 08:54:52 2013 @@ -45,6 +45,7 @@ public class HttpNoConnectionTest extend String url = http4:// + getHostName() + : + getPort() + /search; // stop server so there are no connection localServer.stop(); +localServer.awaitTermination(1000); Exchange reply = template.request(url, null); Exception e = reply.getException();
svn commit: r1459675 - /camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
Author: cmueller Date: Fri Mar 22 09:03:39 2013 New Revision: 1459675 URL: http://svn.apache.org/r1459675 Log: fixed unit test which fails from time to time on slow boxes Modified: camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Modified: camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java?rev=1459675r1=1459674r2=1459675view=diff == --- camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java (original) +++ camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Fri Mar 22 09:03:39 2013 @@ -35,7 +35,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, hello.txt); -Thread.sleep(200); +Thread.sleep(500); File file = new File(getScpPath() + /hello.txt); assertFileExists(file.getAbsolutePath()); @@ -48,7 +48,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, mysub/bye.txt); -Thread.sleep(200); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/bye.txt); assertFileExists(file.getAbsolutePath()); @@ -61,7 +61,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, mysub/mysubsub/farewell.txt); -Thread.sleep(200); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt); assertFileExists(file.getAbsolutePath()); @@ -74,7 +74,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminchmod=640knownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, monde.txt); -Thread.sleep(200); +Thread.sleep(500); File file = new File(getScpPath() + /monde.txt); assertFileExists(file.getAbsolutePath()); @@ -89,7 +89,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, welt.txt); -Thread.sleep(200); +Thread.sleep(500); File file = new File(getScpPath() + /welt.txt); assertFileExists(file.getAbsolutePath());
svn commit: r1459676 - /camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
Author: cmueller Date: Fri Mar 22 09:06:26 2013 New Revision: 1459676 URL: http://svn.apache.org/r1459676 Log: fixed unit test which fails from time to time on slow boxes Modified: camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Modified: camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java?rev=1459676r1=1459675r2=1459676view=diff == --- camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java (original) +++ camel/branches/camel-2.10.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Fri Mar 22 09:06:26 2013 @@ -37,6 +37,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, hello.txt); +Thread.sleep(500); File file = new File(getScpPath() + /hello.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -49,6 +50,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, mysub/bye.txt); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/bye.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -61,6 +63,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, mysub/mysubsub/farewell.txt); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -73,6 +76,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminchmod=640knownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, monde.txt); +Thread.sleep(500); File file = new File(getScpPath() + /monde.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -87,6 +91,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, welt.txt); +Thread.sleep(500); File file = new File(getScpPath() + /welt.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists());
svn commit: r1459679 - /camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java
Author: cmueller Date: Fri Mar 22 09:08:00 2013 New Revision: 1459679 URL: http://svn.apache.org/r1459679 Log: fixed unit test which fails from time to time on slow boxes Modified: camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Modified: camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java?rev=1459679r1=1459678r2=1459679view=diff == --- camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java (original) +++ camel/branches/camel-2.9.x/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpSimpleProduceTest.java Fri Mar 22 09:08:00 2013 @@ -38,6 +38,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hello World, Exchange.FILE_NAME, hello.txt); +Thread.sleep(500); File file = new File(getScpPath() + /hello.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -50,6 +51,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bye World, Exchange.FILE_NAME, mysub/bye.txt); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/bye.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -62,6 +64,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Farewell World, Exchange.FILE_NAME, mysub/mysubsub/farewell.txt); +Thread.sleep(500); File file = new File(getScpPath() + /mysub/mysubsub/farewell.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -74,6 +77,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminpassword=adminchmod=640knownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Bonjour Monde, Exchange.FILE_NAME, monde.txt); +Thread.sleep(500); File file = new File(getScpPath() + /monde.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists()); @@ -88,6 +92,7 @@ public class ScpSimpleProduceTest extend String uri = getScpUri() + ?username=adminprivateKeyFile=src/test/resources/camel-key.privprivateKeyFilePassphrase=passwordknownHostsFile= + getKnownHostsFile(); template.sendBodyAndHeader(uri, Hallo Welt, Exchange.FILE_NAME, welt.txt); +Thread.sleep(500); File file = new File(getScpPath() + /welt.txt).getAbsoluteFile(); assertTrue(File should exist: + file, file.exists());
svn commit: r1459711 - /camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Author: cmueller
Date: Fri Mar 22 11:05:41 2013
New Revision: 1459711
URL: http://svn.apache.org/r1459711
Log:
speed up a test which fails some time on slow CI servers
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java?rev=1459711r1=1459710r2=1459711view=diff
==
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Fri Mar 22 11:05:41 2013
@@ -35,7 +35,7 @@ import org.junit.Test;
public class FromFtpSetNamesWithMultiDirectoriesTest extends
FtpServerTestSupport {
private String getFtpUrl() {
-return ftp://admin@localhost:; + getPort() +
/incoming?password=adminbinary=truerecursive=true;
+return ftp://admin@localhost:; + getPort() +
/incoming?password=adminbinary=truerecursive=trueinitialDelay=0delay=100;
}
@Override
svn commit: r1459712 - /camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Author: cmueller
Date: Fri Mar 22 11:06:59 2013
New Revision: 1459712
URL: http://svn.apache.org/r1459712
Log:
speed up a test which fails some time on slow CI servers
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java?rev=1459712r1=1459711r2=1459712view=diff
==
---
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Fri Mar 22 11:06:59 2013
@@ -35,7 +35,7 @@ import org.junit.Test;
public class FromFtpSetNamesWithMultiDirectoriesTest extends
FtpServerTestSupport {
private String getFtpUrl() {
-return ftp://admin@localhost:; + getPort() +
/incoming?password=adminbinary=truerecursive=true;
+return ftp://admin@localhost:; + getPort() +
/incoming?password=adminbinary=truerecursive=trueinitialDelay=0delay=100;
}
@Override
svn commit: r1459714 - /camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Author: cmueller
Date: Fri Mar 22 11:10:46 2013
New Revision: 1459714
URL: http://svn.apache.org/r1459714
Log:
speed up a test which fails some time on slow CI servers
Modified:
camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Modified:
camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java?rev=1459714r1=1459713r2=1459714view=diff
==
---
camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
Fri Mar 22 11:10:46 2013
@@ -36,7 +36,7 @@ public class FromFtpSetNamesWithMultiDir
// must user consumer. prefix on the parameters to the file component
private String getFtpUrl() {
return ftp://admin@localhost:; + getPort() +
/incoming?password=adminbinary=true
-+ initialDelay=2500delay=5000recursive=true;
++ initialDelay=0delay=100recursive=true;
}
@Override
svn commit: r1459727 - /camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
Author: cmueller
Date: Fri Mar 22 11:25:07 2013
New Revision: 1459727
URL: http://svn.apache.org/r1459727
Log:
the sjms tests should use dynamic ports to prevent port already in use
exceptions
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java?rev=1459727r1=1459726r2=1459727view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
Fri Mar 22 11:25:07 2013
@@ -26,6 +26,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
/**
@@ -33,9 +34,10 @@ import org.apache.camel.test.junit4.Came
* for unit testing.
*/
public class JmsTestSupport extends CamelTestSupport {
-private static final String BROKER_URI = tcp://localhost:3;
+
@Produce
protected ProducerTemplate template;
+private String brokerUri;
private BrokerService broker;
private Connection connection;
private Session session;
@@ -49,11 +51,13 @@ public class JmsTestSupport extends Came
*/
@Override
protected void doPreSetup() throws Exception {
+brokerUri = tcp://localhost: +
AvailablePortFinder.getNextAvailable(3);
+
broker = new BrokerService();
broker.setUseJmx(true);
broker.setPersistent(false);
broker.deleteAllMessages();
-broker.addConnector(BROKER_URI);
+broker.addConnector(brokerUri);
broker.start();
}
@@ -89,7 +93,7 @@ public class JmsTestSupport extends Came
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
-ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(BROKER_URI);
+ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(brokerUri);
connection = connectionFactory.createConnection();
connection.start();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -107,5 +111,4 @@ public class JmsTestSupport extends Came
public Session getSession() {
return session;
}
-
}
svn commit: r1460015 - in /camel/trunk/components/camel-sql/src: main/java/org/apache/camel/component/sql/SqlComponent.java test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
Author: cmueller
Date: Fri Mar 22 21:49:03 2013
New Revision: 1460015
URL: http://svn.apache.org/r1460015
Log:
CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not
exists yet - work in progress
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java?rev=1460015r1=1460014r2=1460015view=diff
==
---
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
(original)
+++
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
Fri Mar 22 21:49:03 2013
@@ -42,10 +42,19 @@ public class SqlComponent extends Defaul
@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
-String dataSourceRef = getAndRemoveParameter(parameters,
dataSourceRef, String.class);
-if (dataSourceRef != null) {
-dataSource = CamelContextHelper.mandatoryLookup(getCamelContext(),
dataSourceRef, DataSource.class);
+DataSource ds = resolveAndRemoveReferenceParameter(parameters,
dataSource, DataSource.class);
+if (ds != null) {
+dataSource = ds;
}
+
+//TODO cmueller: remove the 'dataSourceRef' lookup in Camel 3.0
+if (dataSource == null) {
+String dataSourceRef = getAndRemoveParameter(parameters,
dataSourceRef, String.class);
+if (dataSourceRef != null) {
+dataSource =
CamelContextHelper.mandatoryLookup(getCamelContext(), dataSourceRef,
DataSource.class);
+}
+}
+
String parameterPlaceholderSubstitute =
getAndRemoveParameter(parameters, placeholder, String.class, #);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java?rev=1460015view=auto
==
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
(added)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
Fri Mar 22 21:49:03 2013
@@ -0,0 +1,86 @@
+/**
+ * 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.component.sql;
+
+import java.util.List;
+import java.util.Map;
+
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+public class SqlDataSourceTest extends CamelTestSupport {
+
+private EmbeddedDatabase db;
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry jndi = super.createRegistry();
+
+// this is the database we create with some initial data for our unit
test
+db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript(sql/createAndPopulateDatabase.sql).build();
+
+jndi.bind(dataSource, db);
+
+return jndi;
+}
+
+@Test
+public void testSimpleBody() throws Exception {
+MockEndpoint mock = getMockEndpoint(mock:result);
+mock.expectedMessageCount(1);
+
+template.sendBody(direct:simple, XXX
