camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [6/9] camel git commit: Component docs
Date Fri, 19 Jun 2015 15:32:41 GMT
Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1499d489
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1499d489
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1499d489

Branch: refs/heads/master
Commit: 1499d4891a80e4dc7e74dde2519aa69ee9505541
Parents: 23ebf59
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Jun 19 16:51:08 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Jun 19 17:38:09 2015 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/ejb/EjbComponent.java  | 14 +++++++-------
 .../component/ejb/GreaterCamelEjbPropertiesTest.java  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1499d489/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/EjbComponent.java
----------------------------------------------------------------------
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 91ac608..29d27a8 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
@@ -36,7 +36,7 @@ import org.apache.camel.spi.Registry;
 public class EjbComponent extends BeanComponent {
 
     private Context context;
-    private Properties properties;
+    private Properties jndiProperties;
 
     public EjbComponent() {
         super(EjbEndpoint.class);
@@ -67,23 +67,23 @@ public class EjbComponent extends BeanComponent {
         this.context = context;
     }
 
-    public Properties getProperties() {
-        return properties;
+    public Properties getJndiProperties() {
+        return jndiProperties;
     }
 
     /**
      * Properties for creating javax.naming.Context if a context has not been configured.
      */
-    public void setProperties(Properties properties) {
-        this.properties = properties;
+    public void setJndiProperties(Properties jndiProperties) {
+        this.jndiProperties = jndiProperties;
     }
 
     @Override
     protected void doStart() throws Exception {
         super.doStart();
 
-        if (context == null && properties != null) {
-            context = new InitialContext(getProperties());
+        if (context == null && jndiProperties != null) {
+            context = new InitialContext(getJndiProperties());
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/1499d489/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java
b/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java
index 14e921d..2007ad1 100644
--- a/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java
+++ b/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelEjbPropertiesTest.java
@@ -41,7 +41,7 @@ public class GreaterCamelEjbPropertiesTest extends CamelTestSupport {
         properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
 
         EjbComponent ejb = answer.getComponent("ejb", EjbComponent.class);
-        ejb.setProperties(properties);
+        ejb.setJndiProperties(properties);
 
         return answer;
     }


Mime
View raw message