merge main codebase
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5be7b92 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5be7b92 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5be7b92 Branch: refs/heads/master Commit: f5be7b92672598a3346dcdba70f5a49a39007473 Parents: e1e5cac Author: lburgazzoli <lburgazz...@gmail.com> Authored: Tue Jul 21 22:45:59 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Aug 7 11:07:02 2015 +0200 ---------------------------------------------------------------------- .../camel/model/dataformat/BindyDataFormat.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f5be7b92/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java index 28d5cd2d..76def26 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java @@ -40,8 +40,6 @@ import org.apache.camel.util.ObjectHelper; public class BindyDataFormat extends DataFormatDefinition { @XmlAttribute(required = true) private BindyType type; - //@XmlAttribute - //private String[] packages; @XmlAttribute private String classType; @XmlAttribute @@ -64,19 +62,6 @@ public class BindyDataFormat extends DataFormatDefinition { this.type = type; } - /* - public String[] getPackages() { - return packages; - } - - /** - * The java package names to scan for model classes. - */ - public void setPackages(String[] packages) { - this.packages = packages; - } - */ - public String getClassType() { return classType; } @@ -88,6 +73,9 @@ public class BindyDataFormat extends DataFormatDefinition { this.classType = classType; } + /** + * Type of model class to use. + */ public void setClassType(Class<?> classType) { this.clazz = classType; }