Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 89739 invoked from network); 24 Mar 2008 08:44:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Mar 2008 08:44:31 -0000 Received: (qmail 95232 invoked by uid 500); 24 Mar 2008 08:44:29 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 95207 invoked by uid 500); 24 Mar 2008 08:44:29 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 95197 invoked by uid 99); 24 Mar 2008 08:44:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2008 01:44:29 -0700 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2008 08:43:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E9E1C1A9832; Mon, 24 Mar 2008 01:43:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r640346 - in /activemq/camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/ main/java/org/apache/camel/component/cxf/feature/ main/java/org/apache/camel/component/cxf/interceptors/ main/java/org/apache/camel/compo... Date: Mon, 24 Mar 2008 08:43:44 -0000 To: camel-commits@activemq.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080324084350.E9E1C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Mar 24 01:43:41 2008 New Revision: 640346 URL: http://svn.apache.org/viewvc?rev=640346&view=rev Log: Fixed tons of check style errors in camel-cxf component Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageInvoker.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageInvokerInterceptor.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/PayloadContentRedirectInterceptor.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SoapMessageInInterceptor.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduit.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduitSelector.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestination.java activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CamelInvoker.java Mon Mar 24 01:43:41 2008 @@ -165,8 +165,8 @@ Object result = null; if (cxfExchange.isFailed()) { - Exception ex= (Exception)cxfExchange.getFault().getBody(); - if (ex instanceof Fault ) { + Exception ex = (Exception)cxfExchange.getFault().getBody(); + if (ex instanceof Fault) { throw (Fault)ex; } else { throw new Fault(ex); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Mon Mar 24 01:43:41 2008 @@ -57,12 +57,12 @@ //get the bean from spring context beanId = address.substring(CxfConstants.SPRING_CONTEXT_ENDPOINT.length()); if (beanId.startsWith("//")) { - beanId = beanId.substring(2); + beanId = beanId.substring(2); } SpringCamelContext context = (SpringCamelContext) this.getContext(); configurer = new ConfigurerImpl(context.getApplicationContext()); cxfEndpointBean = (CxfEndpointBean) context.getApplicationContext().getBean(beanId); - assert(cxfEndpointBean != null); + assert cxfEndpointBean != null; } } @@ -99,11 +99,11 @@ } public String getAddress() { - return address; + return address; } public String getWsdlURL() { - return wsdlURL; + return wsdlURL; } public void setWsdlURL(String url) { @@ -127,7 +127,7 @@ serviceName = service; } - public String getPortName(){ + public String getPortName() { return portName; } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java Mon Mar 24 01:43:41 2008 @@ -61,7 +61,7 @@ setIn(new CxfMessage(inMessage)); if (exchange != null) { - if (exchange.getOutMessage()!= null) { + if (exchange.getOutMessage() != null) { setOut(new CxfMessage(exchange.getOutMessage())); } if (exchange.getInFaultMessage() != null) { @@ -102,7 +102,7 @@ public void setExchange(Exchange exchange) { - this.exchange = exchange; + this.exchange = exchange; } // Expose CXF APIs directly on the exchange Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Mon Mar 24 01:43:41 2008 @@ -53,13 +53,11 @@ * * @version $Revision$ */ -public class CxfProducer extends DefaultProducer { +public class CxfProducer extends DefaultProducer { private CxfEndpoint endpoint; private Client client; private DataFormat dataFormat; - - public CxfProducer(CxfEndpoint endpoint) throws CamelException { super(endpoint); this.endpoint = endpoint; @@ -93,19 +91,18 @@ List features = new ArrayList(); if (dataFormat.equals(DataFormat.MESSAGE)) { features.add(new MessageDataFormatFeature()); - //features.add(new LoggingFeature()); + // features.add(new LoggingFeature()); } if (dataFormat.equals(DataFormat.PAYLOAD)) { features.add(new PayLoadDataFormatFeature()); - //features.add(new LoggingFeature()); + // features.add(new LoggingFeature()); } cfb.setFeatures(features); - return createClientFormClientFactoryBean(cfb); } - //If cfb is null ,we will try to find a right cfb to use. + // If cfb is null ,we will try to find a right cfb to use. private Client createClientFormClientFactoryBean(ClientFactoryBean cfb) throws CamelException { Bus bus = BusFactory.getDefaultBus(); if (endpoint.isSpringContextEndpoint()) { @@ -124,8 +121,10 @@ } else { // set up the clientFactoryBean by using URI information if (null != endpoint.getServiceClass()) { try { - //we need to choice the right front end to create the clientFactoryBean - Class serviceClass = ClassLoaderUtils.loadClass(endpoint.getServiceClass(), this.getClass()); + // we need to choice the right front end to create the + // clientFactoryBean + Class serviceClass = ClassLoaderUtils.loadClass(endpoint.getServiceClass(), this + .getClass()); if (cfb == null) { cfb = CxfEndpointUtils.getClientFactoryBean(serviceClass); } @@ -146,7 +145,8 @@ if (null != endpoint.getWsdlURL()) { cfb.setWsdlURL(endpoint.getWsdlURL()); } else { - // throw the exception for insufficiency of the endpoint info + // throw the exception for insufficiency of the endpoint + // info throw new CamelException("Insufficiency of the endpoint info"); } } @@ -177,7 +177,7 @@ Message inMessage = cxfBinding.createCxfMessage(exchange); try { if (dataFormat.equals(DataFormat.POJO)) { - //InputStream is = m.getContent(InputStream.class); + // InputStream is = m.getContent(InputStream.class); // now we just deal with the POJO invocations List parameters = inMessage.getContent(List.class); if (parameters == null) { @@ -209,22 +209,22 @@ // get the invocation context org.apache.cxf.message.Exchange ex = exchange.getExchange(); if (ex == null) { - ex = (org.apache.cxf.message.Exchange) exchange.getProperty(CxfConstants.CXF_EXCHANGE); - exchange.setExchange(ex); + ex = (org.apache.cxf.message.Exchange)exchange.getProperty(CxfConstants.CXF_EXCHANGE); + exchange.setExchange(ex); } if (ex == null) { - ex = new ExchangeImpl(); - exchange.setExchange(ex); + ex = new ExchangeImpl(); + exchange.setExchange(ex); } assert ex != null; InvokingContext invokingContext = ex.get(InvokingContext.class); if (invokingContext == null) { - invokingContext = InvokingContextFactory.createContext(dataFormat); - ex.put(InvokingContext.class, invokingContext); + invokingContext = InvokingContextFactory.createContext(dataFormat); + ex.put(InvokingContext.class, invokingContext); } Map params = invokingContext.getRequestContent(inMessage); // invoke the stream message with the exchange context - CxfClient cxfClient = (CxfClient) client; + CxfClient cxfClient = (CxfClient)client; // need to get the binding object to create the message BindingOperationInfo boi = ex.get(BindingOperationInfo.class); Message response = null; @@ -257,7 +257,7 @@ } } } catch (Exception e) { - //TODO add the fault message handling work + // TODO add the fault message handling work throw new RuntimeCamelException(e); } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapBinding.java Mon Mar 24 01:43:41 2008 @@ -23,7 +23,7 @@ import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.MessageImpl; -public class CxfSoapBinding { +public final class CxfSoapBinding { private CxfSoapBinding() { } @@ -71,8 +71,7 @@ org.apache.camel.Message message = null; if (isClient) { message = exchange.getIn(); - } - else { + } else { message = exchange.getOut(); } // send the body back Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DataFormat.java Mon Mar 24 01:43:41 2008 @@ -42,19 +42,19 @@ * data format. */ POJO, - + /** * For UNKNOWN cases. */ UNKNOWN; - - - + + + public static DataFormat asEnum(String value) { - try { - return valueOf(value.toUpperCase()); - } catch (Exception e) { - return UNKNOWN; - } + try { + return valueOf(value.toUpperCase()); + } catch (Exception e) { + return UNKNOWN; + } } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageInvoker.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageInvoker.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageInvoker.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/MessageInvoker.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -25,11 +25,11 @@ public interface MessageInvoker { /** - * This method is called when the incoming message is to - * be passed into the camel processor. The return value is the response - * from the processor + * This method is called when the incoming message is to be passed into the + * camel processor. The return value is the response from the processor + * * @param the cxf exchange which holds the in and out message */ - public void invoke(Exchange exchange); + void invoke(Exchange exchange); } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageInvokerInterceptor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageInvokerInterceptor.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageInvokerInterceptor.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageInvokerInterceptor.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.component.cxf.feature; import java.util.logging.Logger; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/PayloadContentRedirectInterceptor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/PayloadContentRedirectInterceptor.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/PayloadContentRedirectInterceptor.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/PayloadContentRedirectInterceptor.java Mon Mar 24 01:43:41 2008 @@ -40,7 +40,7 @@ // check the fault from the message Exception ex = message.getContent(Exception.class); if (ex != null) { - if (ex instanceof Fault ) { + if (ex instanceof Fault) { throw (Fault)ex; } else { throw new Fault(ex); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java Mon Mar 24 01:43:41 2008 @@ -34,7 +34,7 @@ // check the fault from the message Exception ex = message.getContent(Exception.class); if (ex != null) { - if (ex instanceof Fault ) { + if (ex instanceof Fault) { throw (Fault)ex; } else { throw new Fault(ex); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SoapMessageInInterceptor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SoapMessageInInterceptor.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SoapMessageInInterceptor.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/SoapMessageInInterceptor.java Mon Mar 24 01:43:41 2008 @@ -114,10 +114,10 @@ } protected Element getHeader(SoapMessage inMessage) { - // need to find out the soap header information + // need to find out the soap header information Element element = null; return element; - // return inMessage.getHeaders(Element.class); + // return inMessage.getHeaders(Element.class); } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/AbstractInvokingContext.java Mon Mar 24 01:43:41 2008 @@ -48,7 +48,7 @@ } protected void loggerTheMessage(Message message, String messageTile) { - StringBuffer buffer = new StringBuffer( messageTile + "\n" + StringBuffer buffer = new StringBuffer(messageTile + "\n" + "--------------------------------------"); InputStream is = message.getContent(InputStream.class); if (is != null) { Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java Mon Mar 24 01:43:41 2008 @@ -182,7 +182,7 @@ private Message prepareMessage(Exchange exchange, Map requestContext, - Map param, InvokingContext InvokingContext) { + Map param, InvokingContext invokingContext) { Message message = getEndpoint().getBinding().createMessage(); message.put(Message.REQUESTOR_ROLE, Boolean.TRUE); @@ -194,7 +194,7 @@ } if (param != null) { - InvokingContext.setRequestOutMessageContent(message, param); + invokingContext.setRequestOutMessageContent(message, param); } if (null != requestContext) { Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/PayloadInvokingContext.java Mon Mar 24 01:43:41 2008 @@ -16,16 +16,17 @@ */ package org.apache.camel.component.cxf.invoker; +import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import java.util.IdentityHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.w3c.dom.Element; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; -import org.w3c.dom.Element; + public class PayloadInvokingContext extends AbstractInvokingContext { private static final Logger LOG = Logger.getLogger(PayloadInvokingContext.class.getName()); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/RawMessageInvokingContext.java Mon Mar 24 01:43:41 2008 @@ -17,10 +17,10 @@ package org.apache.camel.component.cxf.invoker; import java.io.InputStream; +import java.util.IdentityHashMap; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; -import java.util.IdentityHashMap; import java.util.logging.Logger; import org.apache.cxf.message.Exchange; @@ -36,9 +36,9 @@ public void setRequestOutMessageContent(Message message, Map contents) { Set entries = contents.keySet(); Iterator iter = entries.iterator(); - while (iter.hasNext()){ + while (iter.hasNext()) { Object obj = iter.next(); - if (obj instanceof Class){ + if (obj instanceof Class) { message.setContent((Class)obj, contents.get((Class)obj)); } } @@ -62,10 +62,11 @@ Set set = inMessage.getContentFormats(); Iterator iter = set.iterator(); - while (iter.hasNext()){ + while (iter.hasNext()) { Object obj = iter.next(); - if (obj instanceof Class) + if (obj instanceof Class) { contents.put((Class)obj, inMessage.getContent((Class)obj)); + } } return contents; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.java Mon Mar 24 01:43:41 2008 @@ -23,8 +23,8 @@ /** * */ -public class CxfEndpointBean extends AbstractWSDLBasedEndpointFactory{ +public class CxfEndpointBean extends AbstractWSDLBasedEndpointFactory { public CxfEndpointBean() { setServiceFactory(new ReflectionServiceFactoryBean()); - } + } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java Mon Mar 24 01:43:41 2008 @@ -1,26 +1,24 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.spring; import java.util.Map; - import javax.xml.namespace.QName; +import org.w3c.dom.Element; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; @@ -29,7 +27,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.w3c.dom.Element; + public class CxfEndpointBeanDefinitionParser extends AbstractBeanDefinitionParser { Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/NamespaceHandler.java Mon Mar 24 01:43:41 2008 @@ -1,20 +1,18 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.spring; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Mon Mar 24 01:43:41 2008 @@ -105,7 +105,7 @@ private void initConfig() { // we could configure the camel context here - if(bus != null) { + if (bus != null) { Configurer configurer = bus.getExtension(Configurer.class); if (null != configurer) { configurer.configureBean(this); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConstants.java Mon Mar 24 01:43:41 2008 @@ -19,7 +19,8 @@ /** * @version $Revision$ */ -public class CamelConstants { +public final class CamelConstants { + public static final String TEXT_MESSAGE_TYPE = "text"; public static final String BINARY_MESSAGE_TYPE = "binary"; public static final String CAMEL_TARGET_ENDPOINT_URI = "org.apache.cxf.camel.target.endpoint.uri"; @@ -45,4 +46,8 @@ public static final String CAMEL_SERVER_CONFIG_ID = "camel-server"; public static final String CAMEL_REBASED_REPLY_TO = "org.apache.cxf.camel.server.replyto"; public static final String CAMEL_CORRELATION_ID = "org.apache.cxf.camel.correlationId"; + + private CamelConstants() { + // Utility class + } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Mon Mar 24 01:43:41 2008 @@ -51,22 +51,21 @@ public class CamelDestination extends AbstractDestination implements Configurable { protected static final String BASE_BEAN_NAME_SUFFIX = ".camel-destination"; private static final Logger LOG = LogUtils.getL7dLogger(CamelDestination.class); - private CamelTemplate camelTemplate; + final ConduitInitiator conduitInitiator; CamelContext camelContext; Consumer consumer; String camelDestinationUri; - final ConduitInitiator conduitInitiator; - + private CamelTemplate camelTemplate; private org.apache.camel.Endpoint distinationEndpoint; public CamelDestination(CamelContext camelContext, Bus bus, ConduitInitiator ci, EndpointInfo info) throws IOException { - super(bus, getTargetReference(info, bus), info); + super(bus, getTargetReference(info, bus), info); this.camelContext = camelContext; conduitInitiator = ci; camelDestinationUri = endpointInfo.getAddress().substring(CxfConstants.CAMEL_TRANSPORT_PREFIX.length()); if (camelDestinationUri.startsWith("//")) { - camelDestinationUri = camelDestinationUri.substring(2); - } + camelDestinationUri = camelDestinationUri.substring(2); + } initConfig(); } @@ -91,13 +90,13 @@ distinationEndpoint = camelContext.getEndpoint(camelDestinationUri); consumer = distinationEndpoint.createConsumer(new ConsumerProcessor()); consumer.start(); - + } catch (Exception ex) { getLogger().log(Level.SEVERE, "Camel connect failed with EException : ", ex); } } - public void deactivate() { + public void deactivate() { try { consumer.stop(); } catch (Exception e) { @@ -110,7 +109,7 @@ getLogger().log(Level.FINE, "CamelDestination shutdown()"); this.deactivate(); } - + public CamelTemplate getCamelTemplate() { if (camelTemplate == null) { if (camelContext != null) { @@ -121,31 +120,31 @@ } return camelTemplate; } - + public void setCamelTemplate(CamelTemplate template) { camelTemplate = template; } - + public void setCamelContext(CamelContext context) { camelContext = context; } - + public CamelContext getCamelContext() { return camelContext; } protected void incoming(org.apache.camel.Exchange camelExchange) { getLogger().log(Level.FINE, "server received request: ", camelExchange); - org.apache.cxf.message.Message inMessage = + org.apache.cxf.message.Message inMessage = CxfSoapBinding.getCxfInMessage(camelExchange, false); - + inMessage.put(CxfConstants.CAMEL_EXCHANGE, camelExchange); ((MessageImpl)inMessage).setDestination(this); - + // Handling the incoming message // The response message will be send back by the outgoingchain incomingObserver.onMessage(inMessage); - + } public String getBeanName() { @@ -156,13 +155,13 @@ } private void initConfig() { - //we could configure the camel context here - if(bus != null) { + //we could configure the camel context here + if (bus != null) { Configurer configurer = bus.getExtension(Configurer.class); if (null != configurer) { configurer.configureBean(this); } - } + } } protected class ConsumerProcessor implements Processor { @@ -184,12 +183,12 @@ super(EndpointReferenceUtils.getAnonymousEndpointReference()); inMessage = message; cxfExchange = inMessage.getExchange(); - camelExchange = cxfExchange.get(Exchange.class); + camelExchange = cxfExchange.get(Exchange.class); } /** * Register a message observer for incoming messages. - * + * * @param observer the observer to notify on receipt of incoming */ public void setMessageObserver(MessageObserver observer) { @@ -199,13 +198,13 @@ /** * Send an outbound message, assumed to contain all the name-value * mappings of the corresponding input message (if any). - * + * * @param message the message to be sent. */ - public void prepare(Message message) throws IOException { + public void prepare(Message message) throws IOException { message.put(CxfConstants.CAMEL_EXCHANGE, inMessage.get(CxfConstants.CAMEL_EXCHANGE)); message.setContent(OutputStream.class, new CamelOutputStream(message)); - + } protected Logger getLogger() { @@ -213,17 +212,17 @@ } } - + /** * Mark message as a partial message. - * + * * @param partialResponse the partial response message * @param the decoupled target * @return true iff partial responses are supported */ protected boolean markPartialResponse(Message partialResponse, EndpointReferenceType decoupledTarget) { - return true; + return true; } /** @@ -232,11 +231,11 @@ protected ConduitInitiator getConduitInitiator() { return conduitInitiator; } - - + + private class CamelOutputStream extends CachedOutputStream { - private Message outMessage; - + private Message outMessage; + public CamelOutputStream(Message m) { super(); outMessage = m; @@ -244,12 +243,12 @@ // prepair the message and get the send out message private void commitOutputMessage() throws IOException { - Exchange camelExchange =(Exchange)outMessage.get(CxfConstants.CAMEL_EXCHANGE); + Exchange camelExchange = (Exchange)outMessage.get(CxfConstants.CAMEL_EXCHANGE); camelExchange.getOut().setHeaders(outMessage); CachedOutputStream outputStream = (CachedOutputStream)outMessage.getContent(OutputStream.class); camelExchange.getOut().setBody(outputStream.getInputStream()); getLogger().log(Level.FINE, "send the response message: " + outputStream); - + } @Override @@ -267,5 +266,5 @@ // Do nothing here } } - + } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Mon Mar 24 01:43:41 2008 @@ -1,22 +1,23 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.transport.spring; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import org.apache.camel.util.ObjectHelper; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; @@ -24,9 +25,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefinitionParser { private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext"; @@ -58,7 +56,7 @@ // get the inner camel context id String contextId = (String)bd.getPropertyValues().getPropertyValue("id").getValue(); bean.addPropertyReference("camelContext", getContextId(contextId)); - } else if ("camelContextRef".equals(name)){ + } else if ("camelContextRef".equals(name)) { String contextId = n.getTextContent(); bean.addPropertyReference("camelContext", getContextId(contextId)); } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelConduitDefinitionParser.java Mon Mar 24 01:43:41 2008 @@ -1,20 +1,18 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.transport.spring; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/CamelDestinationDefinitionParser.java Mon Mar 24 01:43:41 2008 @@ -1,20 +1,18 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.transport.spring; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java Mon Mar 24 01:43:41 2008 @@ -1,26 +1,24 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.cxf.transport.spring; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -public class NamespaceHandler extends NamespaceHandlerSupport{ +public class NamespaceHandler extends NamespaceHandlerSupport { public void init() { registerBeanDefinitionParser("conduit", new CamelConduitDefinitionParser()); registerBeanDefinitionParser("destination", new CamelDestinationDefinitionParser()); Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java Mon Mar 24 01:43:41 2008 @@ -104,7 +104,7 @@ } public static boolean hasWebServiceAnnotation(Class cls) { - return (hasAnnotation(cls, WebService.class) || hasAnnotation(cls, WebServiceProvider.class)); + return hasAnnotation(cls, WebService.class) || hasAnnotation(cls, WebServiceProvider.class); } public static boolean hasAnnotation(Class cls, Class annotation) { @@ -118,7 +118,7 @@ for (Class interfaceClass : cls.getInterfaces()) { if (null != interfaceClass.getAnnotation(annotation)) { - return true; + return true; } } return hasAnnotation(cls.getSuperclass(), annotation); @@ -219,13 +219,13 @@ public static DataFormat getDataFormat(CxfEndpoint endpoint) throws CamelException { String dataFormatString = endpoint.getDataFormat(); if (dataFormatString == null) { - return DataFormat.POJO; + return DataFormat.POJO; } DataFormat retval = DataFormat.asEnum(dataFormatString); if (retval == DataFormat.UNKNOWN) { - throw new CamelException(new Message("INVALID_MESSAGE_FORMAT_XXXX", LOG, dataFormatString).toString()); + throw new CamelException(new Message("INVALID_MESSAGE_FORMAT_XXXX", LOG, dataFormatString).toString()); } return retval; Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataOutInterceptor.java Mon Mar 24 01:43:41 2008 @@ -42,7 +42,7 @@ try { // put the payload source as a document Source source = message.getContent(Source.class); - if(source != null ) { + if (source != null) { XMLStreamReader xmlReader = StaxUtils.createXMLStreamReader(source); StaxUtils.copy(xmlReader, xmlWriter); } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduit.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduit.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduit.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduit.java Mon Mar 24 01:43:41 2008 @@ -26,14 +26,14 @@ import org.apache.cxf.transport.MessageObserver; import org.apache.cxf.ws.addressing.EndpointReferenceType; -public class NullConduit implements Conduit{ +public class NullConduit implements Conduit { public void close() { // TODO Auto-generated method stub - + } - public void close(Message message) throws IOException { + public void close(Message message) throws IOException { OutputStream outputStream = message.getContent(OutputStream.class); if (outputStream != null) { outputStream.close(); @@ -53,12 +53,12 @@ public void prepare(Message message) throws IOException { CachedOutputStream outputStream = new CachedOutputStream(); message.setContent(OutputStream.class, outputStream); - + } public void setMessageObserver(MessageObserver observer) { // TODO Auto-generated method stub - + } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduitSelector.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduitSelector.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduitSelector.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullConduitSelector.java Mon Mar 24 01:43:41 2008 @@ -25,31 +25,31 @@ public class NullConduitSelector implements ConduitSelector { private Endpoint endpoint; private NullConduit nullConduit; - + public NullConduitSelector() { nullConduit = new NullConduit(); } public void complete(Exchange exchange) { //do nothing here - + } public Endpoint getEndpoint() { - return endpoint; + return endpoint; } public void prepare(Message message) { //do nothing here - + } - public Conduit selectConduit(Message message) { + public Conduit selectConduit(Message message) { return nullConduit; } public void setEndpoint(Endpoint endpoint) { this.endpoint = endpoint; - + } } Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestination.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestination.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestination.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestination.java Mon Mar 24 01:43:41 2008 @@ -24,7 +24,7 @@ import org.apache.cxf.transport.MessageObserver; import org.apache.cxf.ws.addressing.EndpointReferenceType; -public class NullDestination implements Destination{ +public class NullDestination implements Destination { MessageObserver messageObserver; public NullDestination() { Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java Mon Mar 24 01:43:41 2008 @@ -25,7 +25,7 @@ import org.apache.cxf.transport.Destination; import org.apache.cxf.transport.DestinationFactory; -public class NullDestinationFactory implements DestinationFactory{ +public class NullDestinationFactory implements DestinationFactory { public Destination getDestination(EndpointInfo ei) throws IOException { // setup the endpoint information @@ -36,11 +36,11 @@ return new NullDestination(); } - public List getTransportIds() { + public List getTransportIds() { return null; } - public Set getUriPrefixes() { + public Set getUriPrefixes() { return null; } Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java Mon Mar 24 01:43:41 2008 @@ -69,7 +69,7 @@ @Override public void testOnwayInvocation() throws Exception { - Service service = Service.create(serviceName); + Service service = Service.create(serviceName); service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/", "http://localhost:9003/CamelContext/RouterPort"); Greeter greeter = service.getPort(routerPortName, Greeter.class); Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -40,11 +40,12 @@ protected static final String ROUTER_ADDRESS = "http://localhost:9002/router"; protected static final String SERVICE_CLASS = "serviceClass=org.apache.camel.component.cxf.HelloService"; - protected static String ROUTER_ENDPOINT_URI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS; private static final String EXCEPTION_MESSAGE = "This is an exception test message"; private static final String DETAIL_TEXT = "This is a detail text node"; - private static SoapFault SOAP_FAULT; + private static final SoapFault SOAP_FAULT; + protected static String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS; + private Bus bus; @@ -76,7 +77,7 @@ protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from(ROUTER_ENDPOINT_URI).throwFault(SOAP_FAULT); + from(routerEndpointURI).throwFault(SOAP_FAULT); } }; } Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -26,7 +26,7 @@ @Override protected void setUp() throws Exception { - ROUTER_ENDPOINT_URI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&DataFormat=MESSAGE"; + routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&DataFormat=MESSAGE"; super.setUp(); } Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java Mon Mar 24 01:43:41 2008 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -23,7 +23,7 @@ public class CxfPayLoadCustomizedExceptionTest extends CxfCustmerizedExceptionTest { @Override protected void setUp() throws Exception { - ROUTER_ENDPOINT_URI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&DataFormat=PAYLOAD"; + routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&DataFormat=PAYLOAD"; super.setUp(); } Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java Mon Mar 24 01:43:41 2008 @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.cxf; import java.util.ArrayList; @@ -16,10 +32,11 @@ public class CxfProducerRouterTest extends ContextTestSupport { private static final transient Log LOG = LogFactory.getLog(CxfProducerRouterTest.class); - private final static String SIMPLE_SERVER_ADDRESS = "http://localhost:28080/test"; + private static final String SIMPLE_SERVER_ADDRESS = "http://localhost:28080/test"; + + private static final String ECHO_OPERATION = "echo"; + private static final String TEST_MESSAGE = "Hello World!"; private ServerImpl simpleServer; - private final static String ECHO_OPERATION = "echo"; - private final static String TEST_MESSAGE = "Hello World!"; @Override protected void setUp() throws Exception { @@ -70,7 +87,7 @@ private String getSimpleEndpointUri() { return "cxf://" + SIMPLE_SERVER_ADDRESS - + "?serviceClass=org.apache.camel.component.cxf.HelloService"; + + "?serviceClass=org.apache.camel.component.cxf.HelloService"; } } Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java Mon Mar 24 01:43:41 2008 @@ -39,14 +39,14 @@ */ public class CxfProducerTest extends TestCase { private static final transient Log LOG = LogFactory.getLog(CxfProducerTest.class); + private static final String SIMPLE_SERVER_ADDRESS = "http://localhost:28080/test"; + private static final String JAXWS_SERVER_ADDRESS = "http://localhost:28081/test"; + private static final String ECHO_OPERATION = "echo"; + private static final String GREET_ME_OPERATION = "greetMe"; + private static final String TEST_MESSAGE = "Hello World!"; protected CamelContext camelContext = new DefaultCamelContext(); protected CamelTemplate template = new CamelTemplate(camelContext); - private final static String SIMPLE_SERVER_ADDRESS = "http://localhost:28080/test"; - private final static String JAXWS_SERVER_ADDRESS = "http://localhost:28081/test"; - private final static String ECHO_OPERATION = "echo"; - private final static String GREET_ME_OPERATION ="greetMe"; - private final static String TEST_MESSAGE = "Hello World!"; private ServerImpl simpleServer; private Endpoint jaxwsEndpoint; @@ -114,7 +114,7 @@ private String getSimpleEndpointUri() { return "cxf://" + SIMPLE_SERVER_ADDRESS - + "?serviceClass=org.apache.camel.component.cxf.HelloService"; + + "?serviceClass=org.apache.camel.component.cxf.HelloService"; } private String getJaxwsEndpointUri() { Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java Mon Mar 24 01:43:41 2008 @@ -99,7 +99,7 @@ } public void testOnwayInvocation() throws Exception { - ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean(); + ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean(); ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean(); clientBean.setAddress(ROUTER_ADDRESS); clientBean.setServiceClass(HelloService.class); Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java Mon Mar 24 01:43:41 2008 @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.cxf; import java.io.File; @@ -17,9 +33,10 @@ import org.apache.cxf.staxutils.StaxUtils; public class CxfSoapBindingTest extends TestCase { - private DefaultCamelContext context = new DefaultCamelContext(); private static final String REQUEST_STRING = ""; + private DefaultCamelContext context = new DefaultCamelContext(); + // setup the default context for testing public void testGetCxfInMessage() throws Exception { Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloServiceImpl.java Mon Mar 24 01:43:41 2008 @@ -30,12 +30,12 @@ } public void ping() { - invocationCount ++; - LOG.info("call for oneway ping"); + invocationCount++; + LOG.info("call for oneway ping"); } public int getInvocationCount() { - return invocationCount; + return invocationCount; } public String sayHello() { Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java Mon Mar 24 01:43:41 2008 @@ -22,7 +22,7 @@ /** * */ -public class CxfEndpointBeanTest extends TestCase{ +public class CxfEndpointBeanTest extends TestCase { public void testCxfEndpointBeanDefinitionParser() { ClassPathXmlApplicationContext ctx = Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java Mon Mar 24 01:43:41 2008 @@ -95,9 +95,9 @@ } public void testGetTransportFactoryFromBus() throws Exception { - Bus bus = BusFactory.getDefaultBus(); - assertNotNull(bus.getExtension(ConduitInitiatorManager.class) - .getConduitInitiator(CamelTransportFactory.TRANSPORT_ID)); + Bus bus = BusFactory.getDefaultBus(); + assertNotNull(bus.getExtension(ConduitInitiatorManager.class) + .getConduitInitiator(CamelTransportFactory.TRANSPORT_ID)); } public void testOneWayDestination() throws Exception { Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java?rev=640346&r1=640345&r2=640346&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java (original) +++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsTest.java Mon Mar 24 01:43:41 2008 @@ -25,15 +25,14 @@ import org.apache.camel.impl.DefaultCamelContext; public class CxfEndpointUtilsTest extends TestCase { - // set up the port name and service name - private static final QName SERVICE_NAME = - new QName("http://www.example.com/test", "ServiceName"); - static final String CXF_BASE_URI = "cxf://http://www.example.com/testaddress" + "?serviceClass=org.apache.camel.component.cxf.HelloService" + "&portName={http://www.example.com/test}PortName" + "&serviceName={http://www.example.com/test}ServiceName"; + // set up the port name and service name + private static final QName SERVICE_NAME = + new QName("http://www.example.com/test", "ServiceName"); CxfEndpoint cxfEndpoint;