camel git commit: Ignore test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 8466e1273 -> 251b65283


Ignore test


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

Branch: refs/heads/master
Commit: 251b65283b097f527cb2f5340bfa56a6cea7d71d
Parents: 8466e12
Author: Claus Ibsen 
Authored: Wed Feb 24 08:57:51 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 08:57:51 2016 +0100

--
 .../camel/component/quickfixj/QuickfixjLazyProducerTest.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/251b6528/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
--
diff --git 
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
 
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
index fcc8b59..c54e309 100644
--- 
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
+++ 
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjLazyProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.quickfixj;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -34,6 +35,7 @@ import quickfix.field.TargetCompID;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+@Ignore("Fails on CI server sometimes")
 public class QuickfixjLazyProducerTest {
 private Exchange mockExchange;
 private QuickfixjEndpoint endpoint;
@@ -76,6 +78,7 @@ public class QuickfixjLazyProducerTest {
 //
Mockito.doReturn(true).when(mockSession).send(Matchers.isA(Message.class));
 
 producer.process(mockExchange);
+
 assertThat(engine.isInitialized(), is(true));
 assertThat(engine.isStarted(), is(true));
 //

[3/3] camel git commit: Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.

[davsclaus]

Fixed CS. This closes #855. This closes #849. This closes #848. This closes 
#519.


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

Branch: refs/heads/camel-2.15.x
Commit: 459a8b67d5ff395f5062279a0eb66d9e18a45dae
Parents: 0766a06
Author: Claus Ibsen 
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 08:24:52 2016 +0100

--
 .../camel/test/blueprint/CamelBlueprintTestSupport.java  | 2 +-
 .../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 0ee9066..48bc05d 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -144,7 +144,7 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet();
 
-if(!expectReload){
+if (!expectReload) {
 CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.junit.Test;
 import java.util.Dictionary;
 
+import org.junit.Test;
+
 /**
  *
  */
 public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
 
 @Override
-protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
 return true;
 }
 
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest 
extends CamelBluepr
 }
 
 @Override
-protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
-throws Exception {
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props) 
throws Exception {
 props.put("greeting", "Bye");
 props.put("destination", "mock:result");
 return "my-placeholders";

[1/3] camel git commit: Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 0766a0678 -> 459a8b67d
  refs/heads/camel-2.16.x 35c494e51 -> b77804759
  refs/heads/master 4a1679054 -> 8466e1273


Fixed CS. This closes #855. This closes #849. This closes #848. This closes 
#519.


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

Branch: refs/heads/master
Commit: 8466e1273c8c54f3ea3bcdbb6ebbdc929da1d559
Parents: 4a16790
Author: Claus Ibsen 
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 08:17:25 2016 +0100

--
 .../camel/test/blueprint/CamelBlueprintTestSupport.java  | 2 +-
 .../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 35f55f8..928d257 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -154,7 +154,7 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet<>();
 
-if(!expectReload){
+if (!expectReload) {
 CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.junit.Test;
 import java.util.Dictionary;
 
+import org.junit.Test;
+
 /**
  *
  */
 public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
 
 @Override
-protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
 return true;
 }
 
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest 
extends CamelBluepr
 }
 
 @Override
-protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
-throws Exception {
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props) 
throws Exception {
 props.put("greeting", "Bye");
 props.put("destination", "mock:result");
 return "my-placeholders";

[2/3] camel git commit: Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.

[davsclaus]

Fixed CS. This closes #855. This closes #849. This closes #848. This closes 
#519.


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

Branch: refs/heads/camel-2.16.x
Commit: b77804759488ef0813d187b5d8b095c5d8db5f47
Parents: 35c494e
Author: Claus Ibsen 
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 08:24:37 2016 +0100

--
 .../camel/test/blueprint/CamelBlueprintTestSupport.java  | 2 +-
 .../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b7780475/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 35f55f8..928d257 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -154,7 +154,7 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet<>();
 
-if(!expectReload){
+if (!expectReload) {
 CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b7780475/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.junit.Test;
 import java.util.Dictionary;
 
+import org.junit.Test;
+
 /**
  *
  */
 public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
 
 @Override
-protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
 return true;
 }
 
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest 
extends CamelBluepr
 }
 
 @Override
-protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
-throws Exception {
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props) 
throws Exception {
 props.put("greeting", "Bye");
 props.put("destination", "mock:result");
 return "my-placeholders";

[1/3] camel git commit: CAMEL-9636 - camel-test-blueprint - support for empty properties

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 41510874a -> 0766a0678
  refs/heads/camel-2.16.x 371461690 -> 35c494e51
  refs/heads/master ff6efb807 -> 4a1679054


CAMEL-9636 - camel-test-blueprint - support for empty properties


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

Branch: refs/heads/camel-2.15.x
Commit: 0766a067850c03817fdb3a99e3059ac4f7b0f82d
Parents: 4151087
Author: Paolo Antinori 
Authored: Tue Feb 23 17:50:45 2016 +0100
Committer: Paolo Antinori 
Committed: Tue Feb 23 18:33:20 2016 +0100

--
 .../blueprint/CamelBlueprintTestSupport.java|  6 ++-
 ...minNoDefaultValuesBlueprintCreationTest.java | 54 
 .../configadmin-endpoint-no-defaults.xml| 44 
 3 files changed, 102 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0766a067/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index adda7bf..0ee9066 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -144,8 +144,10 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet();
 
-CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
-
+if(!expectReload){
+CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
+}
+
 // must reuse props as we can do both load from .cfg file and override 
afterwards
 final Dictionary props = new Properties();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/0766a067/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
new file mode 100644
index 000..f19342b
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.blueprint;
+
+import org.junit.Test;
+import java.util.Dictionary;
+
+/**
+ *
+ */
+public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
+
+@Override
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+return true;
+}
+
+@Override
+protected String getBlueprintDescriptor() {
+return 
"org/apache/camel/test/blueprint/configadmin-endpoint-no-defaults.xml";
+}
+
+@Override
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
+throws Exception {
+props.put("greeting", "Bye");
+props.put("destination", "mock:result");
+return "my-placeholders";
+}
+
+@Test
+public void testConfigAdmin() throws Exception {
+

[3/3] camel git commit: CAMEL-9636 - camel-test-blueprint - support for empty properties

[davsclaus]

CAMEL-9636 - camel-test-blueprint - support for empty properties


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

Branch: refs/heads/master
Commit: 4a167905435ab035a43493a8199fdadc5cdeafbe
Parents: ff6efb8
Author: Paolo Antinori 
Authored: Tue Feb 23 17:50:45 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 07:36:49 2016 +0100

--
 .../blueprint/CamelBlueprintTestSupport.java|  6 ++-
 ...minNoDefaultValuesBlueprintCreationTest.java | 54 
 .../configadmin-endpoint-no-defaults.xml| 44 
 3 files changed, 102 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4a167905/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 1340218..35f55f8 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -154,8 +154,10 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet<>();
 
-CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
-
+if(!expectReload){
+CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
+}
+
 // must reuse props as we can do both load from .cfg file and override 
afterwards
 final Dictionary props = new Properties();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4a167905/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
new file mode 100644
index 000..f19342b
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.blueprint;
+
+import org.junit.Test;
+import java.util.Dictionary;
+
+/**
+ *
+ */
+public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
+
+@Override
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+return true;
+}
+
+@Override
+protected String getBlueprintDescriptor() {
+return 
"org/apache/camel/test/blueprint/configadmin-endpoint-no-defaults.xml";
+}
+
+@Override
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
+throws Exception {
+props.put("greeting", "Bye");
+props.put("destination", "mock:result");
+return "my-placeholders";
+}
+
+@Test
+public void testConfigAdmin() throws Exception {
+getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+template.sendBody("direct:start", "World");
+
+assertMockEndpointsSatisfied();
+}
+
+}

[2/3] camel git commit: CAMEL-9636 - camel-test-blueprint - support for empty properties

[davsclaus]

CAMEL-9636 - camel-test-blueprint - support for empty properties


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

Branch: refs/heads/camel-2.16.x
Commit: 35c494e516dd5f822033f77c710963bca991e1ec
Parents: 3714616
Author: Paolo Antinori 
Authored: Tue Feb 23 17:50:45 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Feb 24 07:36:36 2016 +0100

--
 .../blueprint/CamelBlueprintTestSupport.java|  6 ++-
 ...minNoDefaultValuesBlueprintCreationTest.java | 54 
 .../configadmin-endpoint-no-defaults.xml| 44 
 3 files changed, 102 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/35c494e5/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 1340218..35f55f8 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -154,8 +154,10 @@ public abstract class CamelBlueprintTestSupport extends 
CamelTestSupport {
 // to the same state of BP container
 Set bpEvents = new HashSet<>();
 
-CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
-
+if(!expectReload){
+CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, 
symbolicName, BlueprintEvent.CREATED, null);
+}
+
 // must reuse props as we can do both load from .cfg file and override 
afterwards
 final Dictionary props = new Properties();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/35c494e5/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
new file mode 100644
index 000..f19342b
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.blueprint;
+
+import org.junit.Test;
+import java.util.Dictionary;
+
+/**
+ *
+ */
+public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends 
CamelBlueprintTestSupport {
+
+@Override
+protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+return true;
+}
+
+@Override
+protected String getBlueprintDescriptor() {
+return 
"org/apache/camel/test/blueprint/configadmin-endpoint-no-defaults.xml";
+}
+
+@Override
+protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
+throws Exception {
+props.put("greeting", "Bye");
+props.put("destination", "mock:result");
+return "my-placeholders";
+}
+
+@Test
+public void testConfigAdmin() throws Exception {
+getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+template.sendBody("direct:start", "World");
+
+assertMockEndpointsSatisfied();
+}
+
+}

[3/3] camel git commit: fix up camel-example-reportincident-wssecurity

[janstey]

fix up camel-example-reportincident-wssecurity


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

Branch: refs/heads/camel-2.16.x
Commit: 371461690d89abaa0c38165cb19586d0d390f329
Parents: 598f2d5
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:06:11 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:06:11 2016 -0330

--
 examples/camel-example-reportincident-wssecurity/README.txt | 7 +--
 examples/camel-example-reportincident-wssecurity/pom.xml| 4 
 2 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/37146169/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
index 53e1fb6..439e9b7 100644
--- a/examples/camel-example-reportincident-wssecurity/README.txt
+++ b/examples/camel-example-reportincident-wssecurity/README.txt
@@ -39,12 +39,15 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   features:install camel-cxf
   features:install camel-mail
   features:install camel-velocity
+  features:install cxf-bindings-corba
+  features:install cxf-transports-jms
+  features:install cxf-ws-security
   
   remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
   SMTP Server (James by example). User = someone and password = secret
   
   3) Deploy our example
-  osgi:install -s mvn:org.apache.camel/camel-example-reportincident-wssecurity
+   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
   
   4) Verify that your service is available using in the browser the following 
