[02/10] git commit: CAMEL-7731: fix typo
CAMEL-7731: fix typo
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7ba9267
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7ba9267
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7ba9267
Branch: refs/heads/master
Commit: d7ba926794b4df826c0fc8c57e4ce5afb72bb0e2
Parents: b8e9430
Author: david da...@davidkarlsen.com
Authored: Thu Aug 21 18:48:03 2014 +0200
Committer: david da...@davidkarlsen.com
Committed: Thu Aug 21 18:48:03 2014 +0200
--
.../java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d7ba9267/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
--
diff --git
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
index 0416573..393bcb4 100644
---
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
+++
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/DefaultBeanRowMapper.java
@@ -39,7 +39,7 @@ public class DefaultBeanRowMapper implements BeanRowMapper {
continue;
}
if (toUpper) {
-char upper = Character.toLowerCase(ch);
+char upper = Character.toUpperCase(ch);
sb.append(upper);
// reset flag
toUpper = false;
[05/10] git commit: Merge branch 'CAMEL-7731' of https://github.com/davidkarlsen/camel
Merge branch 'CAMEL-7731' of https://github.com/davidkarlsen/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f68f2b4f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f68f2b4f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f68f2b4f Branch: refs/heads/master Commit: f68f2b4f27894c21dbf4d0262d371ba6efb1f5f6 Parents: 64bf349 d7ba926 Author: Claus Ibsen davscl...@apache.org Authored: Fri Aug 22 07:37:44 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Fri Aug 22 07:37:44 2014 +0200 -- --
[07/10] git commit: CAMEL-7724: Fixed CS
CAMEL-7724: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2025456
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2025456
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2025456
Branch: refs/heads/master
Commit: c20254566b65485ddb0e9d11d4bc2b67e4bd9e95
Parents: a02bd17
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 08:07:38 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:07:38 2014 +0200
--
.../dataformat/bindy/format/BooleanFormat.java | 2 +-
.../BindySimpleCsvBooleanUnmarshallTest.java| 10 +++---
.../bindy/model/simple/bool/BooleanExample.java | 33 ++--
3 files changed, 23 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c2025456/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
--
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
index d94596e..ac0955f 100755
---
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
@@ -25,7 +25,7 @@ public class BooleanFormat implements FormatBoolean {
}
public Boolean parse(String string) throws Exception {
-return new Boolean(string);
+return Boolean.valueOf(string);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c2025456/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
--
diff --git
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
index 44ad4a1..57eea3b 100755
---
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
+++
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
@@ -16,11 +16,6 @@
*/
package org.apache.camel.dataformat.bindy.csv;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.util.List;
import java.util.Map;
@@ -37,6 +32,11 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
@ContextConfiguration
public class BindySimpleCsvBooleanUnmarshallTest extends
AbstractJUnit4SpringContextTests {
http://git-wip-us.apache.org/repos/asf/camel/blob/c2025456/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/bool/BooleanExample.java
--
diff --git
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/bool/BooleanExample.java
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/bool/BooleanExample.java
index 7378a01..07801ea 100644
---
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/bool/BooleanExample.java
+++
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/bool/BooleanExample.java
@@ -21,31 +21,32 @@ import
org.apache.camel.dataformat.bindy.annotation.DataField;
@CsvRecord(separator = ,)
public class BooleanExample {
+
@DataField(pos = 1)
public String name;
@DataField(pos = 2, defaultValue = true)
public Boolean exist;
- public String getName() {
- return name;
- }
+public String getName() {
+return name;
+}
- public void setName(String name) {
- this.name = name;
- }
+public void setName(String name) {
+this.name = name;
+}
- public Boolean getExist() {
- return exist;
- }
+public Boolean getExist() {
+return exist;
+}
- public void setExist(Boolean exist) {
- this.exist = exist;
- }
+
[08/10] git commit: CAMEL-7730: Fixed CS
CAMEL-7730: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84812de9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84812de9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84812de9
Branch: refs/heads/master
Commit: 84812de9615a32fb8e683de1643bc9840f689e5d
Parents: c202545
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 08:11:06 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:11:06 2014 +0200
--
.../apache/camel/component/infinispan/InfinispanOperation.java | 4 ++--
.../camel/component/infinispan/InfinispanProducerTest.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/84812de9/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
--
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
index 04ffe55..9299fd6 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
@@ -39,9 +39,9 @@ public class InfinispanOperation {
private Operation getOperation(Exchange exchange) {
String operation =
exchange.getIn().getHeader(InfinispanConstants.OPERATION, String.class);
if (operation == null) {
-if(configuration.getCommand() != null){
+if (configuration.getCommand() != null) {
operation = InfinispanConstants.OPERATION +
configuration.getCommand();
-} else{
+} else {
operation = InfinispanConstants.PUT;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/84812de9/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
--
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index 7a7d003..a5f6b25 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.infinispan;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Assert;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -157,7 +156,7 @@ public class InfinispanProducerTest extends
InfinispanTestSupport {
assertTrue(currentCache().isEmpty());
currentCache().put(COMMAND_KEY, COMMAND_VALUE);
-currentCache().put(keyTest,valueTest);
+currentCache().put(keyTest, valueTest);
template.send(direct:clear, new Processor() {
@Override
[06/10] git commit: Merge branch 'improvement-camel-7724' of https://github.com/oscerd/camel
Merge branch 'improvement-camel-7724' of https://github.com/oscerd/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a02bd177 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a02bd177 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a02bd177 Branch: refs/heads/master Commit: a02bd177da38268199b48a8be62f8df932c53f4e Parents: f68f2b4 6c66ed4 Author: Claus Ibsen davscl...@apache.org Authored: Fri Aug 22 07:38:33 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Fri Aug 22 07:38:33 2014 +0200 -- .../camel/dataformat/bindy/FormatFactory.java | 3 + .../dataformat/bindy/format/BooleanFormat.java | 31 + .../BindySimpleCsvBooleanFalseMarshallTest.java | 84 .../BindySimpleCsvBooleanTrueMarshallTest.java | 84 .../BindySimpleCsvBooleanUnmarshallTest.java| 130 +++ .../bindy/model/simple/bool/BooleanExample.java | 51 ...impleCsvBooleanFalseMarshallTest-context.xml | 32 + ...SimpleCsvBooleanTrueMarshallTest-context.xml | 32 + ...dySimpleCsvBooleanUnmarshallTest-context.xml | 32 + 9 files changed, 479 insertions(+) --
[03/10] git commit: Improvement Camel-7724 camel-bindy - Add support for boolean data type formatter
Improvement Camel-7724 camel-bindy - Add support for boolean data type formatter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c66ed40
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c66ed40
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c66ed40
Branch: refs/heads/master
Commit: 6c66ed409dcfb50bfcbc1a696a1852ad6d044e96
Parents: b0c572f
Author: ancosen anco...@gmail.com
Authored: Thu Aug 21 23:37:15 2014 +0200
Committer: ancosen anco...@gmail.com
Committed: Thu Aug 21 23:37:15 2014 +0200
--
.../camel/dataformat/bindy/FormatFactory.java | 3 +
.../dataformat/bindy/format/BooleanFormat.java | 31 +
.../BindySimpleCsvBooleanFalseMarshallTest.java | 84
.../BindySimpleCsvBooleanTrueMarshallTest.java | 84
.../BindySimpleCsvBooleanUnmarshallTest.java| 130 +++
.../bindy/model/simple/bool/BooleanExample.java | 51
...impleCsvBooleanFalseMarshallTest-context.xml | 32 +
...SimpleCsvBooleanTrueMarshallTest-context.xml | 32 +
...dySimpleCsvBooleanUnmarshallTest-context.xml | 32 +
9 files changed, 479 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6c66ed40/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
--
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
index 9f11926..d5dc68b 100755
---
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
@@ -26,6 +26,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField;
import org.apache.camel.dataformat.bindy.format.BigDecimalFormat;
import org.apache.camel.dataformat.bindy.format.BigIntegerFormat;
+import org.apache.camel.dataformat.bindy.format.BooleanFormat;
import org.apache.camel.dataformat.bindy.format.ByteFormat;
import org.apache.camel.dataformat.bindy.format.BytePatternFormat;
import org.apache.camel.dataformat.bindy.format.CharacterFormat;
@@ -102,6 +103,8 @@ public final class FormatFactory {
return new DatePatternFormat(pattern, timezone, getLocale(locale));
} else if (clazz == char.class || clazz == Character.class) {
return new CharacterFormat();
+} else if (clazz == boolean.class || clazz == Boolean.class) {
+return new BooleanFormat();
} else if (clazz.isEnum()) {
return new EnumFormat(clazz);
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/6c66ed40/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
--
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
new file mode 100755
index 000..d94596e
--- /dev/null
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/BooleanFormat.java
@@ -0,0 +1,31 @@
+/**
+ * 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.dataformat.bindy.format;
+
+import org.apache.camel.dataformat.bindy.Format;
+
+public class BooleanFormat implements FormatBoolean {
+
+public String format(Boolean object) throws Exception {
+return object.toString();
+}
+
+public Boolean parse(String string) throws Exception {
+return new Boolean(string);
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6c66ed40/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
[09/10] git commit: CAMEL-7730 plus added junit test for this bug
CAMEL-7730 plus added junit test for this bug
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8d382ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8d382ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8d382ec
Branch: refs/heads/camel-2.13.x
Commit: f8d382ec95c8cab558364bb8ec48cfa39cb8c9ac
Parents: c2ddc7b
Author: Roman Jakubco rjaku...@redhat.com
Authored: Thu Aug 21 16:38:57 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:11:41 2014 +0200
--
.../infinispan/InfinispanOperation.java | 10 +++-
.../infinispan/InfinispanProducer.java | 2 +-
.../infinispan/InfinispanProducerTest.java | 58
3 files changed, 67 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d382ec/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
--
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
index ae8e18d..04ffe55 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
@@ -24,9 +24,11 @@ import org.slf4j.LoggerFactory;
public class InfinispanOperation {
private static final transient Logger LOGGER =
LoggerFactory.getLogger(InfinispanOperation.class);
private final BasicCacheObject, Object cache;
+private final InfinispanConfiguration configuration;
-public InfinispanOperation(BasicCacheObject, Object cache) {
+public InfinispanOperation(BasicCacheObject, Object cache,
InfinispanConfiguration configuration) {
this.cache = cache;
+this.configuration = configuration;
}
public void process(Exchange exchange) {
@@ -37,7 +39,11 @@ public class InfinispanOperation {
private Operation getOperation(Exchange exchange) {
String operation =
exchange.getIn().getHeader(InfinispanConstants.OPERATION, String.class);
if (operation == null) {
-operation = InfinispanConstants.PUT;
+if(configuration.getCommand() != null){
+operation = InfinispanConstants.OPERATION +
configuration.getCommand();
+} else{
+operation = InfinispanConstants.PUT;
+}
}
LOGGER.trace(Operation: [{}], operation);
return
Operation.valueOf(operation.substring(InfinispanConstants.OPERATION.length()).toUpperCase());
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d382ec/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
--
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
index 9e3037c..4063553 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
@@ -39,7 +39,7 @@ public class InfinispanProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
-new InfinispanOperation(getCache(exchange)).process(exchange);
+new InfinispanOperation(getCache(exchange),
configuration).process(exchange);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d382ec/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
--
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index e31fd92..7a7d003 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.infinispan;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.junit.Assert;
import
[5/6] git commit: CAMEL-7734: Added commons-pool to camel-sjms feature
CAMEL-7734: Added commons-pool to camel-sjms feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1416c02
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1416c02
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1416c02
Branch: refs/heads/master
Commit: a1416c023abe9984107f02f22a621f36cecc22a8
Parents: 86efd45
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 08:31:37 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:31:37 2014 +0200
--
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a1416c02/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index b6d7212..e178f0f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1056,6 +1056,7 @@
!-- JTA is not currently supported by SJMS but is a required dependency
of the Geronimo JMS Bundle --
bundle
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}/bundle
bundle
dependency='true'mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}/bundle
+bundle
dependency='true'mvn:commons-pool/commons-pool/${commons-pool-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-sjms/${project.version}/bundle
/feature
[3/6] CAMEL-7734: Fixed CS.
http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
--
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index d7eb449..3dac038 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.sjms.producer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import javax.jms.Connection;
import javax.jms.Message;
import javax.jms.MessageProducer;
@@ -97,13 +96,13 @@ public class InOnlyProducer extends SjmsProducer {
CollectionMessage messages = new ArrayListMessage(1);
if (exchange.getIn().getBody() != null) {
if (exchange.getIn().getBody() instanceof List) {
-Iterable? payload =
(Iterable?)exchange.getIn().getBody();
+Iterable? payload = (Iterable?)
exchange.getIn().getBody();
for (final Object object : payload) {
Message message;
if (BatchMessage.class.isInstance(object)) {
-BatchMessage? batchMessage =
(BatchMessage?)object;
+BatchMessage? batchMessage = (BatchMessage?)
object;
message =
JmsMessageHelper.createMessage(producer.getSession(),
batchMessage.getPayload(), batchMessage.getHeaders(), getSjmsEndpoint()
-.getJmsKeyFormatStrategy());
+.getJmsKeyFormatStrategy());
} else {
message =
JmsMessageHelper.createMessage(producer.getSession(), object,
exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy());
}
@@ -112,7 +111,7 @@ public class InOnlyProducer extends SjmsProducer {
} else {
Object payload = exchange.getIn().getBody();
Message message = JmsMessageHelper
-.createMessage(producer.getSession(), payload,
exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy());
+.createMessage(producer.getSession(), payload,
exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy());
messages.add(message);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
--
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 88a289a..2830113 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.Message;
@@ -58,16 +57,13 @@ public class InOutProducer extends SjmsProducer {
/**
* We use the {@link ReadWriteLock} to manage the {@link TreeMap} in place
* of a {@link ConcurrentMap} because due to significant performance gains.
- * TODO Externalize the Exchanger Map to a store object
*/
private static MapString, ExchangerObject exchangerMap = new
TreeMapString, ExchangerObject();
private ReadWriteLock lock = new ReentrantReadWriteLock();
/**
* A pool of {@link MessageConsumerResource} objects that are the reply
- * consumers.
- * TODO Add Class documentation for MessageProducerPool
- * TODO Externalize
+ * consumers.
*/
protected class MessageConsumerResourcesFactory extends
BasePoolableObjectFactoryMessageConsumerResources {
@@ -141,11 +137,6 @@ public class InOutProducer extends SjmsProducer {
private final Logger tempLogger =
LoggerFactory.getLogger(InternalTempDestinationListener.class);
private ExchangerObject exchanger;
-/**
- * TODO Add Constructor Javadoc
- *
- * @param exchanger
- */
public
[1/6] git commit: CAMEL-7734: Replace custom pool implementation by commons-pool
Repository: camel
Updated Branches:
refs/heads/master 84812de96 - eb0e437ec
CAMEL-7734: Replace custom pool implementation by commons-pool
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88809ef3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88809ef3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88809ef3
Branch: refs/heads/master
Commit: 88809ef3d08a8752572ae2302e90499c995121e6
Parents: 8142b43
Author: Cristiano Nicolai cristiano.nico...@gmail.com
Authored: Thu Aug 21 01:25:54 2014 +1000
Committer: Cristiano Nicolai cristiano.nico...@gmail.com
Committed: Fri Aug 22 11:18:20 2014 +1000
--
components/camel-sjms/pom.xml | 4 +
.../sjms/MessageConsumerResources.java | 56 +
.../sjms/MessageProducerResources.java | 55 +
.../camel/component/sjms/SjmsConsumer.java | 112 --
.../component/sjms/SjmsMessageConsumer.java | 38
.../camel/component/sjms/SjmsProducer.java | 101 +++--
.../sjms/jms/ConnectionFactoryResource.java | 59 +++--
.../component/sjms/jms/ConnectionResource.java | 10 -
.../camel/component/sjms/jms/ObjectPool.java| 148 -
.../camel/component/sjms/jms/SessionPool.java | 170 ---
.../component/sjms/producer/InOnlyProducer.java | 1 +
.../component/sjms/producer/InOutProducer.java | 81 ++-
.../component/sjms/it/ConnectionResourceIT.java | 24 +--
.../sjms/jms/ConnectionFactoryResourceTest.java | 36 ++--
.../component/sjms/jms/ObjectPoolTest.java | 216 ---
.../component/sjms/jms/SessionPoolTest.java | 118 --
16 files changed, 274 insertions(+), 955 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/88809ef3/components/camel-sjms/pom.xml
--
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 1b46386..e6e45d0 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -59,6 +59,10 @@
groupIdorg.apache.camel/groupId
artifactIdcamel-core/artifactId
/dependency
+dependency
+groupIdcommons-pool/groupId
+artifactIdcommons-pool/artifactId
+/dependency
dependency
groupIdorg.apache.geronimo.specs/groupId
http://git-wip-us.apache.org/repos/asf/camel/blob/88809ef3/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
--
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
new file mode 100644
index 000..945b133
--- /dev/null
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
@@ -0,0 +1,56 @@
+package org.apache.camel.component.sjms;
+
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+public class MessageConsumerResources {
+
+private final Session session;
+private final MessageConsumer messageConsumer;
+private final Destination replyToDestination;
+
+public MessageConsumerResources(MessageConsumer messageConsumer) {
+this(null, messageConsumer, null);
+}
+
+public MessageConsumerResources(Session session, MessageConsumer
messageConsumer) {
+this(session, messageConsumer, null);
+}
+
+/**
+ * TODO Add Constructor Javadoc
+ *
+ * @param session
+ * @param messageConsumer
+ */
+public MessageConsumerResources(Session session, MessageConsumer
messageConsumer, Destination replyToDestination) {
+this.session = session;
+this.messageConsumer = messageConsumer;
+this.replyToDestination = replyToDestination;
+}
+
+/**
+ * Gets the Session value of session for this instance of
+ * MessageProducerModel.
+ *
+ * @return the session
+ */
+public Session getSession() {
+return session;
+}
+
+/**
+ * Gets the QueueSender value of queueSender for this instance of
+ * MessageProducerModel.
+ *
+ * @return the queueSender
+ */
+public MessageConsumer getMessageConsumer() {
+return messageConsumer;
+}
+
+public Destination getReplyToDestination() {
+return replyToDestination;
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/88809ef3/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageProducerResources.java
--
[6/6] git commit: CAMEL-7734: pom.xml like the other components.
CAMEL-7734: pom.xml like the other components.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eb0e437e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb0e437e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb0e437e
Branch: refs/heads/master
Commit: eb0e437ece16756c88f23ad1de4db5e788c4d161
Parents: a1416c0
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 08:37:32 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:37:32 2014 +0200
--
components/camel-sjms/pom.xml | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eb0e437e/components/camel-sjms/pom.xml
--
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index e6e45d0..d34eeba 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -37,12 +37,6 @@
org.apache.camel.component.sjms,
org.apache.camel.component.sjms.jms
/camel.osgi.export.pkg
-camel.osgi.import.pkg
-!org.apache.camel.component.sjms.*,
-org.apache.camel.*;${camel.osgi.import.camel.version},
-${camel.osgi.import.defaults},
-*
-/camel.osgi.import.pkg
camel.osgi.private.pkg
org.apache.camel.component.sjms.consumer,
org.apache.camel.component.sjms.producer,
[2/6] git commit: Merge branch 'camel-7734' of https://github.com/cristianonicolai/camel
Merge branch 'camel-7734' of https://github.com/cristianonicolai/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24c20ed6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24c20ed6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24c20ed6 Branch: refs/heads/master Commit: 24c20ed69df2c070038d37b2522371b7154fa031 Parents: 84812de 88809ef Author: Claus Ibsen davscl...@apache.org Authored: Fri Aug 22 08:16:48 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Fri Aug 22 08:16:48 2014 +0200 -- components/camel-sjms/pom.xml | 4 + .../sjms/MessageConsumerResources.java | 56 + .../sjms/MessageProducerResources.java | 55 + .../camel/component/sjms/SjmsConsumer.java | 112 -- .../component/sjms/SjmsMessageConsumer.java | 38 .../camel/component/sjms/SjmsProducer.java | 101 +++-- .../sjms/jms/ConnectionFactoryResource.java | 59 +++-- .../component/sjms/jms/ConnectionResource.java | 10 - .../camel/component/sjms/jms/ObjectPool.java| 148 - .../camel/component/sjms/jms/SessionPool.java | 170 --- .../component/sjms/producer/InOnlyProducer.java | 1 + .../component/sjms/producer/InOutProducer.java | 81 ++- .../component/sjms/it/ConnectionResourceIT.java | 24 +-- .../sjms/jms/ConnectionFactoryResourceTest.java | 36 ++-- .../component/sjms/jms/ObjectPoolTest.java | 216 --- .../component/sjms/jms/SessionPoolTest.java | 118 -- 16 files changed, 274 insertions(+), 955 deletions(-) --
[4/6] git commit: CAMEL-7734: Fixed CS.
CAMEL-7734: Fixed CS.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86efd450
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86efd450
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86efd450
Branch: refs/heads/master
Commit: 86efd450439c347c083b6d06fab7e2b5d670709c
Parents: 24c20ed
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 08:28:28 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 08:28:28 2014 +0200
--
.../camel/component/sjms/BatchMessage.java | 3 +-
.../sjms/MessageConsumerResources.java | 34
.../sjms/MessageProducerResources.java | 22 -
.../camel/component/sjms/SjmsComponent.java | 19 ++---
.../camel/component/sjms/SjmsConstants.java | 3 -
.../camel/component/sjms/SjmsConsumer.java | 42 +-
.../camel/component/sjms/SjmsEndpoint.java | 74 -
.../sjms/SjmsExchangeMessageHelper.java | 87 ++--
.../camel/component/sjms/SjmsProducer.java | 42 +-
.../sjms/TransactionCommitStrategy.java | 9 +-
.../sjms/consumer/AbstractMessageHandler.java | 11 ++-
.../sjms/consumer/InOnlyMessageHandler.java | 1 -
.../sjms/consumer/InOutMessageHandler.java | 31 ++-
.../sjms/jms/ConnectionFactoryResource.java | 31 +--
.../component/sjms/jms/ConnectionResource.java | 4 +-
.../sjms/jms/DefaultJmsKeyFormatStrategy.java | 2 -
.../sjms/jms/IllegalHeaderException.java| 2 +-
.../sjms/jms/JmsMessageHeaderType.java | 4 +-
.../component/sjms/jms/JmsMessageHelper.java| 75 +
.../component/sjms/jms/JmsMessageType.java | 6 +-
.../component/sjms/jms/JmsObjectFactory.java| 70
.../component/sjms/jms/KeyFormatStrategy.java | 6 +-
.../sjms/jms/SessionAcknowledgementType.java| 13 ++-
.../component/sjms/producer/InOnlyProducer.java | 9 +-
.../component/sjms/producer/InOutProducer.java | 29 ++-
.../sjms/tx/BatchTransactionCommitStrategy.java | 3 +-
.../tx/DefaultTransactionCommitStrategy.java| 7 +-
.../SessionBatchTransactionSynchronization.java | 3 +-
.../tx/SessionTransactionSynchronization.java | 8 +-
.../sjms/jms/ConnectionFactoryResourceTest.java | 48 ++-
.../sjms/producer/InOutQueueProducerTest.java | 6 --
.../producer/InOutTempQueueProducerTest.java| 6 --
.../sjms/support/SjmsConnectionTestSupport.java | 42 --
33 files changed, 296 insertions(+), 456 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
--
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
index e16c7bc..fd9b79e 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/BatchMessage.java
@@ -22,7 +22,6 @@ import java.util.Map;
/**
* A {@link List} of these objects can be used to batch a collection of bodies
and
* header pairs in one exchange.
- *
*/
public class BatchMessageT {
private T payload;
@@ -70,7 +69,7 @@ public class BatchMessageT {
if (!(obj instanceof BatchMessage)) {
return false;
}
-BatchMessage other = (BatchMessage)obj;
+BatchMessage other = (BatchMessage) obj;
if (headers == null) {
if (other.headers != null) {
return false;
http://git-wip-us.apache.org/repos/asf/camel/blob/86efd450/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
--
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
index 945b133..6923318 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/MessageConsumerResources.java
@@ -1,3 +1,19 @@
+/**
+ * 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
[CONF] Apache Camel Camel 2.14.0 Release
Claus Ibsen edited the page: Camel 2.14.0 Release ... Support for running on Java 1.8 JVMs Spring 4.x supported. REST DSL to define REST services using a REST style with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML DSL. REST DSL integrated with Swagger to expose the service as swagger apis. Simple language defined in routes using resultType as boolean is now evaluated as predicate instead of as _expression_. Introduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs. Added event notification for routes added and removed. Allow to configure cache size in Recipient List, Routing Slip and Dynamic Router EIPs; and as well turn caching off. Netty HTTPproducer now supports the CamelHttpPath header to define a dynamic context-path and query parameters to call the remote http server. Polling Consumerallows to configure initial queue size and whether to block when full when using the defaultEventDrivenPollingConsumer which most components does. We now block by default, as otherwise the message may be lost if the queue was full, and a new message was offered. Added a generic callback to configure the APNS service builder. AddedStreamList option to theJDBC component Allow to define Simple expressions for sql parameters of the SQL component. A new XML tokenizer that is truly XML-aware (e.g., supporting XML namespaces and complex hierarchical structures) Added optionparallelAggregate to Multicast, Splitter and Recipient ListEIPs Support to set the variable map from message header in Velocity, Freemarker, StringTemplate. Added HazelcastInstance option toHazelcast component. Producers from static EIPs such as to is is now also enlisted in JMX when Camel is starting routes. Unmarshal json to pojo usingcamel-jackson now supports a header to tell Camel what the pojo class name is, to allow more dynamic behavior, as otherwise the class name would be hardcoded. Also allow to configurecamel-jackson to skip null values, by setting includes toNOT_NULL. Andcamel-jackson can now easily be configured to unmarshal to aListpojoor ListMapinstead of either a single pojo orMap type. IntroducedSynchronizationRouteAware allowing to have callbacks before/after an Exchange is being routed. This allows to trigger custom code at these points, for example after a route, but before a Consumer writes any response back to a caller (InOut mode). JDBCnow supports outputClass for SelectList type.
[2/3] git commit: CAMEL-7735: Fixed producer template to not emit 2x sent event to notifier if the exchange was manually created and using the send method.
CAMEL-7735: Fixed producer template to not emit 2x sent event to notifier if
the exchange was manually created and using the send method.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/147adf78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/147adf78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/147adf78
Branch: refs/heads/camel-2.13.x
Commit: 147adf782a8125c7d4929e6e90282eefacc748ff
Parents: 430d1a2
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 10:25:44 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 10:38:28 2014 +0200
--
.../org/apache/camel/impl/ProducerCache.java| 14 ---
.../SentExchangeEventNotifierIssueTest.java | 117 +++
.../SentExchangeEventNotifierTwoIssueTest.java | 114 ++
3 files changed, 231 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/147adf78/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index dd3b0a0..7b713c8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -228,16 +228,7 @@ public class ProducerCache extends ServiceSupport {
}
}
-StopWatch watch = null;
-if (eventNotifierEnabled exchange != null) {
-// record timing for sending the exchange using the producer
-watch = new StopWatch();
-}
-
try {
-if (eventNotifierEnabled exchange != null) {
-EventHelper.notifyExchangeSending(exchange.getContext(),
exchange, endpoint);
-}
// invoke the callback
answer = callback.doInProducer(producer, exchange, pattern);
} catch (Throwable e) {
@@ -245,11 +236,6 @@ public class ProducerCache extends ServiceSupport {
exchange.setException(e);
}
} finally {
-if (eventNotifierEnabled exchange != null) {
-long timeTaken = watch.stop();
-// emit event that the exchange was sent to the endpoint
-EventHelper.notifyExchangeSent(exchange.getContext(),
exchange, endpoint, timeTaken);
-}
if (producer instanceof ServicePoolAware) {
// release back to the pool
pool.release(endpoint, producer);
http://git-wip-us.apache.org/repos/asf/camel/blob/147adf78/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
b/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
new file mode 100644
index 000..c210d2c
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
@@ -0,0 +1,117 @@
+/**
+ * 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.issues;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.management.event.ExchangeSentEvent;
+import org.apache.camel.support.EventNotifierSupport;
+
+public class SentExchangeEventNotifierIssueTest extends ContextTestSupport {
+
+private MyNotifier notifier = new MyNotifier();
+
+private class MyNotifier extends EventNotifierSupport {
+
+private int counter;
+
+@Override
+public void notify(EventObject event) throws Exception {
+
[1/3] git commit: CAMEL-7735: Fixed producer template to not emit 2x sent event to notifier if the exchange was manually created and using the send method.
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 57d9e9cfe - 42e26e10d
refs/heads/camel-2.13.x 430d1a254 - 147adf782
refs/heads/master 130fba438 - 07c1fd97c
CAMEL-7735: Fixed producer template to not emit 2x sent event to notifier if
the exchange was manually created and using the send method.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07c1fd97
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07c1fd97
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07c1fd97
Branch: refs/heads/master
Commit: 07c1fd97c16cc1c24f67522de4cbd2d45f386c2b
Parents: 130fba4
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 10:25:44 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 10:25:44 2014 +0200
--
.../org/apache/camel/impl/ProducerCache.java| 14 ---
.../SentExchangeEventNotifierIssueTest.java | 117 +++
.../SentExchangeEventNotifierTwoIssueTest.java | 114 ++
3 files changed, 231 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/07c1fd97/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index ab4..94a352f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -228,16 +228,7 @@ public class ProducerCache extends ServiceSupport {
}
}
-StopWatch watch = null;
-if (eventNotifierEnabled exchange != null) {
-// record timing for sending the exchange using the producer
-watch = new StopWatch();
-}
-
try {
-if (eventNotifierEnabled exchange != null) {
-EventHelper.notifyExchangeSending(exchange.getContext(),
exchange, endpoint);
-}
// invoke the callback
answer = callback.doInProducer(producer, exchange, pattern);
} catch (Throwable e) {
@@ -245,11 +236,6 @@ public class ProducerCache extends ServiceSupport {
exchange.setException(e);
}
} finally {
-if (eventNotifierEnabled exchange != null) {
-long timeTaken = watch.stop();
-// emit event that the exchange was sent to the endpoint
-EventHelper.notifyExchangeSent(exchange.getContext(),
exchange, endpoint, timeTaken);
-}
if (producer instanceof ServicePoolAware) {
// release back to the pool
pool.release(endpoint, producer);
http://git-wip-us.apache.org/repos/asf/camel/blob/07c1fd97/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
b/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
new file mode 100644
index 000..c210d2c
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
@@ -0,0 +1,117 @@
+/**
+ * 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.issues;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.management.event.ExchangeSentEvent;
+import org.apache.camel.support.EventNotifierSupport;
+
+public class SentExchangeEventNotifierIssueTest extends ContextTestSupport {
+
+private MyNotifier notifier = new MyNotifier();
+
+private
[1/3] git commit: CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating producer fails when its used in dynamic eips such as routing slip etc.
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 42e26e10d - f341506ea
refs/heads/camel-2.13.x 147adf782 - 48567a23d
refs/heads/master 07c1fd97c - 7ad36e3d2
CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating
producer fails when its used in dynamic eips such as routing slip etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ad36e3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ad36e3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ad36e3d
Branch: refs/heads/master
Commit: 7ad36e3d2711bb62bff013968f789e83efa69b40
Parents: 07c1fd9
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 13:37:50 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 13:37:50 2014 +0200
--
.../org/apache/camel/impl/ProducerCache.java| 37 -
.../RoutingSlipCreateProducerFailedTest.java| 57
2 files changed, 81 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7ad36e3d/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 94a352f..4ece29f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -267,20 +267,31 @@ public class ProducerCache extends ServiceSupport {
*/
public boolean doInAsyncProducer(final Endpoint endpoint, final Exchange
exchange, final ExchangePattern pattern,
final AsyncCallback callback, final
AsyncProducerCallback producerCallback) {
-boolean sync = true;
-// get the producer and we do not mind if its pooled as we can handle
returning it back to the pool
-final Producer producer = doGetProducer(endpoint, true);
-
-if (producer == null) {
-if (isStopped()) {
-LOG.warn(Ignoring exchange sent after processor is stopped:
+ exchange);
-return false;
-} else {
-throw new IllegalStateException(No producer, this processor
has not been started: + this);
+Producer target;
+try {
+// get the producer and we do not mind if its pooled as we can
handle returning it back to the pool
+target = doGetProducer(endpoint, true);
+
+if (target == null) {
+if (isStopped()) {
+LOG.warn(Ignoring exchange sent after processor is
stopped: + exchange);
+callback.done(true);
+return true;
+} else {
+exchange.setException(new IllegalStateException(No
producer, this processor has not been started: + this));
+callback.done(true);
+return true;
+}
}
+} catch (Throwable e) {
+exchange.setException(e);
+callback.done(true);
+return true;
}
+final Producer producer = target;
+
// record timing for sending the exchange using the producer
final StopWatch watch = eventNotifierEnabled exchange != null ? new
StopWatch() : null;
@@ -290,7 +301,7 @@ public class ProducerCache extends ServiceSupport {
}
// invoke the callback
AsyncProcessor asyncProcessor =
AsyncProcessorConverterHelper.convert(producer);
-sync = producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
+return producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
try {
@@ -322,9 +333,9 @@ public class ProducerCache extends ServiceSupport {
if (exchange != null) {
exchange.setException(e);
}
+callback.done(true);
+return true;
}
-
-return sync;
}
protected Exchange sendExchange(final Endpoint endpoint, ExchangePattern
pattern,
http://git-wip-us.apache.org/repos/asf/camel/blob/7ad36e3d/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
[2/3] git commit: CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating producer fails when its used in dynamic eips such as routing slip etc.
CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating
producer fails when its used in dynamic eips such as routing slip etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48567a23
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48567a23
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48567a23
Branch: refs/heads/camel-2.13.x
Commit: 48567a23d40d006701da3503c776a5549532d78e
Parents: 147adf7
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 13:37:50 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 13:39:30 2014 +0200
--
.../org/apache/camel/impl/ProducerCache.java| 37 -
.../RoutingSlipCreateProducerFailedTest.java| 57
2 files changed, 81 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/48567a23/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 7b713c8..35add69 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -267,20 +267,31 @@ public class ProducerCache extends ServiceSupport {
*/
public boolean doInAsyncProducer(final Endpoint endpoint, final Exchange
exchange, final ExchangePattern pattern,
final AsyncCallback callback, final
AsyncProducerCallback producerCallback) {
-boolean sync = true;
-// get the producer and we do not mind if its pooled as we can handle
returning it back to the pool
-final Producer producer = doGetProducer(endpoint, true);
-
-if (producer == null) {
-if (isStopped()) {
-LOG.warn(Ignoring exchange sent after processor is stopped:
+ exchange);
-return false;
-} else {
-throw new IllegalStateException(No producer, this processor
has not been started: + this);
+Producer target;
+try {
+// get the producer and we do not mind if its pooled as we can
handle returning it back to the pool
+target = doGetProducer(endpoint, true);
+
+if (target == null) {
+if (isStopped()) {
+LOG.warn(Ignoring exchange sent after processor is
stopped: + exchange);
+callback.done(true);
+return true;
+} else {
+exchange.setException(new IllegalStateException(No
producer, this processor has not been started: + this));
+callback.done(true);
+return true;
+}
}
+} catch (Throwable e) {
+exchange.setException(e);
+callback.done(true);
+return true;
}
+final Producer producer = target;
+
// record timing for sending the exchange using the producer
final StopWatch watch = eventNotifierEnabled exchange != null ? new
StopWatch() : null;
@@ -290,7 +301,7 @@ public class ProducerCache extends ServiceSupport {
}
// invoke the callback
AsyncProcessor asyncProcessor =
AsyncProcessorConverterHelper.convert(producer);
-sync = producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
+return producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
try {
@@ -322,9 +333,9 @@ public class ProducerCache extends ServiceSupport {
if (exchange != null) {
exchange.setException(e);
}
+callback.done(true);
+return true;
}
-
-return sync;
}
protected Exchange sendExchange(final Endpoint endpoint, ExchangePattern
pattern,
http://git-wip-us.apache.org/repos/asf/camel/blob/48567a23/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
b/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
new file mode 100644
index 000..78749fb
--- /dev/null
+++
[3/3] git commit: CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating producer fails when its used in dynamic eips such as routing slip etc.
CAMEL-7736: Fixed issue with exchange may get stuck as inflight if creating
producer fails when its used in dynamic eips such as routing slip etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f341506e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f341506e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f341506e
Branch: refs/heads/camel-2.12.x
Commit: f341506ea7a88dbe2f27636b8761ee0c3a597c5d
Parents: 42e26e1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 13:37:50 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 13:39:38 2014 +0200
--
.../org/apache/camel/impl/ProducerCache.java| 37 -
.../RoutingSlipCreateProducerFailedTest.java| 57
2 files changed, 81 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f341506e/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index 7b713c8..35add69 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -267,20 +267,31 @@ public class ProducerCache extends ServiceSupport {
*/
public boolean doInAsyncProducer(final Endpoint endpoint, final Exchange
exchange, final ExchangePattern pattern,
final AsyncCallback callback, final
AsyncProducerCallback producerCallback) {
-boolean sync = true;
-// get the producer and we do not mind if its pooled as we can handle
returning it back to the pool
-final Producer producer = doGetProducer(endpoint, true);
-
-if (producer == null) {
-if (isStopped()) {
-LOG.warn(Ignoring exchange sent after processor is stopped:
+ exchange);
-return false;
-} else {
-throw new IllegalStateException(No producer, this processor
has not been started: + this);
+Producer target;
+try {
+// get the producer and we do not mind if its pooled as we can
handle returning it back to the pool
+target = doGetProducer(endpoint, true);
+
+if (target == null) {
+if (isStopped()) {
+LOG.warn(Ignoring exchange sent after processor is
stopped: + exchange);
+callback.done(true);
+return true;
+} else {
+exchange.setException(new IllegalStateException(No
producer, this processor has not been started: + this));
+callback.done(true);
+return true;
+}
}
+} catch (Throwable e) {
+exchange.setException(e);
+callback.done(true);
+return true;
}
+final Producer producer = target;
+
// record timing for sending the exchange using the producer
final StopWatch watch = eventNotifierEnabled exchange != null ? new
StopWatch() : null;
@@ -290,7 +301,7 @@ public class ProducerCache extends ServiceSupport {
}
// invoke the callback
AsyncProcessor asyncProcessor =
AsyncProcessorConverterHelper.convert(producer);
-sync = producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
+return producerCallback.doInAsyncProducer(producer,
asyncProcessor, exchange, pattern, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
try {
@@ -322,9 +333,9 @@ public class ProducerCache extends ServiceSupport {
if (exchange != null) {
exchange.setException(e);
}
+callback.done(true);
+return true;
}
-
-return sync;
}
protected Exchange sendExchange(final Endpoint endpoint, ExchangePattern
pattern,
http://git-wip-us.apache.org/repos/asf/camel/blob/f341506e/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
b/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipCreateProducerFailedTest.java
new file mode 100644
index 000..78749fb
--- /dev/null
+++
git commit: CAMEL-7738: Fixed vertx tests which must fork per test.
Repository: camel Updated Branches: refs/heads/master 7ad36e3d2 - 7a2e5197f CAMEL-7738: Fixed vertx tests which must fork per test. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a2e5197 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a2e5197 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a2e5197 Branch: refs/heads/master Commit: 7a2e5197f54a096b82e897f67faac75d3ed381fb Parents: 7ad36e3 Author: Claus Ibsen davscl...@apache.org Authored: Fri Aug 22 15:18:36 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Fri Aug 22 15:18:36 2014 +0200 -- components/camel-vertx/pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7a2e5197/components/camel-vertx/pom.xml -- diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml index ea6ed54..9b5f1c4 100644 --- a/components/camel-vertx/pom.xml +++ b/components/camel-vertx/pom.xml @@ -65,4 +65,16 @@ /dependency /dependencies + build +plugins + plugin +artifactIdmaven-surefire-plugin/artifactId +configuration + forkModeperTest/forkMode + enableAssertionsfalse/enableAssertions +/configuration + /plugin +/plugins + /build + /project
[1/2] Don't use the deprecated pax-exam classes.
Repository: camel
Updated Branches:
refs/heads/master 7a2e5197f - a2aa6ac83
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
index 490eb94..eee924c 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
@@ -27,15 +27,15 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport {
protected void doPostSetup() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
index 81fbfe2..5dc34e3 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
@@ -29,16 +29,16 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport {
private static Server server;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
index f456e27..1e2d252 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
@@ -36,15 +36,15 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfRsBlueprintRouterTest extends OSGiBlueprintTestSupport {
private static final String PUT_REQUEST =
CustomernameMary/nameid123/id/Customer;
private static final String POST_REQUEST =
CustomernameJack/name/Customer;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
[2/2] git commit: Don't use the deprecated pax-exam classes.
Don't use the deprecated pax-exam classes. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2aa6ac8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2aa6ac8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2aa6ac8 Branch: refs/heads/master Commit: a2aa6ac8300a84a1f74a8b19fae86e328865db8f Parents: 7a2e519 Author: Daniel Kulp dk...@apache.org Authored: Fri Aug 22 10:16:50 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Fri Aug 22 10:16:50 2014 -0400 -- .../src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java | 6 +++--- .../org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java | 4 ++-- .../java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java | 2 +- .../camel/itest/osgi/bean/validator/BeanValidatorTest.java | 6 +++--- .../camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java| 6 +++--- .../apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java | 6 +++--- .../osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java | 6 +++--- .../camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java | 6 +++--- .../osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java | 6 +++--- .../blueprint/BlueprintPropertiesCustomPrefixRouteTest.java| 6 +++--- .../osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java | 6 +++--- .../itest/osgi/blueprint/BlueprintPropertiesRouteTest.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java | 6 +++--- .../blueprint/CamelBlueprintManagedNamePatternFixedTest.java | 6 +++--- .../camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java | 6 +++--- .../itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java | 6 +++--- .../itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java | 6 +++--- .../camel/itest/osgi/cache/CacheManagerFactoryRefTest.java | 6 +++--- .../camel/itest/osgi/cache/CacheRoutesManagementTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/cache/CacheTest.java | 6 +++--- .../apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java| 4 ++-- .../apache/camel/itest/osgi/core/TypeConverterLoaderTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/core/browse/BrowseRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java | 4 ++-- .../osgi/core/dataformat/SerializationDataFormatTest.java | 4 ++-- .../apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/direct/DirectTest.java| 4 ++-- .../apache/camel/itest/osgi/core/file/FileComponentTest.java | 4 ++-- .../apache/camel/itest/osgi/core/file/FileRouteDelayTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/file/FileRouteTest.java | 4 ++-- .../camel/itest/osgi/core/language/LanguageRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/language/SimpleTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/log/LogRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/mock/MockXPathTest.java | 4 ++-- .../camel/itest/osgi/core/packages/OSGiPackageScanTest.java| 4 ++-- .../camel/itest/osgi/core/properties/PropertiesRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java | 4 ++-- .../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java | 4 ++-- .../camel/itest/osgi/core/validator/ValidatorRouteTest.java| 4 ++-- .../test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java | 4 ++-- .../camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java | 6 +++---
git commit: Update to pax-exam provided tinybundles to allow more of the tests to pass
Repository: camel
Updated Branches:
refs/heads/master a2aa6ac83 - 6706b5b4e
Update to pax-exam provided tinybundles to allow more of the tests to pass
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6706b5b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6706b5b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6706b5b4
Branch: refs/heads/master
Commit: 6706b5b4ece1c653135ce2909f4cd67ed70d60f8
Parents: a2aa6ac
Author: Daniel Kulp dk...@apache.org
Authored: Fri Aug 22 10:53:45 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Aug 22 10:53:45 2014 -0400
--
tests/camel-itest-osgi/pom.xml | 5 --
.../BlueprintExplicitPropertiesRouteTest.java | 6 ++-
...lueprintPropertiesCustomPrefixRouteTest.java | 6 ++-
.../BlueprintPropertiesJasyptRouteTest.java | 6 ++-
.../blueprint/BlueprintPropertiesRouteTest.java | 6 ++-
.../osgi/blueprint/CamelBlueprint2Test.java | 12 +++--
.../osgi/blueprint/CamelBlueprint3Test.java | 12 +++--
.../osgi/blueprint/CamelBlueprint4Test.java | 15 +++---
.../osgi/blueprint/CamelBlueprint5Test.java | 6 ++-
.../osgi/blueprint/CamelBlueprint6Test.java | 6 ++-
.../osgi/blueprint/CamelBlueprint7Test.java | 6 ++-
.../osgi/blueprint/CamelBlueprint8Test.java | 8 +--
...melBlueprintManagedNamePatternFixedTest.java | 6 ++-
.../osgi/blueprint/CamelBlueprintTcclTest.java | 7 ++-
.../osgi/blueprint/CamelBlueprintTest.java | 14 ++---
.../CamelMultiVersionBlueprintTest.java | 6 ++-
.../blueprint/OSGiBlueprintHelloWorldTest.java | 6 ++-
.../OSGiBlueprintQuarz2SchedulerTest.java | 6 ++-
.../OSGiIntegrationManagedCamelContextTest.java | 6 ++-
.../osgi/core/xslt/XsltBlueprintRouteTest.java | 8 +--
.../itest/osgi/cxf/CxfBeanSpringRouteTest.java | 9 ++--
.../itest/osgi/cxf/CxfProxyExampleTest.java | 9 ++--
.../blueprint/CxfBeanBlueprintRouterTest.java | 6 ++-
.../cxf/blueprint/CxfBlueprintRouterTest.java | 56
.../cxf/blueprint/CxfRsBlueprintRouterTest.java | 6 ++-
.../itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 6 ++-
.../jclouds/BlobStoreBlueprintRouteTest.java| 8 +--
.../OSGiJettyCamelContextsClassloaderTest.java | 9 ++--
.../jetty/OSGiMulitJettyCamelContextsTest.java | 9 ++--
.../itest/osgi/jpa/JpaBlueprintRouteTest.java | 6 ++-
.../osgi/krati/KratiBlueprintRouteTest.java | 6 ++-
.../camel/itest/osgi/sql/SqlBlueprintRoute.java | 9 ++--
.../osgi/velocity/VelocityBlueprintTest.java| 9 ++--
.../osgi/xmljson/XmlJsonBlueprintRouteTest.java | 6 ++-
.../osgi/xstream/XstreamBlueprintRouteTest.java | 7 +--
35 files changed, 189 insertions(+), 125 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 7001415..f95115e 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -60,11 +60,6 @@
/dependency
dependency
- groupIdorg.ops4j.pax.swissbox/groupId
- artifactIdpax-swissbox-tinybundles/artifactId
- scopetest/scope
-/dependency
-dependency
groupIdorg.apache.karaf/groupId
artifactIdapache-karaf/artifactId
version${karaf-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
index 33d0a74..7316da9 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
@@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
*
@@
git commit: CAMEL-7676: Added unit test.
Repository: camel
Updated Branches:
refs/heads/master 6706b5b4e - 276bf38a1
CAMEL-7676: Added unit test.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/276bf38a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/276bf38a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/276bf38a
Branch: refs/heads/master
Commit: 276bf38a1ef02d7c195c62330b0031695ff51c11
Parents: 6706b5b
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Aug 22 17:11:05 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Aug 22 17:11:05 2014 +0200
--
.../apache/camel/issues/AdviceWithCBRTest.java | 23
1 file changed, 23 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/276bf38a/camel-core/src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java
b/camel-core/src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java
index 83965ba..67c8277 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/AdviceWithCBRTest.java
@@ -49,6 +49,29 @@ public class AdviceWithCBRTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
}
+public void testAdviceToStringCBR() throws Exception {
+RouteDefinition route = context.getRouteDefinitions().get(0);
+route.adviceWith(context, new AdviceWithRouteBuilder() {
+@Override
+public void configure() throws Exception {
+weaveByToString(To[mock:foo]).after().to(mock:foo2);
+weaveByToString(To[mock:bar]).after().to(mock:bar2);
+}
+});
+
+getMockEndpoint(mock:foo).expectedBodiesReceived(Hello World);
+getMockEndpoint(mock:foo2).expectedBodiesReceived(Hello World);
+getMockEndpoint(mock:bar).expectedBodiesReceived(Bye World);
+getMockEndpoint(mock:bar2).expectedBodiesReceived(Bye World);
+getMockEndpoint(mock:baz).expectedBodiesReceived(Hi World);
+
+template.sendBodyAndHeader(direct:start, Hello World, foo,
123);
+template.sendBodyAndHeader(direct:start, Bye World, bar, 123);
+template.sendBody(direct:start, Hi World);
+
+assertMockEndpointsSatisfied();
+}
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
[CONF] Apache Camel UuidGenerator
Claus Ibsen edited the page: UuidGenerator ... Starting with Camel 2.5, Camel supports 3rd party UUID generator(s). This is useful, if e.g. your messaging provider does not support UUID's with a length of 36 characters (like Websphere MQ). Another useful scenario is to use a simple counter for testing purpose. With this it is easier to correlate the exchanges in the log/debugger. Camel uses UUIDs in the exchange and message ids, and other unique ids it uses. You only have to implement org.apache.camel.spi.UuidGenerator and tell Camel, that it should use your custom implementation: Configuring from Java DSL Code Block getContext().setUuidGenerator(new MyCustomUuidGenerator()); ... Camel will configure this UUID generator by doing a lookup in the Spring bean registry to find the bean of the type org.apache.camel.spi.UuidGenerator. Code Block bean id=activeMQUuidGenerator class=org.apache.camel.impl.ActiveMQUuidGenerator / camelContext id=camel xmlns=http://camel.apache.org/schema/spring route from uri=direct:start / to uri=mock:result / /route /camelContext ... View Online Like View Changes Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r920158 - in /websites/production/camel/content: cache/main.pageCache uuidgenerator.html
Author: buildbot Date: Fri Aug 22 16:18:02 2014 New Revision: 920158 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/uuidgenerator.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/uuidgenerator.html == --- websites/production/camel/content/uuidgenerator.html (original) +++ websites/production/camel/content/uuidgenerator.html Fri Aug 22 16:18:02 2014 @@ -84,36 +84,17 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth2 id=UuidGenerator-UuidGeneratorUuidGenerator/h2 - -pStarting with strongCamel 2.5/strong, Camel supports 3rd party UUID generator(s). This is useful, if e.g. your messaging provider does not support UUID's with a length of 36 characters (like Websphere MQ). Another useful scenario is to use a simple counter for testing purpose. With this it is easier to correlate the exchanges in the log/debugger./p - -pYou only have to implement codeorg.apache.camel.spi.UuidGenerator/code and tell Camel, that it should use your custom implementation:/p - -h3 id=UuidGenerator-ConfiguringfromJavaDSLConfiguring from Java DSL/h3 - -div class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl -script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[ -getContext().setUuidGenerator(new MyCustomUuidGenerator()); +div class=wiki-content maincontenth2 id=UuidGenerator-UuidGeneratorUuidGenerator/h2pStarting with strongCamel 2.5/strong, Camel supports 3rd party UUID generator(s). This is useful, if e.g. your messaging provider does not support UUID's with a length of 36 characters (like Websphere MQ). Another useful scenario is to use a simple counter for testing purpose. With this it is easier to correlate the exchanges in the log/debugger./ppCamel uses UUIDs in the exchange and message ids, and other unique ids it uses./ppYou only have to implement codeorg.apache.camel.spi.UuidGenerator/code and tell Camel, that it should use your custom implementation:/ph3 id=UuidGenerator-ConfiguringfromJavaDSLConfiguring from Java DSL/h3div class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[getContext().setUuidGenerator(new MyCustomUuidGenerator()); ]]/script -/div/div - -div class=aui-message problem shadowed information-macro +/div/divdiv class=aui-message problem shadowed information-macro span class=aui-icon icon-problemIcon/span div class=message-content - -pYou should not change the UUID generator at runtime (it should only be set once)!/p +pYou should not change the UUID generator at runtime (it should only be set once)!/p /div /div - - -h3 id=UuidGenerator-ConfiguringfromSpringDSLConfiguring from Spring DSL/h3 - -pCamel will configure this UUID generator by doing a lookup in the Spring bean registry to find the bean of the type codeorg.apache.camel.spi.UuidGenerator/code./p - -div class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl -script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[ -lt;bean id=quot;activeMQUuidGeneratorquot; class=quot;org.apache.camel.impl.ActiveMQUuidGeneratorquot; /gt; +h3 id=UuidGenerator-ConfiguringfromSpringDSLConfiguring from Spring DSL/h3pCamel will configure this UUID generator by doing a lookup in the Spring bean registry to find the bean of the type codeorg.apache.camel.spi.UuidGenerator/code./pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[lt;bean id=quot;activeMQUuidGeneratorquot; class=quot;org.apache.camel.impl.ActiveMQUuidGeneratorquot; /gt; lt;camelContext id=quot;camelquot; xmlns=quot;http://camel.apache.org/schema/springquot;gt; lt;routegt; @@ -122,23 +103,7 @@ getContext().setUuidGenerator(new MyCust lt;/routegt; lt;/camelContextgt; ]]/script -/div/div - -h3 id=UuidGenerator-ProvidedimplementationsProvided implementations/h3 - -pCamel comes with three implementations of codeorg.apache.camel.spi.UuidGenerator/code:/p -ul class=alternatelicodeorg.apache.camel.impl.JavaUuidGenerator/code - This implementation uses codejava.util.UUID/code. The codejava.util.UUID/code is synchronized and can therefore affect performance on high concurrent systems. Therefore consider one of the
[1/4] git commit: Add better error message for test failure
Repository: camel
Updated Branches:
refs/heads/master 276bf38a1 - 835a41edf
Add better error message for test failure
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3523fa17
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3523fa17
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3523fa17
Branch: refs/heads/master
Commit: 3523fa17eb6269568b0cddbef86535f6641b39ff
Parents: 133be33
Author: Daniel Kulp dk...@apache.org
Authored: Fri Aug 22 12:50:03 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Aug 22 12:56:10 2014 -0400
--
.../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3523fa17/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
index 1be2d07..78e3214 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
@@ -59,8 +59,8 @@ public class SedaTest extends OSGiIntegrationTestSupport {
assertNotSame(name1, name2);
String id = + bundleContext.getBundle().getBundleId();
-assertTrue(name1.startsWith(id));
-assertTrue(name2.startsWith(id));
+assertTrue(name1 + does not start with + id, name1.startsWith(id));
+assertTrue(name2 + does not start with + id, name2.startsWith(id));
}
}
\ No newline at end of file
[2/4] git commit: Get more of the osgi tests passing.
Get more of the osgi tests passing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/133be338
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/133be338
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/133be338
Branch: refs/heads/master
Commit: 133be3383dab5d990c34e2a841ea3357cedf82ec
Parents: 24758af
Author: Daniel Kulp dk...@apache.org
Authored: Fri Aug 22 12:34:32 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Aug 22 12:56:10 2014 -0400
--
tests/camel-itest-osgi/pom.xml | 22 -
.../osgi/blueprint/CamelBlueprint4Test.java | 4 ++
.../itest/osgi/cxf/CxfBeanSpringRouteTest.java | 1 +
.../itest/osgi/cxf/CxfProxyExampleTest.java | 18 +++
.../cxf/blueprint/CxfBlueprintRouterTest.java | 52 +---
5 files changed, 46 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/pom.xml
--
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index f95115e..ca89992 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -39,6 +39,17 @@
dependencies
dependency
+ groupIdorg.osgi/groupId
+ artifactIdorg.osgi.compendium/artifactId
+ scopecompile/scope
+ optionaltrue/optional
+/dependency
+dependency
+ groupIdorg.osgi/groupId
+ artifactIdorg.osgi.core/artifactId
+ scopetest/scope
+/dependency
+dependency
groupIdorg.ops4j.pax.exam/groupId
artifactIdpax-exam-junit4/artifactId
scopetest/scope
@@ -77,17 +88,6 @@
/exclusions
/dependency
dependency
- groupIdorg.osgi/groupId
- artifactIdorg.osgi.compendium/artifactId
- scopecompile/scope
- optionaltrue/optional
-/dependency
-dependency
- groupIdorg.osgi/groupId
- artifactIdorg.osgi.core/artifactId
- scopetest/scope
-/dependency
-dependency
groupIdorg.apache.activemq/groupId
artifactIdactivemq-broker/artifactId
scopetest/scope
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
index 8a3e619..bebe4f2 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
@@ -26,6 +26,8 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerSuite;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
@@ -35,6 +37,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
* @version
*/
@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerSuite.class)
public class CamelBlueprint4Test extends OSGiBlueprintTestSupport {
@Test
@@ -126,6 +129,7 @@ public class CamelBlueprint4Test extends
OSGiBlueprintTestSupport {
.add(OSGI-INF/blueprint/test.xml,
OSGiBlueprintTestSupport.class.getResource(blueprint-13.xml))
.set(Constants.BUNDLE_SYMBOLICNAME,
CamelBlueprintTestBundle22)
.add(TestRouteBuilder.class)
+.set(Constants.EXPORT_PACKAGE,
TestRouteBuilder.class.getPackage().getName())
.build(TinyBundles.withBnd())).noStart(),
// using the features to install the camel components
http://git-wip-us.apache.org/repos/asf/camel/blob/133be338/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
index 265a464..17d142b 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
@@ -74,6 +74,7 @@ public class CxfBeanSpringRouteTest extends
[4/4] git commit: hdfs test passing
hdfs test passing Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/835a41ed Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/835a41ed Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/835a41ed Branch: refs/heads/master Commit: 835a41edf614ba6edceb4a1f59a0ad2028fb7590 Parents: 3523fa1 Author: Daniel Kulp dk...@apache.org Authored: Fri Aug 22 12:55:54 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Fri Aug 22 12:56:11 2014 -0400 -- .../org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/835a41ed/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml -- diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml index a905acf..353a389 100644 --- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml +++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/hdfs/blueprintCamelContext.xml @@ -45,7 +45,7 @@ !-- using Camel properties component and refer to the blueprint property placeholder by its id -- propertyPlaceholder id=properties location=blueprint:external prefixToken=[[ suffixToken=]] - propertyPrefix=prefix./ + / route from uri=direct:start/ !-- to uri=hdfs2://localhost:9000/hdfs/test-camel?fileSystemType=HDFSamp;splitStrategy=BYTES:5,IDLE:1000/ --
[CONF] Apache Camel User Stories
Claus Ibsen edited the page: User Stories ... Company, Product, or Project Description Apache ActiveMQ Uses Camel to add Enterprise Integration Patterns support into the ActiveMQ broker. If you run an out of the box ActiveMQ broker, look in conf/camel.xml and you'll see camelContext with some example routing rules. Can be used to bridge ActiveMQ with any of the camel Components. Apache ServiceMix Uses Camel as a routing engine as a JBI service unit for use either in JBI or OSGi to route between JBI endpoints. See the tutorial or example JBoss Fuse (formerly known as Fuse ESB) Red Hat provides a commercial distribution of an ESB which includes Camel, ActiveMQ, CXF, ServiceMix, Karaf, fabric8, and hawtio. Tools for Apache Camel (formerly know as Fuse IDE) JBoss provides developer tooling for Camel, ActiveMQ, ServiceMix, Karaf, CXF, and fabric8. The tools is a set of Eclipse plugins, such as a graphical Camel editor. fabric8 fabric8 is an open source integration platform, allow to run Camel applications anywhere; whether its on-premise or in the cloud. hawt.io hawt.io is an open source HTML5 web application for visualizing, managing and tracing Camel routes endpoints, ActiveMQ brokers, JMX, OSGi, logging, and much more. Grails The Grails Camel Routing Plugin provides integration of Camel into Grails Open ESB Camel SE Provides a JBI Service
