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/29 07:01:42 UTC

[camel] branch master updated (5cec263 -> 1bb9a14)

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 5cec263  Removed unused imports
     new 78b38b9  Camel-Jsch - Use BindToRegistry annotation wherever possible
     new 1bb9a14  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:
 .../org/apache/camel/component/scp/ScpSimpleProduceTest.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


[camel] 01/02: Camel-Jsch - Use BindToRegistry annotation wherever possible

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 78b38b9c63b7c66f9adf4fe1ff82afd2125a2a4d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 29 09:00:56 2019 +0200

    Camel-Jsch - Use BindToRegistry annotation wherever possible
---
 .../org/apache/camel/component/scp/ScpSimpleProduceTest.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
index 77f236d..9caca8c 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.scp;
 import java.io.File;
 import java.nio.file.Files;
 
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
@@ -140,11 +141,9 @@ public class ScpSimpleProduceTest extends ScpServerTestSupport {
         assertMockEndpointsSatisfied();
     }
     
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
+    @BindToRegistry("privKey")
+    public byte[] loadPrivateKey() throws Exception {
         byte[] privKey = Files.readAllBytes(new File("src/test/resources/camel-key.priv").toPath());
-        registry.bind("privKey", privKey);
-        return registry;
+        return privKey;
     }
 }


[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 1bb9a144e891d4164f2dbeb54e0d654f47b34358
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 29 09:01:21 2019 +0200

    Removed unused imports
---
 .../test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
index 9caca8c..cbc8855 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpSimpleProduceTest.java
@@ -22,7 +22,6 @@ import java.nio.file.Files;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;