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 2011/06/16 14:18:00 UTC
svn commit: r1136394 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model:
dataformat/DataFormatsDefinition.java
loadbalancer/CustomLoadBalancerDefinition.java
Author: davsclaus
Date: Thu Jun 16 12:18:00 2011
New Revision: 1136394
URL: http://svn.apache.org/viewvc?rev=1136394&view=rev
Log:
CAMEL-4112: Custom data format and load balancer uses a custom definition so its conistent to use any kind of data format / load balancer. Renamed ref to custom to make it more clear its a custom.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java?rev=1136394&r1=1136393&r2=1136394&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java Thu Jun 16 12:18:00 2011
@@ -41,6 +41,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
@XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
+ @XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@@ -48,7 +49,6 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
- @XmlElement(required = false, name = "ref", type = CustomDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java?rev=1136394&r1=1136393&r2=1136394&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java Thu Jun 16 12:18:00 2011
@@ -56,7 +56,7 @@ public class CustomLoadBalancerDefinitio
@Override
public String toString() {
- return "RefLoadBalancer[" + ref + "]";
+ return "CustomLoadBalancer[" + ref + "]";
}
}