Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 48729 invoked from network); 5 Mar 2009 09:45:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Mar 2009 09:45:44 -0000 Received: (qmail 48527 invoked by uid 500); 5 Mar 2009 09:45:44 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 48501 invoked by uid 500); 5 Mar 2009 09:45:44 -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 48492 invoked by uid 99); 5 Mar 2009 09:45:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 01:45:44 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 05 Mar 2009 09:45:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 93D4D2388964; Thu, 5 Mar 2009 09:45:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750401 - in /camel/trunk/components/camel-mina/src: main/java/org/apache/camel/component/mina/MinaComponent.java test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml Date: Thu, 05 Mar 2009 09:45:21 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090305094521.93D4D2388964@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Thu Mar 5 09:45:20 2009 New Revision: 750401 URL: http://svn.apache.org/viewvc?rev=750401&view=rev Log: MinaEndpoint codec option is now the real object and not string. Improved spring bean style config of mina endpoints. Added missing requestBody to producer template. Modified: camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java camel/trunk/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml Modified: camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=750401&r1=750400&r2=750401&view=diff ============================================================================== --- camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java (original) +++ camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java Thu Mar 5 09:45:20 2009 @@ -29,6 +29,7 @@ import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; import org.apache.camel.NoTypeConversionAvailableException; +import org.apache.camel.util.ObjectHelper; import org.apache.camel.impl.DefaultComponent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,23 +95,25 @@ config.setProtocol(u.getScheme()); setProperties(config, parameters); - return createEndpoint(getCamelContext(), uri, config); + return createEndpoint(uri, config); } - public Endpoint createEndpoint(CamelContext context, MinaConfiguration config) throws Exception { - return createEndpoint(context, null, config); + public Endpoint createEndpoint(MinaConfiguration config) throws Exception { + return createEndpoint(null, config); } - private Endpoint createEndpoint(CamelContext context, String uri, MinaConfiguration config) throws Exception { + private Endpoint createEndpoint(String uri, MinaConfiguration config) throws Exception { + ObjectHelper.notNull(getCamelContext(), "camelContext"); + String protocol = config.getProtocol(); // if mistyped uri then protocol can be null if (protocol != null) { if (protocol.equals("tcp")) { - return createSocketEndpoint(context, uri, config); + return createSocketEndpoint(uri, config); } else if (protocol.equals("udp") || protocol.equals("mcast") || protocol.equals("multicast")) { - return createDatagramEndpoint(context, uri, config); + return createDatagramEndpoint(uri, config); } else if (protocol.equals("vm")) { - return createVmEndpoint(context, uri, config); + return createVmEndpoint(uri, config); } } // protocol not resolved so error @@ -121,7 +124,7 @@ // Implementation methods //------------------------------------------------------------------------- - protected MinaEndpoint createVmEndpoint(CamelContext context, String uri, MinaConfiguration configuration) { + protected MinaEndpoint createVmEndpoint(String uri, MinaConfiguration configuration) { boolean minaLogger = configuration.isMinaLogger(); boolean sync = configuration.isSync(); List filters = configuration.getFilters(); @@ -145,7 +148,6 @@ appendIoFiltersToChain(filters, acceptor.getFilterChain()); MinaEndpoint endpoint = new MinaEndpoint(uri, this); - endpoint.setCamelContext(context); endpoint.setAddress(address); endpoint.setAcceptor(acceptor); endpoint.setConnector(connector); @@ -161,7 +163,7 @@ return endpoint; } - protected MinaEndpoint createSocketEndpoint(CamelContext context, String uri, MinaConfiguration configuration) { + protected MinaEndpoint createSocketEndpoint(String uri, MinaConfiguration configuration) { boolean minaLogger = configuration.isMinaLogger(); long timeout = configuration.getTimeout(); boolean sync = configuration.isSync(); @@ -193,7 +195,6 @@ appendIoFiltersToChain(filters, acceptorConfig.getFilterChain()); MinaEndpoint endpoint = new MinaEndpoint(uri, this); - endpoint.setCamelContext(context); endpoint.setAddress(address); endpoint.setAcceptor(acceptor); endpoint.setAcceptorConfig(acceptorConfig); @@ -235,7 +236,7 @@ addCodecFactory(config, codecFactory); } - protected MinaEndpoint createDatagramEndpoint(CamelContext context, String uri, MinaConfiguration configuration) { + protected MinaEndpoint createDatagramEndpoint(String uri, MinaConfiguration configuration) { boolean minaLogger = configuration.isMinaLogger(); long timeout = configuration.getTimeout(); boolean transferExchange = configuration.isTransferExchange(); @@ -269,7 +270,6 @@ appendIoFiltersToChain(filters, acceptorConfig.getFilterChain()); MinaEndpoint endpoint = new MinaEndpoint(uri, this); - endpoint.setCamelContext(context); endpoint.setAddress(address); endpoint.setAcceptor(acceptor); endpoint.setAcceptorConfig(acceptorConfig); Modified: camel/trunk/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml?rev=750401&r1=750400&r2=750401&view=diff ============================================================================== --- camel/trunk/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml (original) +++ camel/trunk/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml Thu Mar 5 09:45:20 2009 @@ -24,7 +24,10 @@ - + + + + +