Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B237169A4 for ; Thu, 16 Jun 2011 12:18:24 +0000 (UTC) Received: (qmail 42597 invoked by uid 500); 16 Jun 2011 12:18:24 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 42565 invoked by uid 500); 16 Jun 2011 12:18:24 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 42558 invoked by uid 99); 16 Jun 2011 12:18:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 12:18:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 12:18:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0DB02388A70; Thu, 16 Jun 2011 12:18:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136394 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: dataformat/DataFormatsDefinition.java loadbalancer/CustomLoadBalancerDefinition.java Date: Thu, 16 Jun 2011 12:18:00 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110616121800.F0DB02388A70@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 + "]"; } }