You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/31 08:19:42 UTC
[camel] branch master updated (f366423 -> 55654e5)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f366423 Camel-Jetty: Added camel-mock as test dependency
new 41409b2 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Sjms
new f562853 Removed unused imports
new 444b78b CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Sjms2
new 55654e5 Removed unused imports
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/sjms/SjmsComponentRestartTest.java | 14 ++++----------
.../component/sjms2/Sjms2ComponentRestartTest.java | 18 ++++++------------
2 files changed, 10 insertions(+), 22 deletions(-)
[camel] 04/04: Removed unused imports
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55654e5a247cb05fc2c38c224b70a25a26d5f7cd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 10:19:11 2019 +0200
Removed unused imports
---
.../java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index 84186cf..60a1b11 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -21,7 +21,6 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
[camel] 02/04: Removed unused imports
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f562853bf1919b99b6ee405f5e4c24136da27a13
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 10:15:54 2019 +0200
Removed unused imports
---
.../java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 5637f3b..72dd4ec 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -21,7 +21,6 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
[camel] 03/04: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Sjms2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 444b78be29911f5eb4fb9d451d7ad297c38edd94
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 10:18:55 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Sjms2
---
.../component/sjms2/Sjms2ComponentRestartTest.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index e44b0b2..84186cf 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.sjms2;
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -26,24 +27,18 @@ import org.junit.Test;
public class Sjms2ComponentRestartTest extends CamelTestSupport {
+ @BindToRegistry("activemqCF")
+ private ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
+
@Override
public boolean isUseRouteBuilder() {
return false;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("activemqCF", connectionFactory);
- return jndi;
- }
-
@Test
public void testRestartWithStopStart() throws Exception {
Sjms2Component sjms2Component = new Sjms2Component();
- sjms2Component.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
+ sjms2Component.setConnectionFactory((ConnectionFactory)context.getRegistry().lookupByName("activemqCF"));
context.addComponent("sjms2", sjms2Component);
RouteBuilder routeBuilder = new RouteBuilder(context) {
@@ -81,7 +76,7 @@ public class Sjms2ComponentRestartTest extends CamelTestSupport {
@Test
public void testRestartWithSuspendResume() throws Exception {
Sjms2Component sjms2Component = new Sjms2Component();
- sjms2Component.setConnectionFactory((ConnectionFactory) context.getRegistry().lookupByName("activemqCF"));
+ sjms2Component.setConnectionFactory((ConnectionFactory)context.getRegistry().lookupByName("activemqCF"));
context.addComponent("sjms2", sjms2Component);
RouteBuilder routeBuilder = new RouteBuilder(context) {
[camel] 01/04: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Sjms
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41409b24456a029d69b84687cc62c14a343b772e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 31 09:52:02 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Sjms
---
.../camel/component/sjms/SjmsComponentRestartTest.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 334d06e..5637f3b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.sjms;
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -26,20 +27,14 @@ import org.junit.Test;
public class SjmsComponentRestartTest extends CamelTestSupport {
+ @BindToRegistry("activemqCF")
+ private ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
+
@Override
public boolean isUseRouteBuilder() {
return false;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
-
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("activemqCF", connectionFactory);
- return jndi;
- }
-
@Test
public void testRestartWithStopStart() throws Exception {
SjmsComponent sjmsComponent = new SjmsComponent();