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/08/02 14:06:02 UTC
[camel] branch master updated (6b55f81 -> a394c76)
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 6b55f81 Merge pull request #3079 from DenisIstomin/camel-13563-jetty-upgrade-fix
new 16d69fc CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Itest
new a394c76 Removed unused imports
The 2 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:
.../java/org/apache/camel/itest/async/HttpAsyncDslTest.java | 12 ++++++------
.../apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
[camel] 02/02: 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 a394c7671978474e78b517e4ca05720431732236
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 16:05:34 2019 +0200
Removed unused imports
---
.../src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java | 1 -
.../java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
index 3c41d49..78be9e0 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
@@ -20,7 +20,6 @@ import javax.jms.ConnectionFactory;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.itest.CamelJmsTestHelper;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
index 91d20d1..9aca498 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.net.SocketFactory;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
[camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Itest
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 16d69fcfa29cacc4b82e33775a108f138e1fd939
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 16:05:10 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Itest
---
.../java/org/apache/camel/itest/async/HttpAsyncDslTest.java | 11 ++++++-----
.../apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java | 6 ++++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
index 4b6180a..3c41d49 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.itest.CamelJmsTestHelper;
import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
@@ -73,11 +74,11 @@ public class HttpAsyncDslTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("validateOrder", new MyValidateOrderBean());
- jndi.bind("handleOrder", new MyHandleOrderBean());
- return jndi;
+ protected Registry createCamelRegistry() throws Exception {
+ Registry registry = new SimpleRegistry();
+ registry.bind("validateOrder", new MyValidateOrderBean());
+ registry.bind("handleOrder", new MyHandleOrderBean());
+ return registry;
}
@Override
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
index dd94d30..91d20d1 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
@@ -27,6 +27,8 @@ import javax.net.SocketFactory;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.net.ftp.FTPClient;
import org.junit.After;
@@ -134,8 +136,8 @@ public class FtpInitialConnectTimeoutTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry registry = new SimpleRegistry();
registry.bind("mocked", mockedClient());
return registry;
}