camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-7999: Deprecated ref over uri in model as already planned.
Date Sun, 01 Feb 2015 09:50:13 GMT
Repository: camel
Updated Branches:
  refs/heads/master e97a7c11a -> 9dcd714b9


CAMEL-7999: Deprecated ref over uri in model as already planned.


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

Branch: refs/heads/master
Commit: 9dcd714b9e648f6807bd518a9c81907395a77d35
Parents: e97a7c1
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Feb 1 10:50:13 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Feb 1 10:50:13 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/model/DescriptionDefinition.java  | 4 ++++
 .../src/main/java/org/apache/camel/model/EnrichDefinition.java   | 4 ++++
 .../src/main/java/org/apache/camel/model/FromDefinition.java     | 3 +++
 .../main/java/org/apache/camel/model/LoadBalanceDefinition.java  | 3 +++
 .../src/main/java/org/apache/camel/model/MarshalDefinition.java  | 3 +++
 .../main/java/org/apache/camel/model/PollEnrichDefinition.java   | 4 ++++
 .../src/main/java/org/apache/camel/model/SendDefinition.java     | 3 +++
 .../main/java/org/apache/camel/model/UnmarshalDefinition.java    | 3 +++
 .../src/main/java/org/apache/camel/model/WireTapDefinition.java  | 4 ++++
 9 files changed, 31 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
index 9500d56..b3da9c0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
@@ -79,6 +79,7 @@ public class DescriptionDefinition {
     /**
      * Layout height
      */
+    @Deprecated
     public void setLayoutHeight(Double layoutHeight) {
         this.layoutHeight = layoutHeight;
     }
@@ -90,6 +91,7 @@ public class DescriptionDefinition {
     /**
      * Layout width
      */
+    @Deprecated
     public void setLayoutWidth(Double layoutWidth) {
         this.layoutWidth = layoutWidth;
     }
@@ -101,6 +103,7 @@ public class DescriptionDefinition {
     /**
      * Layout position X
      */
+    @Deprecated
     public void setLayoutX(Double layoutX) {
         this.layoutX = layoutX;
     }
@@ -112,6 +115,7 @@ public class DescriptionDefinition {
     /**
      * Layout position Y
      */
+    @Deprecated
     public void setLayoutY(Double layoutY) {
         this.layoutY = layoutY;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/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 74a14df..5a3662f 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
@@ -45,6 +45,7 @@ public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition>
imple
     private String resourceUri;
     // TODO: For Camel 3.0 we should remove this ref attribute as you can do that in the
uri, by prefixing with ref:
     @XmlAttribute(name = "ref")
+    @Deprecated
     private String resourceRef;
     @XmlAttribute(name = "strategyRef")
     private String aggregationStrategyRef;
@@ -162,7 +163,10 @@ public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition>
imple
 
     /**
      * Refers to the endpoint for the external service to enrich from. You must use either
uri or ref.
+     *
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setResourceRef(String resourceRef) {
         this.resourceRef = resourceRef;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
index 4737059..3c1fc1f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -40,6 +40,7 @@ public class FromDefinition extends OptionalIdentifiedDefinition<FromDefinition>
     @XmlAttribute
     private String uri;
     @XmlAttribute
+    @Deprecated
     private String ref;
     @XmlTransient
     private Endpoint endpoint;
@@ -110,7 +111,9 @@ public class FromDefinition extends OptionalIdentifiedDefinition<FromDefinition>
      * ApplicationContext or JNDI) to use
      *
      * @param ref the reference name to use
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setRef(String ref) {
         clear();
         this.ref = ref;

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index 854fc36..05fc76b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -104,7 +104,10 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini
     /**
      * To use a custom load balancer.
      * This option is deprecated, use the custom load balancer type instead.
+     *
+     * @deprecated use custom load balancer
      */
+    @Deprecated
     public void setRef(String ref) {
         this.ref = ref;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 668e0ef..2e5e721 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -147,7 +147,10 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition>
{
 
     /**
      * To refer to a custom data format to use as marshaller
+     *
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setRef(String ref) {
         this.ref = ref;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/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 1df5ae7..7b6f9d1 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
@@ -45,6 +45,7 @@ public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinitio
     private String resourceUri;
     // TODO: For Camel 3.0 we should remove this ref attribute as you can do that in the
uri, by prefixing with ref:
     @XmlAttribute(name = "ref")
+    @Deprecated
     private String resourceRef;
     @XmlAttribute @Metadata(defaultValue = "-1")
     private Long timeout;
@@ -168,7 +169,10 @@ public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinitio
 
     /**
      * Refers to the endpoint for the external service to poll enrich from. You must use
either uri or ref.
+     *
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setResourceRef(String resourceRef) {
         this.resourceRef = resourceRef;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
index 508af03..a3cbd57 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
@@ -39,6 +39,7 @@ public abstract class SendDefinition<Type extends ProcessorDefinition<Type>>
ext
     @XmlAttribute
     protected String uri;
     @XmlAttribute
+    @Deprecated
     protected String ref;
     @XmlTransient
     protected Endpoint endpoint;
@@ -82,7 +83,9 @@ public abstract class SendDefinition<Type extends ProcessorDefinition<Type>>
ext
      * Sets the reference of the endpoint to send to.
      *
      * @param ref the reference of the endpoint
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setRef(String ref) {
         this.ref = ref;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 8efeda3..b9c9a64 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -151,7 +151,10 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
 
     /**
      * To refer to a custom data format to use as unmarshaller
+     *
+     * @deprecated use custom dataformat instead
      */
+    @Deprecated
     public void setRef(String ref) {
         this.ref = ref;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/9dcd714b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
index e599f82..3f53451 100644
--- a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
@@ -49,6 +49,7 @@ public class WireTapDefinition<Type extends ProcessorDefinition<Type>>
extends N
     @XmlAttribute
     protected String uri;
     @XmlAttribute
+    @Deprecated
     protected String ref;
     @XmlTransient
     protected Endpoint endpoint;
@@ -331,7 +332,10 @@ public class WireTapDefinition<Type extends ProcessorDefinition<Type>>
extends N
 
     /**
      * Reference of the endpoint to use as wire tap
+     *
+     * @deprecated use uri with ref:uri instead
      */
+    @Deprecated
     public void setRef(String ref) {
         this.ref = ref;
     }


Mime
View raw message