[3/3] camel git commit: CAMEL-8541: camel-test CDI compliant
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b80cceb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b80cceb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b80cceb
Branch: refs/heads/camel-2.15.x
Commit: 5b80cceb96b8081bedba6c51ea6e875eca8e4eb2
Parents: 38beadc
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 07:49:12 2015 +0100
--
.../org/apache/camel/test/junit4/TestSupport.java| 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5b80cceb/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
--
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index 0df328a..caf7ce1 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -55,10 +55,7 @@ public abstract class TestSupport extends Assert {
private static final Logger LOG =
LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
-// CHECKSTYLE:OFF
-@Rule
-public TestName testName = new TestName();
-// CHECKSTYLE:ON
+private TestName testName = new TestName();
// Builder methods for expressions used when testing
//
-
@@ -575,6 +572,16 @@ public abstract class TestSupport extends Assert {
}
/**
+ * Gets the current test name
+ *
+ * @return the test name
+ */
+@Rule
+public TestName getTestName() {
+return testName;
+}
+
+/**
* Gets the current test method name
*
* @return the method name
[1/3] camel git commit: CAMEL-8541: camel-test CDI compliant
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x eb0feec45 - 339521179
refs/heads/camel-2.15.x 38beadc19 - 5b80cceb9
refs/heads/master e83d342f6 - 7584d4c9c
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7584d4c9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7584d4c9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7584d4c9
Branch: refs/heads/master
Commit: 7584d4c9c59627a5b5d302b0a402685cfe410ecf
Parents: e83d342
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 07:48:03 2015 +0100
--
.../org/apache/camel/test/junit4/TestSupport.java| 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7584d4c9/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
--
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index 0df328a..caf7ce1 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -55,10 +55,7 @@ public abstract class TestSupport extends Assert {
private static final Logger LOG =
LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
-// CHECKSTYLE:OFF
-@Rule
-public TestName testName = new TestName();
-// CHECKSTYLE:ON
+private TestName testName = new TestName();
// Builder methods for expressions used when testing
//
-
@@ -575,6 +572,16 @@ public abstract class TestSupport extends Assert {
}
/**
+ * Gets the current test name
+ *
+ * @return the test name
+ */
+@Rule
+public TestName getTestName() {
+return testName;
+}
+
+/**
* Gets the current test method name
*
* @return the method name
[2/3] camel git commit: CAMEL-8541: camel-test CDI compliant
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33952117
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33952117
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33952117
Branch: refs/heads/camel-2.14.x
Commit: 3395211792bd7466d624f571970ece4718fb9e75
Parents: eb0feec
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 07:49:04 2015 +0100
--
.../org/apache/camel/test/junit4/TestSupport.java| 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/33952117/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
--
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index d574f60..0a51a7f 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -55,10 +55,7 @@ public abstract class TestSupport extends Assert {
private static final Logger LOG =
LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
-// CHECKSTYLE:OFF
-@Rule
-public TestName testName = new TestName();
-// CHECKSTYLE:ON
+private TestName testName = new TestName();
// Builder methods for expressions used when testing
//
-
@@ -567,6 +564,16 @@ public abstract class TestSupport extends Assert {
}
/**
+ * Gets the current test name
+ *
+ * @return the test name
+ */
+@Rule
+public TestName getTestName() {
+return testName;
+}
+
+/**
* Gets the current test method name
*
* @return the method name
[4/6] camel git commit: CAMEL-5452: DoCatch now also emits the failure handled event
CAMEL-5452: DoCatch now also emits the failure handled event
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83c56bb5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83c56bb5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83c56bb5
Branch: refs/heads/master
Commit: 83c56bb5d1e81072cb56aa16b2d334a37552075f
Parents: 092ce41
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 11:01:00 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 11:25:11 2015 +0100
--
.../src/main/java/org/apache/camel/processor/CatchProcessor.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/83c56bb5/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
index f30954d..654cfa4 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
@@ -102,7 +102,6 @@ public class CatchProcessor extends DelegateAsyncProcessor
implements Traceable,
boolean sync = processor.process(exchange, new AsyncCallback() {
public void done(boolean doneSync) {
if (handled) {
-ExchangeHelper.setFailureHandled(exchange);
// emit event that the failure was handled
EventHelper.notifyExchangeFailureHandled(exchange.getContext(), exchange,
processor, false, null);
} else {
[5/6] camel git commit: CAMEL-6269: Added MainListener to make it easier to do custom logic for the lifecycle of start|stop of the main instance.
CAMEL-6269: Added MainListener to make it easier to do custom logic for the
lifecycle of start|stop of the main instance.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01567ab6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01567ab6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01567ab6
Branch: refs/heads/master
Commit: 01567ab644034f30c77dd10e742c23f792cdcaac
Parents: 83c56bb
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 11:21:56 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 11:25:11 2015 +0100
--
.../org/apache/camel/main/MainListener.java | 51 ++
.../apache/camel/main/MainListenerSupport.java | 39 ++
.../java/org/apache/camel/main/MainSupport.java | 55 +++-
.../java/org/apache/camel/main/MainExample.java | 15 ++
4 files changed, 158 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/01567ab6/camel-core/src/main/java/org/apache/camel/main/MainListener.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainListener.java
b/camel-core/src/main/java/org/apache/camel/main/MainListener.java
new file mode 100644
index 000..3de7668
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/main/MainListener.java
@@ -0,0 +1,51 @@
+/**
+ * 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.main;
+
+/**
+ * A lifecycle listener to receive callbacks when the main is started and
stopped.
+ */
+public interface MainListener {
+
+/**
+ * Callback before the CamelContext(s) is being started.
+ *
+ * @param main the main instance
+ */
+void beforeStart(MainSupport main);
+
+/**
+ * Callback after the CamelContext(s) has been started.
+ *
+ * @param main the main instance
+ */
+void afterStart(MainSupport main);
+
+/**
+ * Callback before the CamelContext(s) is being stopped.
+ *
+ * @param main the main instance
+ */
+void beforeStop(MainSupport main);
+
+/**
+ * Callback after the CamelContext(s) has been stopped.
+ *
+ * @param main the main instance
+ */
+void afterStop(MainSupport main);
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/01567ab6/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
b/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
new file mode 100644
index 000..6dda55b
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
@@ -0,0 +1,39 @@
+/**
+ * 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.main;
+
+/**
+ * A useful base class for {@link org.apache.camel.main.MainListener}
implementations.
+ */
+public class MainListenerSupport implements MainListener {
+
+public void beforeStart(MainSupport main) {
+// noop
+}
+
+public void afterStart(MainSupport main) {
+// noop
+}
+
+public void beforeStop(MainSupport main) {
+//
[6/6] camel git commit: CAMEL-5398: Optimize String.replaceAll with helper method which is faster as not using regexp.
CAMEL-5398: Optimize String.replaceAll with helper method which is faster as
not using regexp.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e112488
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e112488
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e112488
Branch: refs/heads/camel-2.15.x
Commit: 3e112488b2f986a02ba723410e39434ec8b25e41
Parents: 5b80cce
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 10:33:38 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 11:25:45 2015 +0100
--
.../main/java/org/apache/camel/util/EndpointHelper.java | 2 +-
.../java/org/apache/camel/util/IntrospectionSupport.java | 3 ++-
.../src/main/java/org/apache/camel/util/StringHelper.java | 10 +++---
.../src/main/java/org/apache/camel/util/URISupport.java | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3e112488/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index 18181b3..0fd0dac 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -318,7 +318,7 @@ public final class EndpointHelper {
* codemandatory/code is
codetrue/code.
*/
public static T T resolveReferenceParameter(CamelContext context, String
value, ClassT type, boolean mandatory) {
-String valueNoHash = value.replaceAll(#, );
+String valueNoHash = StringHelper.replaceAll(value, #, );
if (mandatory) {
return CamelContextHelper.mandatoryLookup(context, valueNoHash,
type);
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/3e112488/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index 98caa8e..d04c310 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -497,7 +497,8 @@ public final class IntrospectionSupport {
Object ref = value;
// try and lookup the reference based on the method
if (context != null refName != null ref == null) {
-ref = CamelContextHelper.lookup(context,
refName.replaceAll(#, ));
+String s = StringHelper.replaceAll(refName, #, );
+ref = CamelContextHelper.lookup(context, s);
if (ref == null) {
// try the next method if nothing was found
continue;
http://git-wip-us.apache.org/repos/asf/camel/blob/3e112488/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
index 6b81015..e68b8bf 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
@@ -73,8 +73,8 @@ public final class StringHelper {
return s;
}
-s = s.replaceAll(', );
-s = s.replaceAll(\, );
+s = replaceAll(s, ', );
+s = replaceAll(s, \, );
return s;
}
@@ -121,7 +121,11 @@ public final class StringHelper {
return ;
}
// must replace amp first, so we dont replace lt; to amp later
-return text.replaceAll(, amp;).replaceAll(\,
quot;).replaceAll(, lt;).replaceAll(, gt;);
+text = replaceAll(text, , amp;);
+text = replaceAll(text, \, quot;);
+text = replaceAll(text, , lt;);
+text = replaceAll(text, , gt;);
+return text;
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3e112488/camel-core/src/main/java/org/apache/camel/util/URISupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 5962247..02d3447 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@
[2/3] camel git commit: Adding a check if the hazelcastInstanceName parameter is present or not before querying the cluster.
Adding a check if the hazelcastInstanceName parameter is present or not before
querying the cluster.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee5c0f86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee5c0f86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee5c0f86
Branch: refs/heads/master
Commit: ee5c0f86b30abe88a8f783f6db7751a9cc99bec0
Parents: c44f797
Author: Ayache Khettar aya...@zotix-consulting.co.uk
Authored: Wed Mar 25 11:27:39 2015 +
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 15:03:01 2015 +0100
--
.../org/apache/camel/component/hazelcast/HazelcastComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ee5c0f86/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 eb752dd..d7153f7 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
@@ -177,7 +177,7 @@ public class HazelcastComponent extends
UriEndpointComponent {
HazelcastInstance.class);
// check if an already created instance is given then just get
instance by its name.
-if (hzInstance == null)
+if (hzInstance == null
parameters.get(HAZELCAST_INSTANCE_NAME_PARAM) != null)
{
hzInstance = Hazelcast.getHazelcastInstanceByName((String)
parameters.get(HAZELCAST_INSTANCE_NAME_PARAM));
parameters.remove(HAZELCAST_INSTANCE_NAME_PARAM);
[1/3] camel git commit: * component creates its own instance only if it's not provided * ability to reference the instance by its name
Repository: camel
Updated Branches:
refs/heads/master 5142e8ce0 - 33b96b0b5
* component creates its own instance only if it's not provided
* ability to reference the instance by its name
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c44f797b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c44f797b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c44f797b
Branch: refs/heads/master
Commit: c44f797bf92b06de0314bacf33c43289d8b64481
Parents: 5142e8c
Author: Ayache Khettar aya...@zotix-consulting.co.uk
Authored: Tue Mar 24 11:12:20 2015 +
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 15:03:00 2015 +0100
--
.../component/hazelcast/HazelcastComponent.java | 42 ++-
.../component/hazelcast/HazelcastConstants.java | 3 ++
...omponentInstanceReferenceNameSpringTest.java | 49 ++
...ontext-hazelcast-instance-name-reference.xml | 54
4 files changed, 135 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c44f797b/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 053ae8a..eb752dd 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
@@ -36,6 +36,7 @@ import
org.apache.camel.component.hazelcast.topic.HazelcastTopicEndpoint;
import org.apache.camel.impl.UriEndpointComponent;
import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
+import static org.apache.camel.component.hazelcast.HazelcastConstants.*;
public class HazelcastComponent extends UriEndpointComponent {
@@ -54,15 +55,9 @@ public class HazelcastComponent extends UriEndpointComponent
{
@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
-
-// Query param named 'hazelcastInstance' (if exists) overrides the
instance that was set
-// programmatically and cancels local instance creation as well.
-HazelcastInstance hzInstance =
resolveAndRemoveReferenceParameter(parameters, hazelcastInstance,
-HazelcastInstance.class);
-// Now we use the hazelcastInstance from component
-if (hzInstance == null) {
-hzInstance = hazelcastInstance;
-}
+
+// use the given hazelcast Instance or create one if not given
+HazelcastInstance hzInstance = getOrCreateHzInstance(parameters);
int defaultOperation = -1;
Object operation = getAndRemoveOrResolveReferenceParameter(parameters,
HazelcastConstants.OPERATION_PARAM, Object.class);
@@ -150,10 +145,6 @@ public class HazelcastComponent extends
UriEndpointComponent {
@Override
public void doStart() throws Exception {
super.doStart();
-if (hazelcastInstance == null) {
-createOwnInstance = true;
-hazelcastInstance = createOwnInstance();
-}
}
@Override
@@ -178,4 +169,29 @@ public class HazelcastComponent extends
UriEndpointComponent {
config.getProperties().setProperty(hazelcast.version.check.enabled,
false);
return Hazelcast.newHazelcastInstance(config);
}
+
+private HazelcastInstance getOrCreateHzInstance(MapString, Object
parameters) {
+
+// 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)
+{
+hzInstance = Hazelcast.getHazelcastInstanceByName((String)
parameters.get(HAZELCAST_INSTANCE_NAME_PARAM));
+parameters.remove(HAZELCAST_INSTANCE_NAME_PARAM);
+}
+
+// Now create onw instance component
+if (hzInstance == null) {
+
+if (hazelcastInstance == null) {
+createOwnInstance = true;
+hazelcastInstance = createOwnInstance();
+}
+hzInstance = hazelcastInstance;
+}
+return hzInstance;
+}
}
[3/3] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33b96b0b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33b96b0b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33b96b0b
Branch: refs/heads/master
Commit: 33b96b0b52262d87ff7393b0d8da265cd5faae93
Parents: ee5c0f8
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 15:06:56 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 15:06:56 2015 +0100
--
.../org/apache/camel/component/hazelcast/HazelcastComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/33b96b0b/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 d7153f7..4890738 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
@@ -35,8 +35,9 @@ import
org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpoint;
import org.apache.camel.component.hazelcast.topic.HazelcastTopicEndpoint;
import org.apache.camel.impl.UriEndpointComponent;
+import static
org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_NAME_PARAM;
+import static
org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_PARAM;
import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.*;
public class HazelcastComponent extends UriEndpointComponent {
camel git commit: CAMEL-8541: camel-test CDI compliant
Repository: camel
Updated Branches:
refs/heads/master 01567ab64 - 5142e8ce0
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5142e8ce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5142e8ce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5142e8ce
Branch: refs/heads/master
Commit: 5142e8ce01e7ec920fe15f349e59adca37360e42
Parents: 01567ab
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 13:11:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 13:11:05 2015 +0100
--
.../camel/component/jms/JmsDefaultTaskExecutorTypeTest.java | 2 +-
.../org/apache/camel/component/jms/JmsRouteRequestReplyTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5142e8ce/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
index 7ca513f..d16291a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
@@ -124,7 +124,7 @@ public class JmsDefaultTaskExecutorTypeTest extends
CamelTestSupport {
jmsComponent.getConfiguration().setConcurrentConsumers(3);
jmsComponent.getConfiguration().setMaxConcurrentConsumers(10);
jmsComponent.getConfiguration().setReceiveTimeout(50);
-if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(testName.getMethodName()))
{
+if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(getTestMethodName()))
{
jmsComponent.getConfiguration().setDefaultTaskExecutorType(DefaultTaskExecutorType.ThreadPool);
}
camelContext.addComponent(activemq, jmsComponent);
http://git-wip-us.apache.org/repos/asf/camel/blob/5142e8ce/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
index 96ce4ca..d3a557e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
@@ -475,10 +475,10 @@ public class JmsRouteRequestReplyTest extends
CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
-return
contextBuilders.get(testName.getMethodName()).buildContext(camelContext);
+return
contextBuilders.get(getTestMethodName()).buildContext(camelContext);
}
protected RouteBuilder createRouteBuilder() throws Exception {
-return routeBuilders.get(testName.getMethodName());
+return routeBuilders.get(getTestMethodName());
}
}
[2/2] camel git commit: CAMEL-8541: camel-test CDI compliant
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56fa1bc5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56fa1bc5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56fa1bc5
Branch: refs/heads/camel-2.14.x
Commit: 56fa1bc541ee92efc66e8bff5c4d45efc11d14ef
Parents: 3395211
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 13:11:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 13:12:54 2015 +0100
--
.../camel/component/jms/JmsDefaultTaskExecutorTypeTest.java | 2 +-
.../org/apache/camel/component/jms/JmsRouteRequestReplyTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/56fa1bc5/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
index 7ca513f..d16291a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
@@ -124,7 +124,7 @@ public class JmsDefaultTaskExecutorTypeTest extends
CamelTestSupport {
jmsComponent.getConfiguration().setConcurrentConsumers(3);
jmsComponent.getConfiguration().setMaxConcurrentConsumers(10);
jmsComponent.getConfiguration().setReceiveTimeout(50);
-if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(testName.getMethodName()))
{
+if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(getTestMethodName()))
{
jmsComponent.getConfiguration().setDefaultTaskExecutorType(DefaultTaskExecutorType.ThreadPool);
}
camelContext.addComponent(activemq, jmsComponent);
http://git-wip-us.apache.org/repos/asf/camel/blob/56fa1bc5/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
index 96ce4ca..d3a557e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
@@ -475,10 +475,10 @@ public class JmsRouteRequestReplyTest extends
CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
-return
contextBuilders.get(testName.getMethodName()).buildContext(camelContext);
+return
contextBuilders.get(getTestMethodName()).buildContext(camelContext);
}
protected RouteBuilder createRouteBuilder() throws Exception {
-return routeBuilders.get(testName.getMethodName());
+return routeBuilders.get(getTestMethodName());
}
}
[1/2] camel git commit: CAMEL-8541: camel-test CDI compliant
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 339521179 - 56fa1bc54
refs/heads/camel-2.15.x 3e112488b - 7ed9589af
CAMEL-8541: camel-test CDI compliant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ed9589a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ed9589a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ed9589a
Branch: refs/heads/camel-2.15.x
Commit: 7ed9589afa2ac65a81ca1e074b59d0a40cbb28ba
Parents: 3e11248
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Mar 25 13:11:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Mar 25 13:12:37 2015 +0100
--
.../camel/component/jms/JmsDefaultTaskExecutorTypeTest.java | 2 +-
.../org/apache/camel/component/jms/JmsRouteRequestReplyTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7ed9589a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
index 7ca513f..d16291a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDefaultTaskExecutorTypeTest.java
@@ -124,7 +124,7 @@ public class JmsDefaultTaskExecutorTypeTest extends
CamelTestSupport {
jmsComponent.getConfiguration().setConcurrentConsumers(3);
jmsComponent.getConfiguration().setMaxConcurrentConsumers(10);
jmsComponent.getConfiguration().setReceiveTimeout(50);
-if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(testName.getMethodName()))
{
+if
(testDefaultTaskExecutorThreadPoolAtComponentConfig.equals(getTestMethodName()))
{
jmsComponent.getConfiguration().setDefaultTaskExecutorType(DefaultTaskExecutorType.ThreadPool);
}
camelContext.addComponent(activemq, jmsComponent);
http://git-wip-us.apache.org/repos/asf/camel/blob/7ed9589a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
--
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
index 96ce4ca..d3a557e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
@@ -475,10 +475,10 @@ public class JmsRouteRequestReplyTest extends
CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
-return
contextBuilders.get(testName.getMethodName()).buildContext(camelContext);
+return
contextBuilders.get(getTestMethodName()).buildContext(camelContext);
}
protected RouteBuilder createRouteBuilder() throws Exception {
-return routeBuilders.get(testName.getMethodName());
+return routeBuilders.get(getTestMethodName());
}
}