url
   http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
@@ -53,7 +56,7 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   Create a new project called camel-example-reportincident-wssecurity
   Point to the following url : 
http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
   Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test
+  message generated by the unit test (don't copy the payload below as it's 
credentials expired minutes after we pasted them into this readme!)
   
   ex :
   

http://git-wip-us.apache.org/repos/asf/camel/blob/37146169/examples/camel-example-reportincident-wssecurity/pom.xml
--
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml 
b/examples/camel-example-reportincident-wssecurity/pom.xml
index 44e2260..e26e5ac 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -205,16 +205,12 @@
org.apache.cxf.phase,
org.apache.cxf.resource,

org.apache.cxf.transport,
-   
org.apache.cxf.transport.http,

org.apache.cxf.transport.http.policy,

org.apache.cxf.transport.http_jetty,

org.apache.cxf.transport.jms,
-   
org.apache.cxf.transports.http,

org.apache.cxf.workqueue,
org.apache.cxf.wsdl,
org.apache.cxf.wsdl11,
-   
org.apache.ws.security.action,
-   
org.apache.ws.security.processor,

org.springframework.beans.factory.config,

org.springframework.mail.javamail,
*

[1/3] camel git commit: fix up camel-example-reportincident-wssecurity

[janstey]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 598f2d56d -> 371461690
  refs/heads/master 17324e6a6 -> ff6efb807


fix up camel-example-reportincident-wssecurity


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

Branch: refs/heads/master
Commit: ac94e94b9ae05ae46db958fa6b54b663ddb6cd9c
Parents: 17324e6
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:00:03 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:00:03 2016 -0330

--
 .../README.md   |   7 +-
 .../README.txt  | 122 +++
 .../pom.xml |   4 -
 3 files changed, 127 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac94e94b/examples/camel-example-reportincident-wssecurity/README.md
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.md 
b/examples/camel-example-reportincident-wssecurity/README.md
index 580f47c..9146ac6 100644
--- a/examples/camel-example-reportincident-wssecurity/README.md
+++ b/examples/camel-example-reportincident-wssecurity/README.md
@@ -47,13 +47,16 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
features:install camel-cxf
features:install camel-mail
features:install camel-velocity
+features:install cxf-bindings-corba
+features:install cxf-transports-jms
+features:install cxf-ws-security
 
   remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
   SMTP Server (James by example). User = someone and password = secret
 
  Step 3: Deploy our example
 
-   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity
+   osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
 
  Step 4: Verify that your service is available using in the browser the 
following url
 
@@ -65,7 +68,7 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 
2.x
   Create a new project called `camel-example-reportincident-wssecurity`
   Point to the following url : 

   Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test
+  message generated by the unit test (don't copy the payload below as it's 
credentials expired minutes after we pasted them into this readme!)
 
   ex :
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ac94e94b/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
new file mode 100644
index 000..fa0aa33
--- /dev/null
+++ b/examples/camel-example-reportincident-wssecurity/README.txt
@@ -0,0 +1,122 @@
+Report Incident Example
+===
+
+An example based on real life use case for reporting incidents using webservice
+that are transformed and send as emails to a backing system. WS-security has 
been
+implemented. So, the user must generates a SOAP envelope containing a SOAP 
header
+with wsse xml tag. A simple property map has been created containing user and 
password.
+We use Apache CXF WSS4JInterceptor to get the user/password and timestamp and 
authenticate
+the user using the WSS4J callback
+
+You will need to compile this example first:
+  mvn install
+
+Remarks:
+- During the compilation phase, a unit test will be performed, this unit test 
simulates the
+  communication between a client calling the web services exposed by our 
camel/cxf routes. During the call,
+  the user "charles" is used to authenticate the web service call and the SOAP 
message created can be
+  retrieved from log file target/camel-example-reportincident-wssecurity.log
+- A mock SMTP server is used during unit test
+- In Eclipse, I have used the following option when starting the junit test 
case. This option tells
+  CXF that it must use log4j : 
-Dorg.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
+
+To run the example on Apache ServiceMix 4.x or Apache Karaf 2.x
+
+  1) launch the server
+  karaf.bat
+  
+  For Karaf: edit the file jre.properties to add the following packages to be 
exported
+  jre-1.6=, \
+ com.sun.org.apache.xerces.internal.dom, \
+ 

[2/3] camel git commit: remove README.txt

[janstey]

remove README.txt


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

Branch: refs/heads/master
Commit: ff6efb8076fd0652c58aaaf7b08f3ad591ae32c4
Parents: ac94e94
Author: Jonathan Anstey 
Authored: Tue Feb 23 17:01:15 2016 -0330
Committer: Jonathan Anstey 
Committed: Tue Feb 23 17:01:15 2016 -0330

--
 .../README.txt  | 122 ---
 1 file changed, 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ff6efb80/examples/camel-example-reportincident-wssecurity/README.txt
