camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [9/9] camel git commit: Component docs
Date Wed, 06 Jan 2016 10:36:16 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/a9cee89a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9cee89a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9cee89a

Branch: refs/heads/camel-2.16.x
Commit: a9cee89a522958abd2c720048b21113b4fd1a9c5
Parents: f78cecf
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jan 6 11:35:59 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jan 6 11:35:59 2016 +0100

----------------------------------------------------------------------
 .../camel/component/test/TestEndpoint.java      |  2 +-
 .../camel/component/jbpm/JBPMConfiguration.java | 39 +-------------------
 .../camel/component/jbpm/JBPMProducer.java      |  2 +-
 3 files changed, 4 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
index a61efd1..f1fd29c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  *
  * @version 
  */
-@UriEndpoint(scheme = "test", title = "Test", syntax = "test:name", producerOnly = true,
label = "core,testing")
+@UriEndpoint(scheme = "test", title = "Test", syntax = "test:name", producerOnly = true,
label = "core,testing", lenientProperties = true)
 public class TestEndpoint extends MockEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(TestEndpoint.class);
     private final Endpoint expectedMessageEndpoint;

http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index 556001a..d91caf4 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.jbpm;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import javax.naming.InitialContext;
 
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
@@ -37,18 +35,6 @@ public class JBPMConfiguration {
     private URL connectionURL;
     @UriParam(label = "producer", defaultValue = "startProcess")
     private String operation;
-<<<<<<< HEAD
-    /**
-     * Specifies the key to use
-     */
-    @UriParam
-    private String key;
-    /**
-     * Specifies the value to use
-     */
-    @UriParam
-    private Objects value;
-=======
     @UriParam @Metadata(required = "true")
     private String deploymentId;
     @UriParam
@@ -56,17 +42,12 @@ public class JBPMConfiguration {
     @UriParam
     private Object value;
     @UriParam
->>>>>>> 38d72c9... Component docs
     private String processId;
     @UriParam
     private String eventType;
-<<<<<<< HEAD
-    private String event;
-=======
     @UriParam
     private Object event;
     @UriParam
->>>>>>> 38d72c9... Component docs
     private Integer maxNumber;
     @UriParam
     private String identifier;
@@ -112,26 +93,14 @@ public class JBPMConfiguration {
         this.operation = operation;
     }
 
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public Objects getValue() {
+    public Object getValue() {
         return value;
     }
 
-<<<<<<< HEAD
-    public void setValue(Objects value) {
-=======
     /**
      * the value to assign to the global identifier
      */
     public void setValue(Object value) {
->>>>>>> 38d72c9... Component docs
         this.value = value;
     }
 
@@ -179,18 +148,14 @@ public class JBPMConfiguration {
         this.eventType = eventType;
     }
 
-    public String getEvent() {
+    public Object getEvent() {
         return event;
     }
 
-<<<<<<< HEAD
-    public void setEvent(String event) {
-=======
     /**
      * the data associated with this event when signalEvent operation is performed
      */
     public void setEvent(Object event) {
->>>>>>> 38d72c9... Component docs
         this.event = event;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/a9cee89a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
index efccd67..8fc9fc4 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
@@ -407,7 +407,7 @@ public class JBPMProducer extends DefaultProducer {
         }
 
         Object getEvent(JBPMConfiguration configuration, Exchange exchange) {
-            String event = exchange.getIn().getHeader(JBPMConstants.EVENT, String.class);
+            Object event = exchange.getIn().getHeader(JBPMConstants.EVENT);
             if (event == null) {
                 event = configuration.getEvent();
             }


Mime
View raw message