camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [05/11] camel git commit: CAMEL-10546: Removed spring xsd polluting javadoc and rolled back the deprecation of PropertyDefinition as its used in purpose for endpoint propertiese
Date Sun, 22 Jan 2017 18:51:51 GMT
CAMEL-10546: Removed spring xsd polluting javadoc and rolled back the deprecation of PropertyDefinition
as its used in purpose for endpoint propertiese


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

Branch: refs/heads/master
Commit: 4d67aee2323cc829fde644a4049617c08b753675
Parents: d9552e3
Author: aldettinger <aldettinger@gmail.com>
Authored: Thu Jan 19 18:09:15 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Jan 22 18:06:43 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/model/GlobalOptionDefinition.java    | 6 ++----
 .../java/org/apache/camel/model/GlobalOptionsDefinition.java   | 4 +---
 .../main/java/org/apache/camel/model/PropertyDefinition.java   | 3 ---
 3 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4d67aee2/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
index edbf0bc..5eeb1c4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
@@ -21,13 +21,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.spi.Metadata;
 
 /**
- * Models a string key/value pair for configuring some global options on
- * {@link CamelContext} such as {@link Exchange#LOG_DEBUG_BODY_MAX_CHARS}.
+ * Models a string key/value pair for configuring some global options on a Camel
+ * context such as max debug log length.
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "globalOption")

http://git-wip-us.apache.org/repos/asf/camel/blob/4d67aee2/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
index e936aaf..c94c0a5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
@@ -25,13 +25,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.spi.Metadata;
 
 /**
  * Models a series of string key/value pairs for configuring some global options
- * on {@link CamelContext} such as {@link Exchange#LOG_DEBUG_BODY_MAX_CHARS}.
+ * on a Camel context such as max debug log length.
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "globalOptions")

http://git-wip-us.apache.org/repos/asf/camel/blob/4d67aee2/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
index c61745c..7f4b02b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
@@ -25,13 +25,10 @@ import org.apache.camel.spi.Metadata;
 
 /**
  * A key value pair
- *
- * @deprecated Use {@link GlobalOptionDefinition} instead.
  */
 @Metadata(label = "configuration")
 @XmlRootElement(name = "property")
 @XmlAccessorType(XmlAccessType.FIELD)
-@Deprecated
 public class PropertyDefinition {
     @XmlAttribute(required = true)
     String key;


Mime
View raw message