--
diff --git a/examples/camel-example-reportincident-wssecurity/README.txt 
b/examples/camel-example-reportincident-wssecurity/README.txt
deleted file mode 100644
index fa0aa33..000
--- a/examples/camel-example-reportincident-wssecurity/README.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Report Incident Example
-===
-
-An example based on real life use case for reporting incidents using webservice
-that are transformed and send as emails to a backing system. WS-security has 
been
-implemented. So, the user must generates a SOAP envelope containing a SOAP 
header
-with wsse xml tag. A simple property map has been created containing user and 
password.
-We use Apache CXF WSS4JInterceptor to get the user/password and timestamp and 
authenticate
-the user using the WSS4J callback
-
-You will need to compile this example first:
-  mvn install
-
-Remarks:
-- During the compilation phase, a unit test will be performed, this unit test 
simulates the
-  communication between a client calling the web services exposed by our 
camel/cxf routes. During the call,
-  the user "charles" is used to authenticate the web service call and the SOAP 
message created can be
-  retrieved from log file target/camel-example-reportincident-wssecurity.log
-- A mock SMTP server is used during unit test
-- In Eclipse, I have used the following option when starting the junit test 
case. This option tells
-  CXF that it must use log4j : 
-Dorg.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
-
-To run the example on Apache ServiceMix 4.x or Apache Karaf 2.x
-
-  1) launch the server
-  karaf.bat
-  
-  For Karaf: edit the file jre.properties to add the following packages to be 
exported
-  jre-1.6=, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- 
- They are required by the following bundle : 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/1.3.2_1
-  
-  2) Add features required
-  features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
-  features:install http
-  features:install camel
-  features:install camel-cxf
-  features:install camel-mail
-  features:install camel-velocity
-  features:install cxf-bindings-corba
-  features:install cxf-transports-jms
-  features:install cxf-ws-security
-  
-  remark: As the camel route sends email to a SMTP server, you must configure 
a user/password in your favorite
-  SMTP Server (James by example). User = someone and password = secret
-  
-  3) Deploy our example
-  osgi:install -s 
mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
-  
-  4) Verify that your service is available using in the browser the following 
url
-  http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
-
-  5) Start SOAPUI (2.x)
-  Create a new project called camel-example-reportincident-wssecurity
-  Point to the following url : 
http://localhost:9081/camel-example-reportincident/webservices/incident?wsdl
-  Open the request 1 (under camel-example-reportincident-wssecurity --> 
ReportIncidentBinding --> ReportIncident) and copy/paste the SOAP
-  message generated by the unit test (don't copy the payload below as it's 
credentials expired 5 minutes after we pasted them into this readme!)
-  
-  ex :
-  
-   2010-07-14 09:57:54,403 [main   ] INFO  LoggingOutInterceptor   
   - Outbound Message
