[camel] 01/02: Camel-Ejb: Avoid JndiRegistry where possible

[acosentino]

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 5d3506fcba108be3a37e78c62d64ec0374034bb9
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 23 17:22:20 2019 +0200

    Camel-Ejb: Avoid JndiRegistry where possible
---
 .../src/main/java/org/apache/camel/component/ejb/EjbComponent.java  | 3 ++-
 .../main/java/org/apache/camel/component/ejb/EjbRegistryBean.java   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbComponent.java
 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbComponent.java
index 974c7fe..65f8936 100644
--- 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbComponent.java
+++ 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbComponent.java
@@ -29,6 +29,7 @@ import org.apache.camel.component.bean.BeanHolder;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.jndi.JndiBeanRepository;
 
 /**
  * EJB component to invoke EJBs like the {@link 
org.apache.camel.component.bean.BeanComponent}.
@@ -48,7 +49,7 @@ public class EjbComponent extends BeanComponent {
         answer.setBeanName(remaining);
 
         // plugin registry to lookup in jndi for the EJBs
-        Registry registry = new JndiRegistry(getContext());
+        JndiBeanRepository registry = new JndiBeanRepository(getContext());
         // and register the bean as a holder on the endpoint
         BeanHolder holder = new EjbRegistryBean(registry, getCamelContext(), 
answer.getBeanName());
         answer.setBeanHolder(holder);
diff --git 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
index 7e8fd0e..1a97998 100644
--- 
a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
+++ 
b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbRegistryBean.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.ejb;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.bean.RegistryBean;
-import org.apache.camel.spi.Registry;
+import org.apache.camel.support.jndi.JndiBeanRepository;
 
 /**
  * An implementation of a {@link org.apache.camel.component.bean.BeanHolder} 
which will look up
@@ -26,9 +26,9 @@ import org.apache.camel.spi.Registry;
  */
 public class EjbRegistryBean extends RegistryBean {
 
-    private Registry registry;
+    private JndiBeanRepository registry;
 
-    public EjbRegistryBean(Registry registry, CamelContext context, String 
name) {
+    public EjbRegistryBean(JndiBeanRepository registry, CamelContext context, 
String name) {
         super(context, name);
         this.registry = registry;
     }