You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/07/14 19:12:34 UTC
[1/2] camel git commit: Add doc to eip model
Repository: camel
Updated Branches:
refs/heads/master 7e885d766 -> 344db6660
Add doc to eip model
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc0f0cf7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc0f0cf7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc0f0cf7
Branch: refs/heads/master
Commit: dc0f0cf70e2d05e26d863e01221c412f2851d9b4
Parents: 7e885d7
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 14 19:14:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 14 19:14:55 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/model/DataFormatDefinition.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dc0f0cf7/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
index 38f3d93..acf8223 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
@@ -187,6 +187,9 @@ public class DataFormatDefinition extends IdentifiedType implements OtherAttribu
return otherAttributes;
}
+ /**
+ * Adds an optional attribute
+ */
public void setOtherAttributes(Map<QName, Object> otherAttributes) {
this.otherAttributes = otherAttributes;
}
[2/2] camel git commit: Add doc to eip model
Posted by da...@apache.org.
Add doc to eip model
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/344db666
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/344db666
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/344db666
Branch: refs/heads/master
Commit: 344db66607c0eb4ca71482e9f1b93e95a3490528
Parents: dc0f0cf
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 14 19:16:19 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 14 19:16:19 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/EnrichDefinition.java | 10 ++++++++++
.../java/org/apache/camel/model/PollEnrichDefinition.java | 10 ++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/344db666/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
index 902524e..2aab5d9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.Enricher;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
@@ -193,6 +194,15 @@ public class EnrichDefinition extends NoOutputExpressionNode {
// Properties
// -------------------------------------------------------------------------
+ /**
+ * Expression that computes the endpoint uri to use as the resource endpoint to enrich from
+ */
+ @Override
+ public void setExpression(ExpressionDefinition expression) {
+ // override to include javadoc what the expression is used for
+ super.setExpression(expression);
+ }
+
public String getAggregationStrategyRef() {
return aggregationStrategyRef;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/344db666/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
index e7c84a6..e2e2b57 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.PollEnricher;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
@@ -204,6 +205,15 @@ public class PollEnrichDefinition extends NoOutputExpressionNode {
// Properties
// -------------------------------------------------------------------------
+ /**
+ * Expression that computes the endpoint uri to use as the resource endpoint to enrich from
+ */
+ @Override
+ public void setExpression(ExpressionDefinition expression) {
+ // override to include javadoc what the expression is used for
+ super.setExpression(expression);
+ }
+
public Long getTimeout() {
return timeout;
}