-   ---
-   ID: 1
-   Address: 
http://localhost:9081/camel-example-reportincident/webservices/incident
-   Encoding: UTF-8
-   Content-Type: text/xml
-   Headers: 
{SOAPAction=["http://reportincident.example.camel.apache.org/ReportIncident;], 
Accept=[*/*]}
-   Payload: http://schemas.xmlsoap.org/soap/envelope/;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd;
 soap:mustUnderstand="1">http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;
 

camel git commit: Added camel-dns docs to gitbook

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master d76e8093b -> 17324e6a6


Added camel-dns docs to gitbook


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

Branch: refs/heads/master
Commit: 17324e6a6f05efd09ac183ab9f5db69f6c506c37
Parents: d76e809
Author: Andrea Cosentino 
Authored: Tue Feb 23 16:39:56 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Feb 23 16:40:22 2016 +0100

--
 components/camel-dns/src/main/docs/dns.adoc | 145 +++
 docs/user-manual/en/SUMMARY.md  |   1 +
 2 files changed, 146 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/17324e6a/components/camel-dns/src/main/docs/dns.adoc
--
diff --git a/components/camel-dns/src/main/docs/dns.adoc 
b/components/camel-dns/src/main/docs/dns.adoc
new file mode 100644
index 000..7ce61a8
--- /dev/null
+++ b/components/camel-dns/src/main/docs/dns.adoc
@@ -0,0 +1,145 @@
+[[DNS-DNS]]
+DNS
+~~~
+
+*Available as of Camel 2.7*
+
+This is an additional component for Camel to run DNS queries, using
+DNSJava. The component is a thin layer on top of
+http://www.xbill.org/dnsjava/[DNSJava]. +
+ The component offers the following operations:
+
+* ip, to resolve a domain by its ip
+* lookup, to lookup information about the domain
+* dig, to run DNS queries
+
+[Info]
+
+ *Requires SUN JVM*
+
+The DNSJava library requires running on the SUN JVM. +
+ If you use Apache ServiceMix or Apache Karaf, you'll need to adjust the
+`etc/jre.properties` file, to add `sun.net.spi.nameservice` to the list
+of Java platform packages exported. The server will need restarting
+before this change takes effect.
+
+
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-dns
+x.x.x
+
+
+
+
+[[DNS-URIformat]]
+URI format
+^^
+
+The URI scheme for a DNS component is as follows
+
+[source,java]
+-
+dns://operation[?options]
+-
+
+This component only supports producers.
+
+[[DNS-Options]]
+Options
+^^^
+
+None.
+
+[[DNS-Headers]]
+Headers
+^^^
+[width="100%",cols="10%,10%,10%,70%",options="header",]
+|===
+
+|Header |Type |Operations |Description
+
+|dns.domain |String |ip |The domain name. Mandatory.
+
+|dns.name |String |lookup |The name to lookup. Mandatory.
+
+|dns.type |   | lookup, dig |The type of the lookup. Should match the values 
of `org.xbill.dns.Type`.
+Optional.
+
+|dns.class |   | lookup, dig |The DNS class of the lookup. Should match the 
values of
+`org.xbill.dns.DClass`. Optional.
+
+|dns.query |String |dig |The query itself. Mandatory.
+
+|dns.server |String |dig |The server in particular for the query. If none is 
given, the default
+one specified by the OS will be used. Optional.
+|===
+
+[[DNS-Examples]]
+Examples
+
+
+[[DNS-IPlookup]]
+IP lookup
++
+
+[source,xml]
+--
+
+
+
+
+--
+
+This looks up a domain's IP. For example, www.example.com resolves to
+192.0.32.10. +
+ The IP address to lookup must be provided in the header with key
+`"dns.domain"`.
+
+[[DNS-DNSlookup]]
+DNS lookup
+++
+
+[source,xml]
+--
+
+
+
+
+--
+
+This returns a set of DNS records associated with a domain. +
+ The name to lookup must be provided in the header with key
+`"dns.name"`.
+
+[[DNS-DNSDig]]
+DNS Dig

+
+Dig is a Unix command-line utility to run DNS queries.
+
+[source,xml]
+--
+
+
+
+
+--
+
+The query must be provided in the header with key `"dns.query"`.
+
+[[DNS-SeeAlso]]
+See Also
+
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/17324e6a/docs/user-manual/en/SUMMARY.md
--
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md

camel git commit: Upgrade OpenWebBeans CDI 1.2 implementation to version 1.6.3

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 5fbf7c5d6 -> d76e8093b


Upgrade OpenWebBeans CDI 1.2 implementation to version 1.6.3


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

Branch: refs/heads/master
Commit: d76e8093b3de2014ab4969aa1028ed1101ac20d4
Parents: 5fbf7c5
Author: Antonin Stefanutti 
Authored: Tue Feb 23 15:46:41 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 15:47:16 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d76e8093/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 18184de..f69b1a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -414,7 +414,7 @@
 0.5_1
 
 1.2.7
-1.6.2
+1.6.3
 20100527_1
 2.0.6
 
2.0.6_1

svn commit: r981018 [2/2] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache camel-2170-release.html component-list.html component.html componen

[buildbot]

Added: websites/production/camel/content/etcd.html
==
--- websites/production/camel/content/etcd.html (added)
+++ websites/production/camel/content/etcd.html Tue Feb 23 14:19:25 2016
@@ -0,0 +1,205 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  
+
+
+Apache Camel: Etcd
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache CamelDocumentationComponentsEtcd
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+Etcd 
ComponentAvailable since Camel 
2.17.0https://coreos.com/etcd/; 
rel="nofollow">Etcdis a distributed key value store 
that provides a reliable way to store data across a cluster of 
machines.Maven users will need to add the following 
dependency to theirpom.xmlfor this component.
+
+URI format
+
+Wherenamespacerepresents the etcd 
context to which the etcd-component should operate and path is an optional 
attribute to define which node is being impacted.Supported 
namespaces are:keyswatchstatsOptionsNameDefault ValueDescriptionurishttp://localhost:2379,http:; 
rel="nofollow">http://localhost:2379,http://localhost:4001Defines the URIs t
 he component should connect to.sslContextParametersnullTo use a 
customorg.apache.camel.util.jsse.SSLContextParameters. 
Seehttps://cwiki.apache.org/confluence/display/CAMEL/http4#HTTP4-UsingtheJSSEConfigurationUtility;>Using
 the JSSE Configuration UtilityuserNamenullThe user name to use for basic 
authenticationpasswordnullThe password to use for basic 
authenticationsendEmptyExchangeOnTimeoutfalseTo send an empty message in case of timeout watching for a 
key (consumer only)recursivefalseTo apply an action recursivelytimeToLivenullTo set the lifespan of a key in 
millisecondstimeoutnullTo set the maximum time an action could take to 
complete.HeadersNameTypeDescriptionCamelEtcdActionjava.lang.StringThe action to perform, supported values are set, delete, 
deleteDir, getCamelEtcdNamespacejava.lang.StringThe etcd context an exchange was generated/processed 
fromCamelEtcdPathjava.lang.StringFor keys names
 pace, it is used to determine the node subject the the action, if not set the 
path from URI endpoint is used. For stats and watch namespaces it contains the 
path of the node beign processedCamelEtcdTimeoutjava.lang.LongTo set the maximum time an action could take to 
complete. If not present, the timeout option is taken into 
accountCamelEtcdTtljava.lang.IntegerTo set the lifespan of a key in 
milliseconds.  If not present, the 
timeToLive option is taken into 
accountCamelEtcdR
 ecursivejava.lang.Booleano apply an action recursively. 
 If not present, the recursive option is taken into 
accountKeys namespace example:
+
+Stats namespace 
example:
+
+Watch namespace 
example:
+

svn commit: r981018 [1/2] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache camel-2170-release.html component-list.html component.html componen

[buildbot]

Author: buildbot
Date: Tue Feb 23 14:19:25 2016
New Revision: 981018

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/etcd.html
Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html
websites/production/camel/content/component-list.html
websites/production/camel/content/component.html
websites/production/camel/content/components.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Tue Feb 23 
14:19:25 2016
@@ -244,7 +244,9 @@ disruptor-vm:someName[?option]
 Uses the 
Bean Binding to bind message 
exchanges to EJBs. It works like the Bean 
component but just for accessing EJBs. Supports EJB 3.0 
onwards.ElasticSearch / camel-elasticsearch
 
-For 
interfacing with an http://elasticsearch.org; rel="nofollow">ElasticSearch 
server.Spring Event / camel-spring
+For 
interfacing with an http://elasticsearch.org; rel="nofollow">ElasticSearch 
server.Etcd / camel-etcd
+
+For 
interfacing with an https://coreos.com/etcd/; rel="nofollow">Etcd key value 
store.Spring 
Event / camel-spring
 
 Working 
with Spring ApplicationEventsEventAdmin / 
camel-eventadmin

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Tue Feb 23 14:19:25 
2016
@@ -605,7 +605,9 @@ disruptor-vm:someName[?option]
 Uses the 
Bean Binding to bind message 
exchanges to EJBs. It works like the Bean 
component but just for accessing EJBs. Supports EJB 3.0 
onwards.ElasticSearch / camel-elasticsearch
 
-For 
interfacing with an http://elasticsearch.org; rel="nofollow">ElasticSearch 
server.Spring Event / camel-spring
+For 
interfacing with an http://elasticsearch.org; rel="nofollow">ElasticSearch 
server.Etcd / camel-etcd
+
+For 
interfacing with an https://coreos.com/etcd/; rel="nofollow">Etcd key value 
store.Spring 
Event / camel-spring
 
 Working 
with Spring ApplicationEventsEventAdmin / 
camel-eventadmin
@@ -3735,11 +3737,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -5854,11 +5856,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -17313,11 +17315,11 @@ template.send(direct:alias-verify&
 ]]>
 See Also
 Configuring 
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the 
CXF Bean Component allows 

svn commit: r981010 [3/3] - in /websites/production/camel/content: ./ cache/

[buildbot]

Added: websites/production/camel/content/jcache.html
==
--- websites/production/camel/content/jcache.html (added)
+++ websites/production/camel/content/jcache.html Tue Feb 23 12:21:03 2016
@@ -0,0 +1,260 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  
+
+
+Apache Camel: JCache
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache CamelDocumentationComponentsJCache
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+JCache ComponentAvailable as of 
Camel 2.17The jcachecomponent enables 
you to perform caching operations using JCache (JSR-107) as the Cache 
Implementation. The cache itself is created on demand or if a cache of that 
name already exists then it is simply utilized with its original 
settings.This component supports producer and event based consumer 
endpoints.The Cache consumer is an event based consumer and can be used 
to listen and respond to specific cache activities. If you need to perform 
selections from a pre-existing cache, use the processors defined for the cache 
component.Maven users will need to add the following dependency to 
theirpom.xmlfor this component:
+
+URI format
+
+You can append query options to the URI in the following 
format,?option=valueoption=#beanRef...OptionsNameDefault ValueDescriptioncachingProvidernullThe fully qualified class name 
of the javax.cache.spi.CachingProvidercacheConfigurationnullA reference to a javax.cache.configuration.Configuration 
instancecacheConfigurationPropertiesnullA reference to a 
java.util.Properties for the javax.cache.spi.CachingProvider to 
create the javax.cache.CacheManagerconfigurationUrinullAn implementation specific URI for the 
 javax.cache.CacheManagercacheLoaderFactorynull
 A reference to a javax.cache.configuration.Factory for 
javax.cache.integration.CacheLoadercacheWriterFactorynullA reference to a 
javax.cache.configuration.Factory for 
javax.cache.integration.CacheWriterexpiryPolicyFactorynullA reference to 
ajavax.cache.configuration.Factory for 
javax.cache.expiry.ExpiryPolicyreadThroughfalseA flag indicating if "read-through" mode is 
requiredwriteThroughfalseA flag indicating if "write-through" mode is 
requiredstoreByValuetrueA flag indicating if the cache will be store-by-value or 
store-by-referencestatisticsEnabledfasleA flag indicating if statistics gathering is 
enabledmanagementEnabledfalseA flag indicating if management is 
enabledfilteredEventsnullA comma separated list of event types to 
filtereventFiltersnullA comma separated list of 
javax.cache.event.CacheEntryEventFilter referencesoldValueRequiredfalse<
 /td>A flag indicating if the 
old value is required for events, supported values are CREATED, UPDATED, 
REMOVED, EXPIREDsynchronousfalseA flag indicating if the event listener should block the 
thread causing the eventactionnullThe default action to apply, value in the header has the 
priorityHeader 
variablesNameTypeDescriptionCamelJCacheActionjava.lang.StringThe action to perform, supported values are 
PUT, PUTALL, PUTIFABSENT, GET, GETALL, GETANDREMOVE, GETANDREPLACE, GETANDPUT, 
REPLACE, REMOVE, REMOVEALL, INVOKE, CLEARCamelJCacheResultjava.lang.ObjectThe result of an action, i.e. 
Boolean for PUT, REMOVE, REPLACECamelJCacheEventTypejava.lang.StringThe type of event ja
 vax.cache.event.EventTypeCamelJCacheKeyjava.lang.ObjectA key to apply an 
actionCamelJCacheKeysjava.util.Setjava-lang.ObjectA set of keys to apply an action, used for 
GETALL, REMOVEALL, INVOKECamelJCacheOldValuejava.lang.ObjectOn consumer side, the header value contains 
the old value associated to a key. On producer side, the header must contains 
the expected old value to use CAS like operationclass="confluenceTd">CamelJCacheEntryProcessorrowspan="1" class="confluenceTd">javax.cache.processor.EntryProcessorcolspan="1" rowspan="1" class="confluenceTd">The entry processor to use for 
 >INVOKE actionclass="confluenceTd">CamelJCacheEntryArgsclass="confluenceTd">java.util.collectionjava.lang.Object colspan="1" rowspan="1" class="confluenceTd">Additional arguments to pass to 
 >the 
 >javax.cache.processor.EntryProcessor 

[6/6] camel git commit: Rename CDI examples test classes to avoid clashes in IDEs and polish

[davsclaus]

Rename CDI examples test classes to avoid clashes in IDEs and polish


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

Branch: refs/heads/master
Commit: 5fbf7c5d6e83428cbee7babd227860ce541bb327
Parents: 91d1abe
Author: Antonin Stefanutti 
Authored: Tue Feb 23 13:16:38 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 13:16:38 2016 +0100

--
 .../example/cdi/metrics/ApplicationTest.java| 90 ---
 .../example/cdi/metrics/CdiMetricsTest.java | 94 
 .../camel/example/cdi/osgi/CdiOsgiIT.java   |  6 +-
 .../example/cdi/properties/ApplicationTest.java | 72 ---
 .../cdi/properties/CdiPropertiesTest.java   | 73 +++
 .../cdi/rest/servlet/CdiRestServletTest.java| 63 +
 .../example/cdi/rest/servlet/RestCdiTest.java   | 61 -
 7 files changed, 234 insertions(+), 225 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5fbf7c5d/examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/ApplicationTest.java
--
diff --git 
a/examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/ApplicationTest.java
 
b/examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/ApplicationTest.java
deleted file mode 100644
index 623c519..000
--- 
a/examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/ApplicationTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * 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.example.cdi.metrics;
-
-import javax.inject.Inject;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.annotation.Metric;
-import io.astefanutti.metrics.cdi.MetricsExtension;
-import org.apache.camel.CamelContext;
-import org.apache.camel.cdi.CdiCamelExtension;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(Arquillian.class)
-public class ApplicationTest {
-
-@Inject
-private Meter generated;
-@Inject
-private Meter attempt;
-@Inject
-private Meter success;
-@Inject
-private Meter redelivery;
-@Inject
-private Meter error;
-
-@Inject
-@Metric(name = "success-ratio")
-private Gauge ratio;
-
-@Inject
-private CamelContext context;
-
-@Deployment
-public static Archive deployment() {
-return ShrinkWrap.create(JavaArchive.class)
-// Camel CDI
-.addPackage(CdiCamelExtension.class.getPackage())
-// Metrics CDI
-.addPackage(MetricsExtension.class.getPackage())
-// Test classes
-.addPackage(Application.class.getPackage())
-// Bean archive deployment descriptor
-.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-}
-
-@Test
-public void testContextName() {
-assertThat("Context name is incorrect!", context.getName(), 
is(equalTo("camel-example-metrics-cdi")));
-}
-
-@Test
-public void testMetricsValues() throws Exception {
-// Wait a while so that the timer can kick in
-Thread.sleep(5000);
-
-// And stop the Camel context so that inflight exchanges get completed
-context.stop();
-
-assertThat("Meter counts are not consistent!", 

[5/6] camel git commit: Avoid warning about missing DeltaSpike dependency

[davsclaus]

Avoid warning about missing DeltaSpike dependency


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

Branch: refs/heads/master
Commit: 91d1abeed333c323a4b38e148559cc8001adc8ca
Parents: b7e661f
Author: Antonin Stefanutti 
Authored: Tue Feb 23 13:09:05 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 13:09:05 2016 +0100

--
 components/camel-cdi/src/main/resources/META-INF/beans.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91d1abee/components/camel-cdi/src/main/resources/META-INF/beans.xml
--
diff --git a/components/camel-cdi/src/main/resources/META-INF/beans.xml 
b/components/camel-cdi/src/main/resources/META-INF/beans.xml
index dd78a5d..14deb99 100644
--- a/components/camel-cdi/src/main/resources/META-INF/beans.xml
+++ b/components/camel-cdi/src/main/resources/META-INF/beans.xml
@@ -20,5 +20,9 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
http://xmlns.jcp.org/xml/ns/javaee/beans_1_0.xsd;
version="1.0" bean-discovery-mode="all">
-   
+
+
+
+
+
 
\ No newline at end of file

[2/6] camel git commit: CAMEL-9201: Consistent style for qualifier literals

[davsclaus]

CAMEL-9201: Consistent style for qualifier literals


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

Branch: refs/heads/master
Commit: 64cbbf00fd8fec123f7404a8c4a2924b02884d4a
Parents: 93631c8
Author: Antonin Stefanutti 
Authored: Tue Feb 23 12:40:35 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 12:48:23 2016 +0100

--
 .../java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java   | 2 +-
 .../src/main/java/org/apache/camel/cdi/ContextName.java| 6 +-
 .../apache/camel/cdi/test/MultiContextEventEndpointTest.java   | 6 +++---
 .../src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/64cbbf00/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 85284fc..7d1a1b8 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -110,7 +110,7 @@ final class CdiCamelBeanPostProcessor extends 
DefaultCamelBeanPostProcessor {
 
 private CamelContext getOrLookupCamelContext(String contextName) {
 // TODO: proper support for custom context qualifiers
-return BeanManagerHelper.getReferenceByType(manager, 
CamelContext.class, contextName.isEmpty() ? DefaultLiteral.INSTANCE : new 
ContextName.Literal(contextName));
+return BeanManagerHelper.getReferenceByType(manager, 
CamelContext.class, contextName.isEmpty() ? DefaultLiteral.INSTANCE : 
ContextName.Literal.of(contextName));
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/64cbbf00/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
index 2006e71..1ca4e1f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ContextName.java
@@ -79,10 +79,14 @@ public @interface ContextName {
 
 private final String name;
 
-public Literal(String name) {
+private Literal(String name) {
 this.name = name;
 }
 
+public static Literal of(String name) {
+return new Literal(name);
+}
+
 @Override
 public String value() {
 return name;

http://git-wip-us.apache.org/repos/asf/camel/blob/64cbbf00/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventEndpointTest.java
--
diff --git 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventEndpointTest.java
 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventEndpointTest.java
index c6b51af..af54917 100644
--- 
a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventEndpointTest.java
+++ 
b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventEndpointTest.java
@@ -113,9 +113,9 @@ public class MultiContextEventEndpointTest {
 secondConsumeString.expectedMessageCount(2);
 secondConsumeString.expectedBodiesReceived("testSecond1", 
"testSecond2");
 
-objectEvent.select(String.class, new 
ContextName.Literal("first")).fire("testFirst");
-objectEvent.select(String.class, new 
ContextName.Literal("second")).fire("testSecond1");
-objectEvent.select(String.class, new 
ContextName.Literal("second")).fire("testSecond2");
+objectEvent.select(String.class, 
ContextName.Literal.of("first")).fire("testFirst");
+objectEvent.select(String.class, 
ContextName.Literal.of("second")).fire("testSecond1");
+objectEvent.select(String.class, 
ContextName.Literal.of("second")).fire("testSecond2");
 
 assertIsSatisfied(2L, TimeUnit.SECONDS, firstConsumeString, 
secondConsumeString);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/64cbbf00/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java

[4/6] camel git commit: Polish Camel CDI examples READMEs

[davsclaus]

Polish Camel CDI examples READMEs


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

Branch: refs/heads/master
Commit: b7e661f16848d14703c4ef0f5c37c2e460618a75
Parents: a037971
Author: Antonin Stefanutti 
Authored: Tue Feb 23 13:02:24 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 13:02:24 2016 +0100

--
 examples/camel-example-cdi-metrics/README.md| 10 --
 examples/camel-example-cdi-osgi/README.md   |  2 +-
 examples/camel-example-cdi-properties/README.md | 10 --
 .../camel-example-cdi-rest-servlet/README.md| 10 --
 examples/camel-example-cdi/README.md| 32 +++-
 5 files changed, 40 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b7e661f1/examples/camel-example-cdi-metrics/README.md
--
diff --git a/examples/camel-example-cdi-metrics/README.md 
b/examples/camel-example-cdi-metrics/README.md
index bf161d1..ecf330d 100644
--- a/examples/camel-example-cdi-metrics/README.md
+++ b/examples/camel-example-cdi-metrics/README.md
@@ -24,13 +24,17 @@ of generated events.
 
 You will need to build this example first:
 
-mvn install
+```sh
+$ mvn install
+```
 
 ### Run
 
 You can run this example using:
 
-mvn compile camel:run
+```sh
+$ mvn compile camel:run
+```
 
 When the Camel application runs, you should see the calls to the 
'unreliable-service' being logged to the console, e.g.:
 ```
@@ -64,7 +68,7 @@ The Camel application can be stopped pressing 
ctrl+c in th
 ### Forum, Help, etc
 
 If you hit an problems please let us know on the Camel Forums
-   
+
 
 Please help us make Apache Camel better - we appreciate any feedback you may 
have. Enjoy!
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b7e661f1/examples/camel-example-cdi-osgi/README.md
--
diff --git a/examples/camel-example-cdi-osgi/README.md 
b/examples/camel-example-cdi-osgi/README.md
index 3d8d740..f1c6db6 100644
--- a/examples/camel-example-cdi-osgi/README.md
+++ b/examples/camel-example-cdi-osgi/README.md
@@ -193,7 +193,7 @@ shutdown:
 ### Forum, Help, etc
 
 If you hit an problems please let us know on the Camel Forums
-
+
 
 Please help us make Apache Camel better - we appreciate any feedback you may 
have. Enjoy!
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b7e661f1/examples/camel-example-cdi-properties/README.md
--
diff --git a/examples/camel-example-cdi-properties/README.md 
b/examples/camel-example-cdi-properties/README.md
index 8099292..2eb2328 100644
--- a/examples/camel-example-cdi-properties/README.md
+++ b/examples/camel-example-cdi-properties/README.md
@@ -21,13 +21,17 @@ though you can run the application in any CDI compliant 
container.
 
 You will need to build this example first:
 
-mvn install
+```sh
+$ mvn install
+```
 
 ### Run
 
 You can run this example using:
 
-mvn compile camel:run
+```sh
+$ mvn compile camel:run
+```
 
 When the Camel application runs, you should see the following messages
 being logged to the console, e.g.:
@@ -46,7 +50,7 @@ The Camel application can be stopped pressing 
ctrl+c in th
 ### Forum, Help, etc
 
 If you hit an problems please let us know on the Camel Forums
-   
+
 
 Please help us make Apache Camel better - we appreciate any feedback you may 
have. Enjoy!
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b7e661f1/examples/camel-example-cdi-rest-servlet/README.md
--
diff --git a/examples/camel-example-cdi-rest-servlet/README.md 
b/examples/camel-example-cdi-rest-servlet/README.md
index 9355282..e3211dd 100644
--- a/examples/camel-example-cdi-rest-servlet/README.md
+++ b/examples/camel-example-cdi-rest-servlet/README.md
@@ -19,13 +19,17 @@ in any CDI compliant container and Servlet container.
 
 You can build this example using:
 
-mvn package
+```sh
+$ mvn package
+```
 
 ### Run
 
 You can run this example using:
 
-mvn jetty:run
+```sh
+$ mvn jetty:run
+```
 
 When the Camel application runs, you should see the following messages
 being logged to the console, e.g.:
@@ -72,7 +76,7 @@ The Camel 

[1/6] camel git commit: CAMEL-9201: Improved support for programmatic lookup

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 5865d2e4a -> 5fbf7c5d6


CAMEL-9201: Improved support for programmatic lookup


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

Branch: refs/heads/master
Commit: 93631c85f4250b3843a7ada987c99aeed909a11d
Parents: 5865d2e
Author: Antonin Stefanutti 
Authored: Tue Feb 23 12:30:05 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 12:30:05 2016 +0100

--
 components/camel-cdi/pom.xml| 17 
 .../org/apache/camel/cdi/CdiCamelExtension.java |  4 +-
 .../java/org/apache/camel/cdi/CdiSpiHelper.java |  4 +
 .../src/main/java/org/apache/camel/cdi/Uri.java | 26 ++
 .../camel/cdi/test/ProgrammaticLookupTest.java  | 89 
 5 files changed, 138 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/93631c85/components/camel-cdi/pom.xml
--
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 6c10e00..fb23bce 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -264,6 +264,8 @@
 **/*Cdi12Test.java
 
 **/UnstoppedCamelContext*Test.java
+
+**/ProgrammaticLookupTest.java
   
 
   
@@ -317,6 +319,21 @@
 
   owb-1.2
 
+  
+
+  
+org.apache.maven.plugins
+maven-surefire-plugin
+
+  
+
+**/ProgrammaticLookupTest.java
+  
+
+  
+
+  
+
   
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/93631c85/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 9f80a0f..4cacd4a 100755
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -172,7 +172,7 @@ public class CdiCamelExtension implements Extension {
 Class type = CdiSpiHelper.getRawType(am.getBaseType());
 if (Endpoint.class.isAssignableFrom(type) || 
ProducerTemplate.class.equals(type)) {
 Set qualifiers = CdiSpiHelper.getQualifiers(am, 
manager);
-producerQualifiers.put(am.getJavaMember(), 
qualifiers.isEmpty() ? 
Collections.singleton(DefaultLiteral.INSTANCE) : qualifiers);
+producerQualifiers.put(am.getJavaMember(), qualifiers);
 Set annotations = new 
HashSet<>(am.getAnnotations());
 annotations.removeAll(qualifiers);
 annotations.add(Excluded.INSTANCE);
@@ -239,7 +239,7 @@ public class CdiCamelExtension implements Extension {
 }
 } else {
 if (Endpoint.class.isAssignableFrom(type) || 
ProducerTemplate.class.isAssignableFrom(type)) {
-
qualifiers.addAll(CdiSpiHelper.excludeElementOfTypes(contextQualifiers, 
Any.class, Default.class, Named.class));
+
qualifiers.addAll(CdiSpiHelper.excludeElementOfTypes(contextQualifiers, 
Default.class, Named.class));
 }
 }
 // TODO: would be more correct to add a bean for each Camel 
context bean

http://git-wip-us.apache.org/repos/asf/camel/blob/93631c85/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index d2cb4af..8a7c8c5 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -138,6 +138,10 @@ final class CdiSpiHelper {
 qualifiers.add(annotation);
 }
 }
+if (qualifiers.isEmpty()) {
+qualifiers.add(DefaultLiteral.INSTANCE);
+}
+qualifiers.add(AnyLiteral.INSTANCE);
 return qualifiers;
 }
 }
