You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/09/11 17:41:37 UTC
[1/2] camel git commit: fix testsgit status!
Repository: camel
Updated Branches:
refs/heads/master dde5adbd9 -> 9d83601e4
fix testsgit status!
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d83601e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d83601e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d83601e
Branch: refs/heads/master
Commit: 9d83601e409f75cf7bbda4385fb39d33bf9788ee
Parents: 6445020
Author: Fabryprog <fa...@gmail.com>
Authored: Sun Sep 11 16:41:20 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Sep 11 19:36:01 2016 +0200
----------------------------------------------------------------------
.../HazelcastAggregationRepositoryCamelTestSupport.java | 5 +++--
.../camel-hazelcast/src/test/resources/hazelcast-default.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d83601e/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
index 491ffef..5efb98b 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.aggregate.hazelcast;
+import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -28,8 +29,8 @@ public class HazelcastAggregationRepositoryCamelTestSupport extends CamelTestSup
private static HazelcastInstance hzTwo;
protected static void doInitializeHazelcastInstances() {
- hzOne = Hazelcast.newHazelcastInstance();
- hzTwo = Hazelcast.newHazelcastInstance();
+ hzOne = Hazelcast.newHazelcastInstance(new Config("hzOne"));
+ hzTwo = Hazelcast.newHazelcastInstance(new Config("hzTwo"));
}
protected static void doDestroyHazelcastInstances() {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d83601e/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
index ba27f79..8a7fa96 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
@@ -96,7 +96,7 @@
evicted. Any integer between 0 and 100. If 25 is set for example, 25%
of the entries will get evicted.
-->
- <eviction-percentage>100</eviction-percentage>
+ <!-- DEPRECATED SINCE: 3.7.0 <eviction-percentage>100</eviction-percentage-->
<!--
While recovering from split-brain (network partitioning), map entries
[2/2] camel git commit: fix bean reference (test)
Posted by da...@apache.org.
fix bean reference (test)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64450204
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64450204
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64450204
Branch: refs/heads/master
Commit: 644502043c652cae7b3026a0083dd87ec6eea8e0
Parents: dde5adb
Author: Fabryprog <fa...@gmail.com>
Authored: Sun Sep 11 01:31:21 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Sep 11 19:36:01 2016 +0200
----------------------------------------------------------------------
.../camel/component/hazelcast/HazelcastComponent.java | 1 -
.../test-camel-context-hazelcast-instance-reference.xml | 12 ++++++++----
.../src/test/resources/hazelcast-default.xml | 2 +-
parent/pom.xml | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/64450204/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
index b2f8716..3b56368 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
@@ -208,7 +208,6 @@ public class HazelcastComponent extends UriEndpointComponent {
// Query param named 'hazelcastInstance' (if exists) overrides the instance that was set
HazelcastInstance hzInstance = resolveAndRemoveReferenceParameter(parameters, HAZELCAST_INSTANCE_PARAM, HazelcastInstance.class);
-
// check if an already created instance is given then just get instance by its name.
if (hzInstance == null && parameters.get(HAZELCAST_INSTANCE_NAME_PARAM) != null) {
hzInstance = Hazelcast.getHazelcastInstanceByName((String) parameters.get(HAZELCAST_INSTANCE_NAME_PARAM));
http://git-wip-us.apache.org/repos/asf/camel/blob/64450204/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
index d255013..ffec79e 100644
--- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
+++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
@@ -20,12 +20,16 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
- <bean id="hazelcastInstance" class="com.hazelcast.core.Hazelcast"
- factory-method="newHazelcastInstance" />
- <bean id="hazelcastLifecycle" class="com.hazelcast.core.LifecycleService"
+
+ <bean id="hazelcastLifecycle" class="com.hazelcast.core.LifecycleService"
factory-bean="hazelcastInstance" factory-method="getLifecycleService"
destroy-method="shutdown" />
+
+ <bean id="config" class="com.hazelcast.config.Config" />
+
+ <bean id="hazelcastInstance" class="com.hazelcast.core.Hazelcast" factory-method="newHazelcastInstance">
+ <constructor-arg type="com.hazelcast.config.Config" ref="config"/>
+ </bean>
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
http://git-wip-us.apache.org/repos/asf/camel/blob/64450204/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
index 29aedbb..ba27f79 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd"
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
http://git-wip-us.apache.org/repos/asf/camel/blob/64450204/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 65cc170..bd92358 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -241,7 +241,7 @@
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>3.6.5</hazelcast-version>
+ <hazelcast-version>3.7.1</hazelcast-version>
<hbase-version>1.2.1</hbase-version>
<hessian-version>4.0.38</hessian-version>
<hibernate-validator-version>5.2.4.Final</hibernate-validator-version>