camel git commit: CAMEL-8700 Camel-OpenShift: Add new operations to available set
Repository: camel
Updated Branches:
refs/heads/master 799d3cbc7 - 5becebd30
CAMEL-8700 Camel-OpenShift: Add new operations to available set
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5becebd3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5becebd3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5becebd3
Branch: refs/heads/master
Commit: 5becebd30cc723a23899102350a0de3148804ae9
Parents: 799d3cb
Author: ancosen anco...@gmail.com
Authored: Sat Apr 25 23:23:18 2015 +0200
Committer: ancosen anco...@gmail.com
Committed: Sat Apr 25 23:23:59 2015 +0200
--
.../component/openshift/OpenShiftConstants.java | 1 +
.../component/openshift/OpenShiftOperation.java | 2 +-
.../component/openshift/OpenShiftProducer.java | 91
.../OpenShiftAddEmbeddedCartridgeTest.java | 62 +
.../OpenShiftGetEmbeddedCartridgesTest.java | 62 +
.../OpenShiftGetStandaloneCartridgeTest.java| 62 +
.../OpenShiftRemoveEmbeddedCartridgeTest.java | 62 +
7 files changed, 341 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5becebd3/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftConstants.java
--
diff --git
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftConstants.java
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftConstants.java
index 1dd0495..7084885 100644
---
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftConstants.java
+++
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftConstants.java
@@ -23,6 +23,7 @@ public final class OpenShiftConstants {
public static final String EVENT_TYPE = CamelOpenShiftEventType;
public static final String EVENT_OLD_STATE = CamelOpenShiftEventOldState;
public static final String EVENT_NEW_STATE = CamelOpenShiftEventNewState;
+public static final String EMBEDDED_CARTRIDGE_NAME =
CamelOpenShiftEmbeddedCartridgeName;
private OpenShiftConstants() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5becebd3/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftOperation.java
--
diff --git
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftOperation.java
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftOperation.java
index 2fd7b8d..6b90841 100644
---
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftOperation.java
+++
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftOperation.java
@@ -18,6 +18,6 @@ package org.apache.camel.component.openshift;
public enum OpenShiftOperation {
-list, start, stop, restart, state
+list, start, stop, restart, state, getStandaloneCartridge,
getEmbeddedCartridges, addEmbeddedCartridge, removeEmbeddedCartridge
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5becebd3/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
--
diff --git
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
index cd35cf4..ac9a5d5 100644
---
a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
+++
b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
@@ -25,11 +25,16 @@ import com.openshift.client.IApplication;
import com.openshift.client.IDomain;
import com.openshift.client.IGear;
import com.openshift.client.IGearGroup;
+import com.openshift.client.cartridge.IDeployedStandaloneCartridge;
+import com.openshift.client.cartridge.IEmbeddableCartridge;
import com.openshift.client.cartridge.IEmbeddedCartridge;
+import com.openshift.client.cartridge.query.LatestEmbeddableCartridge;
+
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
public class OpenShiftProducer extends DefaultProducer {
@@ -67,6 +72,18 @@ public class OpenShiftProducer extends DefaultProducer {
case state:
doState(exchange, domain);
break;
+
camel git commit: CAMEL-8698 Camel-Infinispan: Add size operation
Repository: camel
Updated Branches:
refs/heads/master 16ea61e23 - 09aa6f68f
CAMEL-8698 Camel-Infinispan: Add size operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09aa6f68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09aa6f68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09aa6f68
Branch: refs/heads/master
Commit: 09aa6f68fb3552da1ab486f0b093a2019a562d74
Parents: 16ea61e
Author: ancosen anco...@gmail.com
Authored: Sat Apr 25 11:32:30 2015 +0200
Committer: ancosen anco...@gmail.com
Committed: Sat Apr 25 11:32:30 2015 +0200
--
.../component/infinispan/InfinispanConstants.java | 1 +
.../component/infinispan/InfinispanOperation.java | 6 ++
.../infinispan/InfinispanProducerTest.java| 18 ++
3 files changed, 25 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/09aa6f68/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java
--
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java
index 6f69e7f..2c0ba42 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java
@@ -33,6 +33,7 @@ public interface InfinispanConstants {
String REMOVE = CamelInfinispanOperationRemove;
String REPLACE = CamelInfinispanOperationReplace;
String CLEAR = CamelInfinispanOperationClear;
+String SIZE = CamelInfinispanOperationSize;
String RESULT = CamelInfinispanOperationResult;
String LIFESPAN_TIME = CamelInfinispanLifespanTime;
String LIFESPAN_TIME_UNIT = CamelInfinispanTimeUnit;
http://git-wip-us.apache.org/repos/asf/camel/blob/09aa6f68/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
--
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
index 7cd5a2a..3450666 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
@@ -156,6 +156,12 @@ public class InfinispanOperation {
}
setResult(result, exchange);
}
+}, SIZE {
+@Override
+void execute(BasicCacheObject, Object cache, Exchange exchange) {
+Object result = cache.size();
+setResult(result, exchange);
+}
}, CLEAR {
@Override
void execute(BasicCacheObject, Object cache, Exchange exchange) {
http://git-wip-us.apache.org/repos/asf/camel/blob/09aa6f68/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
--
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index ca38e2b..84df8e4 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -46,6 +46,22 @@ public class InfinispanProducerTest extends
InfinispanTestSupport {
Object value = currentCache().get(KEY_ONE);
assertEquals(value.toString(), VALUE_ONE);
}
+
+@Test
+public void cacheSizeTest() throws Exception {
+currentCache().put(KEY_ONE, VALUE_ONE);
+currentCache().put(KEY_TWO, VALUE_TWO);
+
+Exchange exchange = template.request(direct:size, new Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(InfinispanConstants.OPERATION,
InfinispanConstants.SIZE);
+}
+});
+
+assertEquals(exchange.getIn().getHeader(InfinispanConstants.RESULT,
Integer.class), new Integer(2));
+assertNotEquals(exchange.getIn().getHeader(InfinispanConstants.RESULT,
Integer.class), new Integer(4));
+
camel git commit: Fix CAMEL-8699 Camel-example-cxf: Remove ref from LoadBalance tag
Repository: camel
Updated Branches:
refs/heads/master 09aa6f68f - 16f4d2e92
Fix CAMEL-8699 Camel-example-cxf: Remove ref from LoadBalance tag
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16f4d2e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16f4d2e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16f4d2e9
Branch: refs/heads/master
Commit: 16f4d2e92329fc38a02df9b7c25a7929b2deba6f
Parents: 09aa6f6
Author: ancosen anco...@gmail.com
Authored: Sat Apr 25 13:00:54 2015 +0200
Committer: ancosen anco...@gmail.com
Committed: Sat Apr 25 13:00:54 2015 +0200
--
.../main/resources/META-INF/spring/CamelTransportSpringConfig.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/16f4d2e9/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
--
diff --git
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
b/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
index 5a95d9c..b9634a2 100644
---
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
+++
b/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
@@ -40,7 +40,8 @@
camelContext id=dest_context
xmlns=http://camel.apache.org/schema/spring;
route
from uri=jetty:http://localhost:{{port}}/GreeterContext/GreeterPort/
- loadBalance ref=roundRobinRef
+ loadBalance
+ custom ref=roundRobinRef/
to uri=direct:EndpointA/
to uri=direct:EndpointB/
/loadBalance
camel git commit: downgrade JUnit 4.12 to 4.11 as camel-itest-karaf doesn't work with JUnit 4.12 at present
Repository: camel Updated Branches: refs/heads/master 16f4d2e92 - 799d3cbc7 downgrade JUnit 4.12 to 4.11 as camel-itest-karaf doesn't work with JUnit 4.12 at present Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/799d3cbc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/799d3cbc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/799d3cbc Branch: refs/heads/master Commit: 799d3cbc7b1103070d1631b4cd5c00cf7202c361 Parents: 16f4d2e Author: Christian Mueller cmuel...@apache.org Authored: Sat Apr 25 17:28:25 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Sat Apr 25 17:28:25 2015 +0200 -- parent/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/799d3cbc/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 525bcac..d64f230 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -294,8 +294,9 @@ jt400-bundle-version6.7_1/jt400-bundle-version juel-bundle-version2.1.3_1/juel-bundle-version juel-version2.1.3/juel-version -junit-bundle-version4.12_1/junit-bundle-version -junit-version4.12/junit-version +!-- camel-itest-karaf doesn't work with JUnit 4.12 at present -- +junit-bundle-version4.11_1/junit-bundle-version +junit-version4.11/junit-version jython-version2.5.3/jython-version jzlib-version1.1.3/jzlib-version kafka-version0.8.2.0/kafka-version