\ No newline at end of file

[3/6] camel git commit: Fix Maven warning

[davsclaus]

Fix Maven warning


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

Branch: refs/heads/master
Commit: a03797159af6e3d376a1e384036c9f90098c29b6
Parents: 64cbbf0
Author: Antonin Stefanutti 
Authored: Tue Feb 23 12:43:45 2016 +0100
Committer: Antonin Stefanutti 
Committed: Tue Feb 23 12:48:24 2016 +0100

--
 examples/camel-example-cdi-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a0379715/examples/camel-example-cdi-osgi/pom.xml
--
diff --git a/examples/camel-example-cdi-osgi/pom.xml 
b/examples/camel-example-cdi-osgi/pom.xml
index 890ae7e..706b0b2 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -227,7 +227,7 @@
 
   
 
-${artifactId}
+${project.artifactId}
 
 
 

svn commit: r981010 [2/3] - in /websites/production/camel/content: ./ cache/

[buildbot]

Modified: websites/production/camel/content/camel-2170-release.html
==
--- websites/production/camel/content/camel-2170-release.html (original)
+++ websites/production/camel/content/camel-2170-release.html Tue Feb 23 
12:21:03 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.17.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the x.y.z release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)The component documentation generated from 
the source code has been double checked to be up to date and include all the 
options the endpoints supports.Camel 
commands forSpring BootMany improvements toCamelKuraAdded transacted option 
toSQL Component when used 
as a consumer in a transacted route.Added support for UPDATE operation 
toElasticSearch.Allow to reuse existing 
configured Elasticsearch Client on the ElasticSearch component, instead of creating a 
client per endpoint.Theinclude 
andexclude options onFile2 andFTP 
endpoints is now case in-sensitive out of the box.Resource based 
component such asXSLT,Velocityetc can load the resource 
file from theRegistryby usingref: as 
prefix.Upgraded camel-amqp to the latest qpid-jms-client (also 
AMQP  1.0 is not supported anymore).Many improvements 
to Camel AMQP 
component.TheMetrics Component allows to captureMessage History performance 
statistics with 
theMetricsMessageHistoryFactoryReduced 
the number of mbeans enlisted in the services tree, to only include mbeans that 
has value to be managed.TheElasticsearch Componentnow supports 
MultiGet operationTheThrottler has been improved to be more performant and 
use a rolling window for time periods which gives a better flow.
 ThesetHeader 
andsetExchangeProperty allows to use a dynamic header key 
using theSimplelanguage if 
the name of the key is aSimplelanguage expression.Add collate 
function toSimple language to make 
it easier to split a message body into sub lists of a specified size. The 
function is similar to the collate function from Groovy.TheCamel Run Maven Goal is able 
to auto detect if its a OSGi Blueprint or CDI project so end users no longer 
have to explicit configure this on the plugin.Camel-Elasticsearch now supports Multiget, 
Multisearch and exists operationCamel-Git now supports Cherry-pick 
operationStopping the
 Main class from JMX will now trigger shutdown of the Main 
class/JVM also, as it does when hitting ctrl + c.Added option to 
skipFirst to theTokenizer 
language to make it easy to skip the very first element, when for example 
splitting a CSV file using theSplitter EIP.TheRest DSL now supports default values for query 
parametersTheRest DSL 
now only binds from POJO to JSon/XML if the content-type is for json or xml. 
This allows you to specify a custom content-type and omit the binding, such as 
when having binary payloads.Exchange and Message only output id in 
their toString method to avoid outputting any message details such as sensitive 
details from message bodies.CamelError Handler no longer 
 log message body/header details when logging the Message History. This avoids logging 
anysensitive details from message bodies.CamelException Clause andError Handler now supports using a 
customProcessor to be invoked right after an exception was 
thrown using the newonExceptionOccurred 
option.RabbitMQ consumer more 
resilient to auto re-connect in case of connection failuresTheJSON camel-jacksoncan be 
used as a type converter to convert json to/from POJO and String/byte[] types, 
if enabled.TheSQL 
Component now supports loading the SQL queries from external files on the 
classpath or file system, whe
 re you can format the queries using newlines and 
indenting.TheMail consumer 
allows to use an idempotent repositorywhich allows to cluster consuming 
from the same mailbox, and let the repository coordinate whether a mail message 
is valid for the consumer to process.Added support for completion 
interval on theSJMS Batch 
component, which allows to trigger batch completion in a fixed scheduled 
interval.TheHTTP 
andHTTP4 producers now support 
thedisableStreamCache option to allow to use the raw 
response stream as the message body instead of wrapping usingStream cachingThe Camel CDI component has been improved to 
better fit into the CDI programming model, cover a lar
 ger set of containers, and provide these new features:The Camel events 
from the org.apache.camel.management.event package (like 
CamelContextStartedEvent)can be observed as CDI 
eventsThe new CDI event Camel endpoint enableCDI events to 
be seamlessly consumed from (respectively produced by) Camel consumers 
(respectively Camel producers)CDI beans annotated 
with the@Converterannotation are 
automatically registered as type 

svn commit: r981010 [1/3] - in /websites/production/camel/content: ./ cache/

[buildbot]

Author: buildbot
Date: Tue Feb 23 12:21:03 2016
New Revision: 981010

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/jcache.html
Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-pattern-appendix.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html
websites/production/camel/content/component-list.html
websites/production/camel/content/component.html
websites/production/camel/content/components.html
websites/production/camel/content/idempotent-consumer.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Tue Feb 23 
12:21:03 2016
@@ -355,7 +355,9 @@ disruptor-vm:someName[?option]
 Sending 
and receiving messages through http://java.sun.com/products/jini/2.1/doc/specs/html/js-spec.html; 
rel="nofollow">JavaSpacejBPM / 
camel-jbpm
 
-Sending 
messages through kie-remote-client API to jBPM.jclouds / camel-jclouds
+Sending 
messages through kie-remote-client API to jBPM.jcache / camel-jcache
+
+The 
JCache component facilitates creation of caching endpoints and processors using 
https://github.com/jsr107/jsr107spec; rel="nofollow">JCache / 
jsr107 as the cache implementation.jclouds / camel-jclouds
 
 For 
interacting with cloud compute  blobstore service via http://www.jclouds.org; 
rel="nofollow">jcloudsJCR / 
camel-jcr

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Tue Feb 23 12:21:03 
2016
@@ -716,7 +716,9 @@ disruptor-vm:someName[?option]
 Sending 
and receiving messages through http://java.sun.com/products/jini/2.1/doc/specs/html/js-spec.html; 
rel="nofollow">JavaSpacejBPM / 
camel-jbpm
 
-Sending 
messages through kie-remote-client API to jBPM.jclouds / camel-jclouds
+Sending 
messages through kie-remote-client API to jBPM.jcache / camel-jcache
+
+The 
JCache component facilitates creation of caching endpoints and processors using 
https://github.com/jsr107/jsr107spec; rel="nofollow">JCache / 
jsr107 as the cache implementation.jclouds / camel-jclouds
 
 For 
interacting with cloud compute  blobstore service via http://www.jclouds.org; 
rel="nofollow">jcloudsJCR / 
camel-jcr
@@ -3733,11 +3735,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -5852,11 +5854,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run 

camel git commit: CAMEL-9586 - add option documentation, include component in distribution, improve karaf features definition

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 622e515d4 -> 5865d2e4a


CAMEL-9586 - add option documentation, include component in distribution, 
improve karaf features definition


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

Branch: refs/heads/master
Commit: 5865d2e4aa3f2743640d7cbf199daa2d27dba18d
Parents: 622e515
Author: lburgazzoli 
Authored: Tue Feb 23 10:35:55 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Feb 23 11:51:43 2016 +0100

--
 apache-camel/pom.xml|  4 ++
 .../src/main/descriptors/common-bin.xml |  1 +
 components/camel-etcd/src/main/docs/etcd.adoc   | 26 +---
 .../component/etcd/AbstractEtcdEndpoint.java| 20 +++---
 .../etcd/AbstractEtcdPollingConsumer.java   |  2 +-
 .../component/etcd/AbstractEtcdProducer.java|  2 +-
 .../camel/component/etcd/EtcdComponent.java |  9 ++-
 .../camel/component/etcd/EtcdConfiguration.java | 22 +++
 .../camel/component/etcd/EtcdConstants.java | 14 ++--
 .../camel/component/etcd/EtcdKeysProducer.java  | 68 ++--
 .../camel/component/etcd/EtcdStatsConsumer.java |  1 +
 .../camel/component/etcd/EtcdStatsProducer.java |  1 +
 .../camel/component/etcd/EtcdWatchConsumer.java |  2 +
 .../camel/component/etcd/EtcdKeysTest.java  |  3 +
 .../camel/component/etcd/EtcdStatsTest.java |  1 +
 .../camel/component/etcd/EtcdWatchTest.java |  2 +
 parent/pom.xml  |  7 ++
 .../src/main/resources/bundles.properties   |  1 +
 .../features/src/main/resources/features.xml| 16 -
 19 files changed, 141 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5865d2e4/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index c404de6..d469490 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -221,6 +221,10 @@
 
 
   org.apache.camel
+  camel-etcd
+
+
+  org.apache.camel
   camel-eventadmin
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5865d2e4/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index 865300d..d5024cb 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -68,6 +68,7 @@
 org.apache.camel:camel-ejb
 org.apache.camel:camel-elasticsearch
 org.apache.camel:camel-elsql
+org.apache.camel:camel-etcd
 org.apache.camel:camel-eventadmin
 org.apache.camel:camel-exec
 org.apache.camel:camel-facebook

http://git-wip-us.apache.org/repos/asf/camel/blob/5865d2e4/components/camel-etcd/src/main/docs/etcd.adoc
--
diff --git a/components/camel-etcd/src/main/docs/etcd.adoc 
b/components/camel-etcd/src/main/docs/etcd.adoc
index 9ca7dcc..9ed8475 100644
--- a/components/camel-etcd/src/main/docs/etcd.adoc
+++ b/components/camel-etcd/src/main/docs/etcd.adoc
@@ -5,26 +5,29 @@
 
 
 
+
+
+
 // endpoint options: START
 The etcd component supports 14 endpoint options which are listed below:
 
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
-| namespace | common |  | EtcdNamespace | *Required* The namespace
-| path | common |  | String | The path
-| recursive | common | false | boolean | TODO: document me
-| sendEmptyExchangeOnTimeout | common | false | boolean | TODO: document me
-| timeout | common |  | Long | TODO: document me
-| uris | common |  | String | TODO: document me
+| namespace | common |  | EtcdNamespace | *Required* The API namespace to use
+| path | common |  | String | The path the enpoint refers to
+| recursive | common | false | boolean | To apply an action recursively.
+| timeout | common |  | Long | To set the maximum time an action could take to 
complete.
+| uris | common | http://localhost:2379,http://localhost:4001 | String | To 
set the URIs the client connects.
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. 

camel git commit: Added camel-distruptor docs to gitbook

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 5ab310241 -> 622e515d4


Added camel-distruptor docs to gitbook


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

Branch: refs/heads/master
Commit: 622e515d44d86d699dc0eaebc0dd937015b4d944
Parents: 5ab3102
Author: Andrea Cosentino 
Authored: Tue Feb 23 11:33:09 2016 +0100
Committer: Andrea Cosentino 
Committed: Tue Feb 23 11:33:09 2016 +0100

--
 .../src/main/docs/disruptor.adoc| 350 +++
 docs/user-manual/en/SUMMARY.md  |   1 +
 2 files changed, 351 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/622e515d/components/camel-disruptor/src/main/docs/disruptor.adoc
--
diff --git a/components/camel-disruptor/src/main/docs/disruptor.adoc 
b/components/camel-disruptor/src/main/docs/disruptor.adoc
new file mode 100644
index 000..fcda340
--- /dev/null
+++ b/components/camel-disruptor/src/main/docs/disruptor.adoc
@@ -0,0 +1,350 @@
+[[Disruptor-DisruptorComponent]]
+Disruptor Component
+~~~
+
+*Available as of Camel 2.12*
+
+The *disruptor:* component provides asynchronous
+http://www.eecs.harvard.edu/~mdw/proj/seda/[SEDA] behavior much as the
+standard SEDA Component, but utilizes a
+https://github.com/LMAX-Exchange/disruptor[Disruptor] instead of a
+http://docs.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/BlockingQueue.html[BlockingQueue]
+utilized by the standard link:seda.html[SEDA]. Alternatively, a
+
+*disruptor-vm:* endpoint is supported by this component, providing an
+alternative to the standard link:vm.html[VM]. As with the SEDA
+component, buffers of the *disruptor:* endpoints are only visible within
+a *single* link:camelcontext.html[CamelContext] and no support is
+provided for persistence or recovery. The buffers of the
+**disruptor-vm:** endpoints also provides support for communication
+across CamelContexts instances so you can use this mechanism to
+communicate across web applications (provided that *camel-disruptor.jar*
+is on the *system/boot* classpath).
+
+The main advantage of choosing to use the Disruptor Component over the
+SEDA or the VM Component is performance in use cases where there is high
+contention between producer(s) and/or multicasted or concurrent
+Consumers. In those cases, significant increases of throughput and
+reduction of latency has been observed. Performance in scenarios without
+contention is comparable to the SEDA and VM Components.
+
+The Disruptor is implemented with the intention of mimicing the
+behaviour and options of the SEDA and VM Components as much as possible.
+The main differences with the them are the following:
+
+* The buffer used is always bounded in size (default 1024 exchanges).
+* As a the buffer is always bouded, the default behaviour for the
+Disruptor is to block while the buffer is full instead of throwing an
+exception. This default behaviour may be configured on the component
+(see options).
+* The Disruptor enpoints don't implement the BrowsableEndpoint
+interface. As such, the exchanges currently in the Disruptor can't be
+retrieved, only the amount of exchanges.
+* The Disruptor requires its consumers (multicasted or otherwise) to be
+statically configured. Adding or removing consumers on the fly requires
+complete flushing of all pending exchanges in the Disruptor.
+* As a result of the reconfiguration: Data sent over a Disruptor is
+directly processed and 'gone' if there is at least one consumer, late
+joiners only get new exchanges published after they've joined.
+* The *pollTimeout* option is not supported by the Disruptor Component.
+* When a producer blocks on a full Disruptor, it does not respond to
+thread interrupts.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,java]
+
+
+org.apache.camel
+camel-disruptor
+x.x.x
+
+
+
+
+[[Disruptor-URIformat]]
+URI format
+^^
+
+[source,java]
+-
+ disruptor:someName[?options]
+-
+
+or
+
+[source,java]
+
+ disruptor-vm:someName[?options]
+
+
+Where **someName** can be any string that uniquely identifies the
+endpoint within the current link:camelcontext.html[CamelContext] (or
+across contexts in case of +
+ **disruptor-vm:**). +
+ You can append query options to the URI in the following 

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

[buildbot]

Author: buildbot
Date: Tue Feb 23 08:18:48 2016
New Revision: 981001

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2170-release.html
==
--- websites/production/camel/content/camel-2170-release.html (original)
+++ websites/production/camel/content/camel-2170-release.html Tue Feb 23 
08:18:48 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.17.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the x.y.z release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)The component documentation generated from 
the source code has been double checked to be up to date and include all the 
options the endpoints supports.Camel 
commands forSpring BootMany improvements toCamelKuraAdded transacted option 
toSQL Component when used 
as a consumer in a transacted route.Added support for UPDATE operation 
toElasticSearch.Allow to reuse existing 
configured Elasticsearch Client on the ElasticSearch component, instead of creating a 
client per endpoint.Theinclude 
andexclude options onFile2 andFTP 
endpoints is now case in-sensitive out of the box.Resource based 
component such asXSLT,Velocityetc can load the resource 
file from theRegistryby usingref: as 
prefix.Upgraded camel-amqp to the latest qpid-jms-client (also 
AMQP  1.0 is not supported anymore).Many improvements 
to Camel AMQP 
component.TheMetrics Component allows to captureMessage History performance 
statistics with 
theMetricsMessageHistoryFactoryReduced 
the number of mbeans enlisted in the services tree, to only include mbeans that 
has value to be managed.TheElasticsearch Componentnow supports 
MultiGet operationTheThrottler has been improved to be more performant and 
use a rolling window for time periods which gives a better flow.
 ThesetHeader 
andsetExchangeProperty allows to use a dynamic header key 
using theSimplelanguage if 
the name of the key is aSimplelanguage expression.Add collate 
function toSimple language to make 
it easier to split a message body into sub lists of a specified size. The 
function is similar to the collate function from Groovy.TheCamel Run Maven Goal is able 
to auto detect if its a OSGi Blueprint or CDI project so end users no longer 
have to explicit configure this on the plugin.Camel-Elasticsearch now supports Multiget, 
Multisearch and exists operationCamel-Git now supports Cherry-pick 
operationStopping the
 Main class from JMX will now trigger shutdown of the Main 
class/JVM also, as it does when hitting ctrl + c.Added option to 
skipFirst to theTokenizer 
language to make it easy to skip the very first element, when for example 
splitting a CSV file using theSplitter EIP.TheRest DSL now supports default values for query 
parametersTheRest DSL 
now only binds from POJO to JSon/XML if the content-type is for json or xml. 
This allows you to specify a custom content-type and omit the binding, such as 
when having binary payloads.Exchange and Message only output id in 
their toString method to avoid outputting any message details such as sensitive 
details from message bodies.CamelError Handler no longer 
 log message body/header details when logging the Message History. This avoids logging 
anysensitive details from message bodies.CamelException Clause andError Handler now supports using a 
customProcessor to be invoked right after an exception was 
thrown using the newonExceptionOccurred 
option.RabbitMQ consumer more 
resilient to auto re-connect in case of connection failuresTheJSON camel-jacksoncan be 
used as a type converter to convert json to/from POJO and String/byte[] types, 
if enabled.TheSQL 
Component now supports loading the SQL queries from external files on the 
classpath or file system, whe
 re you can format the queries using newlines and 
indenting.TheMail consumer 
allows to use an idempotent repositorywhich allows to cluster consuming 
from the same mailbox, and let the repository coordinate whether a mail message 
is valid for the consumer to process.Added support for completion 
interval on theSJMS Batch 
component, which allows to trigger batch completion in a fixed scheduled 
interval.TheHTTP 
andHTTP4 producers now support 
thedisableStreamCache option to allow to use the raw 
response stream as the message body instead of wrapping usingStream cachingThe Camel CDI component has been improved to 
better fit into the CDI programming model, cover a lar
 ger set of