You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ch...@apache.org on 2007/08/07 23:33:12 UTC
svn commit: r563665 [2/11] - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/converter/jaxp/
camel-core/src/test/java/org/apache/camel/processor/
components/camel-activemq/src/main/java/org/apache/camel/component/activemq/
component...
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java Tue Aug 7 14:33:00 2007
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -16,15 +16,15 @@
*/
package org.apache.camel.bam.rules;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.camel.Exchange;
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.model.ProcessDefinition;
import org.apache.camel.bam.model.ProcessInstance;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* @version $Revision: $
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Tue Aug 7 14:33:00 2007
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -16,6 +16,9 @@
*/
package org.apache.camel.bam.rules;
+import java.util.ArrayList;
+import java.util.Date;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
@@ -27,14 +30,12 @@
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.OutputType;
import org.apache.camel.model.RouteType;
-import static org.apache.camel.util.ServiceHelper.startServices;
-import static org.apache.camel.util.ServiceHelper.stopServices;
import org.apache.camel.util.Time;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
-import java.util.Date;
+import static org.apache.camel.util.ServiceHelper.startServices;
+import static org.apache.camel.util.ServiceHelper.stopServices;
/**
* A temporal rule for use within BAM
@@ -42,7 +43,7 @@
* @version $Revision: $
*/
public class TemporalRule extends ServiceSupport {
- private static final transient Log log = LogFactory.getLog(TemporalRule.class);
+ private static final transient Log LOG = LogFactory.getLog(TemporalRule.class);
private TimeExpression first;
private TimeExpression second;
private long expectedMillis;
@@ -135,7 +136,9 @@
ProcessInstance instance = activityState.getProcessInstance();
ActivityState secondState = second.getActivityState(instance);
if (secondState == null) {
- log.error("Could not find the second state! Process is: " + instance + " with first state: " + first.getActivityState(instance) + " and the state I was called with was: " + activityState);
+ log.error("Could not find the second state! Process is: "
+ + instance + " with first state: " + first.getActivityState(instance)
+ + " and the state I was called with was: " + activityState);
}
*/
@@ -145,9 +148,8 @@
Exchange exchange = createExchange();
exchange.getIn().setBody(activityState);
processor.process(exchange);
- }
- else {
- log.warn("Process has not actually expired; the time is: " + now + " but the overdue time is: " + overdue);
+ } else {
+ LOG.warn("Process has not actually expired; the time is: " + now + " but the overdue time is: " + overdue);
}
}
}
Modified: activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java Tue Aug 7 14:33:00 2007
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -16,16 +16,16 @@
*/
package org.apache.camel.bam;
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
-import static org.apache.camel.util.Time.seconds;
-import org.apache.camel.model.language.XPathExpression;
+
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.orm.jpa.JpaTemplate;
import org.springframework.transaction.support.TransactionTemplate;
+
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
+import static org.apache.camel.util.Time.seconds;
/**
* @version $Revision: $
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBinding.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,11 +16,11 @@
*/
package org.apache.camel.component.cxf;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-
import java.io.InputStream;
import java.util.Set;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
/**
* The binding of how Camel messages get mapped to Apache CXF and back again
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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/CxfConstants.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java Tue Aug 7 14:33:00 2007
@@ -1,6 +1,4 @@
/**
- /**
- *
* 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.
@@ -8,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/CxfConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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 +25,7 @@
/**
* A consumer of exchanges for a service in CXF
- *
+ *
* @version $Revision$
*/
public class CxfConsumer extends DefaultConsumer<CxfExchange> {
@@ -63,10 +62,11 @@
protected void incomingCxfMessage(Message message) {
try {
CxfExchange exchange = endpoint.createExchange(message);
- getProcessor().process(exchange);
- } catch (Exception e) {
- // TODO: what do do if we are getting processing errors from camel? Shutdown?
- e.printStackTrace();
- }
+ getProcessor().process(exchange);
+ } catch (Exception e) {
+ // TODO: what do do if we are getting processing errors from camel?
+ // Shutdown?
+ e.printStackTrace();
+ }
}
}
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -28,7 +27,7 @@
/**
* Defines the <a href="http://activemq.apache.org/camel/cxf.html">CXF Endpoint</a>
- *
+ *
* @version $Revision$
*/
public class CxfEndpoint extends DefaultEndpoint<CxfExchange> {
@@ -89,9 +88,9 @@
public CxfComponent getComponent() {
return component;
}
-
- public boolean isSingleton() {
- return true;
- }
+
+ public boolean isSingleton() {
+ return true;
+ }
}
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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/CxfInvokeComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeComponent.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeComponent.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeComponent.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,15 +16,14 @@
*/
package org.apache.camel.component.cxf;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Properties;
/**
* @version $Revision$
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,7 +24,7 @@
/**
* A consumer of exchanges for a service in CXF
- *
+ *
* @version $Revision$
*/
public class CxfInvokeConsumer extends DefaultConsumer<CxfExchange> {
@@ -41,8 +40,8 @@
protected void doStart() throws Exception {
super.doStart();
// TODO we need to add custom cxf message observer and wire the
- // incomingCxfMessage method. Also, custom cxf interceptors are
- // needed in order to object SOAP/XML message. Currently, the
+ // incomingCxfMessage method. Also, custom cxf interceptors are
+ // needed in order to object SOAP/XML message. Currently, the
// CXF service invoker will invoke the service class.
if (server != null) {
// start a cxf service
@@ -51,7 +50,7 @@
svrBean.setServiceClass(Class.forName(cxfEndpoint.getProperty(CxfConstants.IMPL)));
svrBean.setBus(cxfEndpoint.getBus());
- server = (ServerImpl) svrBean.create();
+ server = (ServerImpl)svrBean.create();
server.start();
}
}
@@ -68,11 +67,12 @@
// TODO this method currently is not being called.
protected void incomingCxfMessage(Message message) {
try {
- CxfExchange exchange = cxfEndpoint.createExchange(message);
- getProcessor().process(exchange);
- } catch (Exception e) {
- // TODO: what do do if we are getting processing errors from camel? Shutdown?
- e.printStackTrace();
- }
+ CxfExchange exchange = cxfEndpoint.createExchange(message);
+ getProcessor().process(exchange);
+ } catch (Exception e) {
+ // TODO: what do do if we are getting processing errors from camel?
+ // Shutdown?
+ e.printStackTrace();
+ }
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -28,7 +27,7 @@
/**
* The endpoint in the service engine
- *
+ *
* @version $Revision$
*/
public class CxfInvokeEndpoint extends DefaultEndpoint<CxfExchange> {
@@ -81,7 +80,7 @@
public CxfInvokeComponent getComponent() {
return component;
}
-
+
public String getProperty(String key) {
return properties.getProperty(key);
}
@@ -89,9 +88,9 @@
public Bus getBus() {
return component.getBus();
}
-
- public boolean isSingleton() {
- return true;
- }
+
+ public boolean isSingleton() {
+ return true;
+ }
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,18 +16,18 @@
*/
package org.apache.camel.component.cxf;
-import org.apache.camel.RuntimeCamelException;
+import java.util.List;
+
import org.apache.camel.Exchange;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientFactoryBean;
-import java.util.List;
-
/**
* Sends messages from Camel into the CXF endpoint
- *
+ *
* @version $Revision$
*/
public class CxfInvokeProducer extends DefaultProducer {
@@ -51,8 +50,7 @@
Object[] response = null;
try {
response = client.invoke(endpoint.getProperty(CxfConstants.METHOD), params.toArray());
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeCamelException(e);
}
@@ -62,7 +60,8 @@
@Override
protected void doStart() throws Exception {
- // TODO Add support for sending message inputstream. Currently, we only handle
+ // TODO Add support for sending message inputstream. Currently, we only
+ // handle
// method invocation with pojo.
// TODO Add support for endpoints associated with a WSDL
@@ -87,5 +86,3 @@
super.doStop();
}
}
-
-
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,15 +16,16 @@
*/
package org.apache.camel.component.cxf;
+import java.util.Map;
+
import org.apache.camel.impl.DefaultMessage;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import java.util.Map;
-
/**
- * An Apache CXF {@link Message} which provides access to the underlying CXF features
- *
+ * An Apache CXF {@link Message} which provides access to the underlying CXF
+ * features
+ *
* @version $Revision$
*/
public class CxfMessage extends DefaultMessage {
@@ -43,20 +43,19 @@
public String toString() {
if (cxfMessage != null) {
return "CxfMessage: " + cxfMessage;
- }
- else {
+ } else {
return "CxfMessage: " + getBody();
}
}
@Override
public CxfExchange getExchange() {
- return (CxfExchange) super.getExchange();
+ return (CxfExchange)super.getExchange();
}
/**
* Returns the underlying CXF message
- *
+ *
* @return the CXF message
*/
public Message getMessage() {
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,8 +16,11 @@
*/
package org.apache.camel.component.cxf;
-import org.apache.camel.RuntimeCamelException;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultProducer;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -30,12 +32,9 @@
import org.apache.cxf.transport.local.LocalConduit;
import org.apache.cxf.transport.local.LocalTransportFactory;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-
/**
* Sends messages from Camel into the CXF endpoint
- *
+ *
* @version $Revision$
*/
public class CxfProducer extends DefaultProducer {
@@ -71,13 +70,13 @@
if (endpoint.isInOut()) {
Message response = future.getResponse();
- // TODO - why do we need to ignore the returned message and get the out message from the exchange!
+ // TODO - why do we need to ignore the returned message and
+ // get the out message from the exchange!
response = e.getOutMessage();
binding.storeCxfResponse(exchange, response);
}
}
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw new RuntimeCamelException(e);
}
}
@@ -110,8 +109,7 @@
while (response == null) {
try {
latch.await();
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
// ignore
}
}
@@ -122,8 +120,7 @@
try {
message.remove(LocalConduit.DIRECT_DISPATCH);
this.response = message;
- }
- finally {
+ } finally {
latch.countDown();
}
}
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,6 +16,14 @@
*/
package org.apache.camel.component.cxf.transport;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.apache.cxf.Bus;
@@ -34,14 +41,6 @@
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
/**
* @version $Revision$
*/
@@ -51,12 +50,11 @@
private final CamelTransportBase base;
private String targetCamelEndpointUri;
-/*
- protected ClientConfig clientConfig;
- protected ClientBehaviorPolicyType runtimePolicy;
- protected AddressType address;
- protected SessionPoolType sessionPool;
-*/
+ /*
+ * protected ClientConfig clientConfig; protected ClientBehaviorPolicyType
+ * runtimePolicy; protected AddressType address; protected SessionPoolType
+ * sessionPool;
+ */
public CamelConduit(CamelContext camelContext, Bus bus, EndpointInfo endpointInfo, EndpointReferenceType targetReference) {
super(targetReference);
@@ -74,8 +72,7 @@
public void prepare(Message message) throws IOException {
getLogger().log(Level.FINE, "CamelConduit send message");
- message.setContent(OutputStream.class,
- new CamelOutputStream(message));
+ message.setContent(OutputStream.class, new CamelOutputStream(message));
}
public void close() {
@@ -100,16 +97,16 @@
private void initConfig() {
-/*
- this.address = base.endpointInfo.getTraversedExtensor(new AddressType(),
- AddressType.class);
- this.sessionPool = base.endpointInfo.getTraversedExtensor(new SessionPoolType(),
- SessionPoolType.class);
- this.clientConfig = base.endpointInfo.getTraversedExtensor(new ClientConfig(),
- ClientConfig.class);
- this.runtimePolicy = base.endpointInfo.getTraversedExtensor(new ClientBehaviorPolicyType(),
- ClientBehaviorPolicyType.class);
-*/
+ /*
+ * this.address = base.endpointInfo.getTraversedExtensor(new
+ * AddressType(), AddressType.class); this.sessionPool =
+ * base.endpointInfo.getTraversedExtensor(new SessionPoolType(),
+ * SessionPoolType.class); this.clientConfig =
+ * base.endpointInfo.getTraversedExtensor(new ClientConfig(),
+ * ClientConfig.class); this.runtimePolicy =
+ * base.endpointInfo.getTraversedExtensor(new
+ * ClientBehaviorPolicyType(), ClientBehaviorPolicyType.class);
+ */
Configurer configurer = base.bus.getExtension(Configurer.class);
if (null != configurer) {
@@ -126,7 +123,7 @@
}
protected void doFlush() throws IOException {
- //do nothing here
+ // do nothing here
}
protected void doClose() throws IOException {
@@ -145,21 +142,16 @@
base.template.send(targetCamelEndpointUri, new Processor() {
public void process(org.apache.camel.Exchange reply) {
Object request = null;
-
if (isTextPayload()) {
request = currentStream.toString();
- }
- else {
- request = ((ByteArrayOutputStream) currentStream).toByteArray();
+ } else {
+ request = ((ByteArrayOutputStream)currentStream).toByteArray();
}
getLogger().log(Level.FINE, "Conduit Request is :[" + request + "]");
String replyTo = base.getReplyDestination();
-
- //TODO setting up the responseExpected
-
+ // TODO setting up the responseExpected
base.marshal(request, replyTo, reply);
-
base.setMessageProperties(outMessage, reply);
String correlationID = null;
@@ -169,9 +161,7 @@
if (id != null) {
if (correlationID != null) {
- String error = "User cannot set CamelCorrelationID when "
- + "making a request/reply invocation using "
- + "a static replyTo Queue.";
+ String error = "User cannot set CamelCorrelationID when " + "making a request/reply invocation using " + "a static replyTo Queue.";
}
correlationID = id;
}
@@ -179,10 +169,11 @@
if (correlationID != null) {
reply.getIn().setHeader(CamelConstants.CAMEL_CORRELATION_ID, correlationID);
- }
- else {
- //No message correlation id is set. Whatever comeback will be accepted as responses.
- // We assume that it will only happen in case of the temp. reply queue.
+ } else {
+ // No message correlation id is set. Whatever comeback
+ // will be accepted as responses.
+ // We assume that it will only happen in case of the
+ // temp. reply queue.
}
getLogger().log(Level.FINE, "template sending request: ", reply.getIn());
@@ -194,53 +185,42 @@
// REVISIT distinguish decoupled case or oneway call
Object response = null;
- //TODO if outMessage need to get the response
+ // TODO if outMessage need to get the response
Message inMessage = new MessageImpl();
outMessage.getExchange().setInMessage(inMessage);
- //set the message header back to the incomeMessage
- //inMessage.put(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS,
- // outMessage.get(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS));
+ // set the message header back to the incomeMessage
+ // inMessage.put(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS,
+ // outMessage.get(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS));
/*
- Object result1;
-
- Object result = null;
-
- javax.camel.Message camelMessage1 = pooledSession.consumer().receive(timeout);
- getLogger().log(Level.FINE, "template received reply: " , camelMessage1);
-
- if (camelMessage1 != null) {
-
- base.populateIncomingContext(camelMessage1, outMessage, CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS);
- String messageType = camelMessage1 instanceof TextMessage
- ? CamelConstants.TEXT_MESSAGE_TYPE : CamelConstants.BINARY_MESSAGE_TYPE;
- result = base.unmarshal((org.apache.camel.Exchange) outMessage);
- result1 = result;
- } else {
- String error = "CamelClientTransport.receive() timed out. No message available.";
- getLogger().log(Level.SEVERE, error);
- //TODO: Review what exception should we throw.
- throw new CamelException(error);
-
- }
- response = result1;
-
- //set the message header back to the incomeMessage
- inMessage.put(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS,
- outMessage.get(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS));
-
- */
+ * Object result1; Object result = null; javax.camel.Message
+ * camelMessage1 = pooledSession.consumer().receive(timeout);
+ * getLogger().log(Level.FINE, "template received reply: " ,
+ * camelMessage1); if (camelMessage1 != null) {
+ * base.populateIncomingContext(camelMessage1, outMessage,
+ * CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS); String messageType =
+ * camelMessage1 instanceof TextMessage ?
+ * CamelConstants.TEXT_MESSAGE_TYPE :
+ * CamelConstants.BINARY_MESSAGE_TYPE; result =
+ * base.unmarshal((org.apache.camel.Exchange) outMessage); result1 =
+ * result; } else { String error = "CamelClientTransport.receive()
+ * timed out. No message available."; getLogger().log(Level.SEVERE,
+ * error); //TODO: Review what exception should we throw. throw new
+ * CamelException(error); } response = result1; //set the message
+ * header back to the incomeMessage
+ * inMessage.put(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS,
+ * outMessage.get(CamelConstants.CAMEL_CLIENT_RESPONSE_HEADERS));
+ */
getLogger().log(Level.FINE, "The Response Message is : [" + response + "]");
// setup the inMessage response stream
byte[] bytes = null;
if (response instanceof String) {
- String requestString = (String) response;
+ String requestString = (String)response;
bytes = requestString.getBytes();
- }
- else {
- bytes = (byte[]) response;
+ } else {
+ bytes = (byte[])response;
}
inMessage.setContent(InputStream.class, new ByteArrayInputStream(bytes));
getLogger().log(Level.FINE, "incoming observer is " + incomingObserver);
@@ -260,8 +240,7 @@
protected MessageObserver decoupledMessageObserver;
private EndpointReferenceType address;
- DecoupledDestination(EndpointReferenceType ref,
- MessageObserver incomingObserver) {
+ DecoupledDestination(EndpointReferenceType ref, MessageObserver incomingObserver) {
address = ref;
decoupledMessageObserver = incomingObserver;
}
@@ -270,10 +249,7 @@
return address;
}
- public Conduit getBackChannel(Message inMessage,
- Message partialResponse,
- EndpointReferenceType addr)
- throws IOException {
+ public Conduit getBackChannel(Message inMessage, Message partialResponse, EndpointReferenceType addr) throws IOException {
// shouldn't be called on decoupled endpoint
return null;
}
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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/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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,6 +16,13 @@
*/
package org.apache.camel.component.cxf.transport;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -37,13 +43,6 @@
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
/**
* @version $Revision$
*/
@@ -56,9 +55,7 @@
private CamelTransportBase base;
private Endpoint endpoint;
- public CamelDestination(CamelContext camelContext, Bus bus,
- ConduitInitiator ci,
- EndpointInfo info) throws IOException {
+ public CamelDestination(CamelContext camelContext, Bus bus, ConduitInitiator ci, EndpointInfo info) throws IOException {
super(getTargetReference(info, bus), info);
this.camelContext = camelContext;
@@ -78,8 +75,7 @@
* @return the inbuilt backchannel
*/
protected Conduit getInbuiltBackChannel(Message inMessage) {
- return new BackChannelConduit(EndpointReferenceUtils.getAnonymousEndpointReference(),
- inMessage);
+ return new BackChannelConduit(EndpointReferenceUtils.getAnonymousEndpointReference(), inMessage);
}
public void activate() {
@@ -88,8 +84,7 @@
try {
getLogger().log(Level.FINE, "establishing Camel connection");
endpoint = camelContext.getEndpoint(camelUri);
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
getLogger().log(Level.SEVERE, "Camel connect failed with EException : ", ex);
}
}
@@ -112,12 +107,13 @@
MessageImpl inMessage = new MessageImpl();
inMessage.setContent(InputStream.class, new ByteArrayInputStream(bytes));
base.populateIncomingContext(exchange, inMessage, CamelConstants.CAMEL_SERVER_REQUEST_HEADERS);
- //inMessage.put(CamelConstants.CAMEL_SERVER_RESPONSE_HEADERS, new CamelMessageHeadersType());
+ // inMessage.put(CamelConstants.CAMEL_SERVER_RESPONSE_HEADERS, new
+ // CamelMessageHeadersType());
inMessage.put(CamelConstants.CAMEL_REQUEST_MESSAGE, exchange);
inMessage.setDestination(this);
- //handle the incoming message
+ // handle the incoming message
incomingObserver.onMessage(inMessage);
}
@@ -126,21 +122,23 @@
}
private void initConfig() {
-/*
- this.runtimePolicy = endpointInfo.getTraversedExtensor(new ServerBehaviorPolicyType(),
- ServerBehaviorPolicyType.class);
- this.serverConfig = endpointInfo.getTraversedExtensor(new ServerConfig(), ServerConfig.class);
- this.address = endpointInfo.getTraversedExtensor(new AddressType(), AddressType.class);
- this.sessionPool = endpointInfo.getTraversedExtensor(new SessionPoolType(), SessionPoolType.class);
-*/
+ /*
+ * this.runtimePolicy = endpointInfo.getTraversedExtensor(new
+ * ServerBehaviorPolicyType(), ServerBehaviorPolicyType.class);
+ * this.serverConfig = endpointInfo.getTraversedExtensor(new
+ * ServerConfig(), ServerConfig.class); this.address =
+ * endpointInfo.getTraversedExtensor(new AddressType(),
+ * AddressType.class); this.sessionPool =
+ * endpointInfo.getTraversedExtensor(new SessionPoolType(),
+ * SessionPoolType.class);
+ */
}
protected class ConsumerProcessor implements Processor {
public void process(Exchange exchange) {
try {
incoming(exchange);
- }
- catch (Throwable ex) {
+ } catch (Throwable ex) {
getLogger().log(Level.WARNING, "Failed to process incoming message : ", ex);
}
}
@@ -157,7 +155,7 @@
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
*/
public void setMessageObserver(MessageObserver observer) {
@@ -167,15 +165,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 {
// setup the message to be send back
- message.put(CamelConstants.CAMEL_REQUEST_MESSAGE,
- inMessage.get(CamelConstants.CAMEL_REQUEST_MESSAGE));
- message.setContent(OutputStream.class,
- new CamelOutputStream(inMessage));
+ message.put(CamelConstants.CAMEL_REQUEST_MESSAGE, inMessage.get(CamelConstants.CAMEL_REQUEST_MESSAGE));
+ message.setContent(OutputStream.class, new CamelOutputStream(inMessage));
}
protected Logger getLogger() {
@@ -198,7 +194,7 @@
// prepair the message and get the send out message
private void commitOutputMessage() throws IOException {
- //setup the reply message
+ // setup the reply message
final String replyToUri = getReplyToDestination(inMessage);
base.template.send(replyToUri, new Processor() {
@@ -232,9 +228,8 @@
protected String getReplyToDestination(Message inMessage) {
if (inMessage.get(CamelConstants.CAMEL_REBASED_REPLY_TO) != null) {
- return (String) inMessage.get(CamelConstants.CAMEL_REBASED_REPLY_TO);
- }
- else {
+ return (String)inMessage.get(CamelConstants.CAMEL_REBASED_REPLY_TO);
+ } else {
return base.getReplyDestination();
}
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -18,8 +17,8 @@
package org.apache.camel.component.cxf.transport;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
import org.apache.camel.CamelTemplate;
+import org.apache.camel.Exchange;
import org.apache.cxf.Bus;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
@@ -29,11 +28,11 @@
* @version $Revision$
*/
public class CamelTransportBase {
- private String replyDestination;
CamelTemplate<Exchange> template;
- private final CamelContext camelContext;
Bus bus;
EndpointInfo endpointInfo;
+ private String replyDestination;
+ private final CamelContext camelContext;
public CamelTransportBase(CamelContext camelContext, Bus bus, EndpointInfo endpointInfo, boolean b, String baseBeanNameSuffix) {
this.camelContext = camelContext;
@@ -58,8 +57,7 @@
if (template != null) {
try {
template.stop();
- }
- catch (Exception e) {
+ } catch (Exception e) {
// do nothing?
// TODO
}
@@ -68,10 +66,10 @@
/**
* Populates a Camel exchange with a payload
- *
- * @param payload the message payload, expected to be either of type
- * String or byte[] depending on payload type
- * @param replyTo the ReplyTo destination if any
+ *
+ * @param payload the message payload, expected to be either of type String
+ * or byte[] depending on payload type
+ * @param replyTo the ReplyTo destination if any
* @param exchange the underlying exchange to marshal to
*/
protected void marshal(Object payload, String replyTo, Exchange exchange) {
@@ -90,94 +88,50 @@
}
/*
- protected CamelMessageHeadersType populateIncomingContext(javax.camel.Message message,
- org.apache.cxf.message.Message inMessage,
- String headerType) throws CamelException {
- CamelMessageHeadersType headers = null;
-
- headers = (CamelMessageHeadersType)inMessage.get(headerType);
-
- if (headers == null) {
- headers = new CamelMessageHeadersType();
- inMessage.put(headerType, headers);
- }
-
- headers.setCamelCorrelationID(message.getCamelCorrelationID());
- headers.setCamelDeliveryMode(new Integer(message.getCamelDeliveryMode()));
- headers.setCamelExpiration(new Long(message.getCamelExpiration()));
- headers.setCamelMessageID(message.getCamelMessageID());
- headers.setCamelPriority(new Integer(message.getCamelPriority()));
- headers.setCamelRedelivered(Boolean.valueOf(message.getCamelRedelivered()));
- headers.setCamelTimeStamp(new Long(message.getCamelTimestamp()));
- headers.setCamelType(message.getCamelType());
-
- List<CamelPropertyType> props = headers.getProperty();
- Enumeration enm = message.getPropertyNames();
- while (enm.hasMoreElements()) {
- String name = (String)enm.nextElement();
- String val = message.getStringProperty(name);
- CamelPropertyType prop = new CamelPropertyType();
- prop.setName(name);
- prop.setValue(val);
- props.add(prop);
- }
-
- return headers;
- }
-
- protected int getCamelDeliveryMode(CamelMessageHeadersType headers) {
- int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
-
- if (headers != null && headers.isSetCamelDeliveryMode()) {
- deliveryMode = headers.getCamelDeliveryMode();
- }
- return deliveryMode;
- }
-
- protected int getCamelPriority(CamelMessageHeadersType headers) {
- int priority = Message.DEFAULT_PRIORITY;
- if (headers != null && headers.isSetCamelPriority()) {
- priority = headers.getCamelPriority();
- }
- return priority;
- }
-
- protected long getTimeToLive(CamelMessageHeadersType headers) {
- long ttl = -1;
- if (headers != null && headers.isSetTimeToLive()) {
- ttl = headers.getTimeToLive();
- }
- return ttl;
- }
-
- protected String getCorrelationId(CamelMessageHeadersType headers) {
- String correlationId = null;
- if (headers != null
- && headers.isSetCamelCorrelationID()) {
- correlationId = headers.getCamelCorrelationID();
- }
- return correlationId;
- }
-
-
- protected String getAddrUriFromCamelAddrPolicy() {
- AddressType camelAddressPolicy = transport.getCamelAddress();
- return "camel:" + camelAddressPolicy.getJndiConnectionFactoryName()
- + "#"
- + camelAddressPolicy.getJndiDestinationName();
- }
-
- protected String getReplyTotAddrUriFromCamelAddrPolicy() {
- AddressType camelAddressPolicy = transport.getCamelAddress();
- return "camel:"
- + camelAddressPolicy.getJndiConnectionFactoryName()
- + "#"
- + camelAddressPolicy.getJndiReplyDestinationName();
- }
-
- protected boolean isDestinationStyleQueue() {
- return CamelConstants.CAMEL_QUEUE.equals(
- transport.getCamelAddress().getDestinationStyle().value());
- }
- */
+ * protected CamelMessageHeadersType
+ * populateIncomingContext(javax.camel.Message message,
+ * org.apache.cxf.message.Message inMessage, String headerType) throws
+ * CamelException { CamelMessageHeadersType headers = null; headers =
+ * (CamelMessageHeadersType)inMessage.get(headerType); if (headers == null) {
+ * headers = new CamelMessageHeadersType(); inMessage.put(headerType,
+ * headers); }
+ * headers.setCamelCorrelationID(message.getCamelCorrelationID());
+ * headers.setCamelDeliveryMode(new
+ * Integer(message.getCamelDeliveryMode())); headers.setCamelExpiration(new
+ * Long(message.getCamelExpiration()));
+ * headers.setCamelMessageID(message.getCamelMessageID());
+ * headers.setCamelPriority(new Integer(message.getCamelPriority()));
+ * headers.setCamelRedelivered(Boolean.valueOf(message.getCamelRedelivered()));
+ * headers.setCamelTimeStamp(new Long(message.getCamelTimestamp()));
+ * headers.setCamelType(message.getCamelType()); List<CamelPropertyType>
+ * props = headers.getProperty(); Enumeration enm =
+ * message.getPropertyNames(); while (enm.hasMoreElements()) { String name =
+ * (String)enm.nextElement(); String val = message.getStringProperty(name);
+ * CamelPropertyType prop = new CamelPropertyType(); prop.setName(name);
+ * prop.setValue(val); props.add(prop); } return headers; } protected int
+ * getCamelDeliveryMode(CamelMessageHeadersType headers) { int deliveryMode =
+ * Message.DEFAULT_DELIVERY_MODE; if (headers != null &&
+ * headers.isSetCamelDeliveryMode()) { deliveryMode =
+ * headers.getCamelDeliveryMode(); } return deliveryMode; } protected int
+ * getCamelPriority(CamelMessageHeadersType headers) { int priority =
+ * Message.DEFAULT_PRIORITY; if (headers != null &&
+ * headers.isSetCamelPriority()) { priority = headers.getCamelPriority(); }
+ * return priority; } protected long getTimeToLive(CamelMessageHeadersType
+ * headers) { long ttl = -1; if (headers != null &&
+ * headers.isSetTimeToLive()) { ttl = headers.getTimeToLive(); } return ttl; }
+ * protected String getCorrelationId(CamelMessageHeadersType headers) {
+ * String correlationId = null; if (headers != null &&
+ * headers.isSetCamelCorrelationID()) { correlationId =
+ * headers.getCamelCorrelationID(); } return correlationId; } protected
+ * String getAddrUriFromCamelAddrPolicy() { AddressType camelAddressPolicy =
+ * transport.getCamelAddress(); return "camel:" +
+ * camelAddressPolicy.getJndiConnectionFactoryName() + "#" +
+ * camelAddressPolicy.getJndiDestinationName(); } protected String
+ * getReplyTotAddrUriFromCamelAddrPolicy() { AddressType camelAddressPolicy =
+ * transport.getCamelAddress(); return "camel:" +
+ * camelAddressPolicy.getJndiConnectionFactoryName() + "#" +
+ * camelAddressPolicy.getJndiReplyDestinationName(); } protected boolean
+ * isDestinationStyleQueue() { return CamelConstants.CAMEL_QUEUE.equals(
+ * transport.getCamelAddress().getDestinationStyle().value()); }
+ */
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,6 +16,12 @@
*/
package org.apache.camel.component.cxf.transport;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
import org.apache.camel.CamelContext;
import org.apache.cxf.Bus;
import org.apache.cxf.configuration.Configurer;
@@ -27,11 +32,6 @@
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
/**
* @version $Revision$
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,31 +16,32 @@
*/
package org.apache.camel.component.cxf;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.camel.CamelContext;
-import org.apache.camel.Processor;
import org.apache.camel.CamelTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.bus.CXFBusFactory;
-
-import java.util.List;
-import java.util.ArrayList;
/**
* @version $Revision$
*/
public class CxfInvokeTest extends TestCase {
- private static final transient Log log = LogFactory.getLog(CxfInvokeTest.class);
+ private static final transient Log LOG = LogFactory.getLog(CxfInvokeTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected CamelTemplate<CxfExchange> template = new CamelTemplate<CxfExchange>(camelContext);
- final private String transportAddress = "http://localhost:28080/test";
- final private String testMessage = "Hello World!";
+ private final String transportAddress = "http://localhost:28080/test";
+ private final String testMessage = "Hello World!";
private ServerImpl server;
@Override
@@ -67,26 +67,23 @@
public void testInvokeOfServer() throws Exception {
- CxfExchange exchange =
- template.send(getUri(),
- new Processor() {
- public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
- params.add(testMessage);
- exchange.getIn().setBody(params);
- }
- });
+ CxfExchange exchange = template.send(getUri(), new Processor() {
+ public void process(final Exchange exchange) {
+ final List<String> params = new ArrayList<String>();
+ params.add(testMessage);
+ exchange.getIn().setBody(params);
+ }
+ });
org.apache.camel.Message out = exchange.getOut();
Object[] output = (Object[])out.getBody();
- log.info("Received output text: " + output[0]);
+ LOG.info("Received output text: " + output[0]);
assertEquals("reply body on Camel", testMessage, output[0]);
}
private String getUri() {
- return "cxf-invoke:" + transportAddress
- + "?sei=org.apache.camel.component.cxf.HelloService&method=echo";
+ return "cxf-invoke:" + transportAddress + "?sei=org.apache.camel.component.cxf.HelloService&method=echo";
}
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java Tue Aug 7 14:33:00 2007
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,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,
@@ -17,35 +16,37 @@
*/
package org.apache.camel.component.cxf;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.CamelTemplate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.bus.CXFBusFactory;
-
-import java.util.*;
+import org.apache.cxf.endpoint.ServerImpl;
+import org.apache.cxf.frontend.ServerFactoryBean;
/**
* @version $Revision$
*/
public class CxfTest extends TestCase {
- private static final transient Log log = LogFactory.getLog(CxfTest.class);
+ private static final transient Log LOG = LogFactory.getLog(CxfTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected CamelTemplate<CxfExchange> template = new CamelTemplate<CxfExchange>(camelContext);
- final private String transportAddress = "http://localhost:28080/test";
- final private String testMessage = "Hello World!";
+ private final String transportAddress = "http://localhost:28080/test";
+ private final String testMessage = "Hello World!";
private ServerImpl server;
-
+
@Override
protected void setUp() throws Exception {
-
+
// start a service
ServerFactoryBean svrBean = new ServerFactoryBean();
@@ -56,36 +57,33 @@
server = (ServerImpl)svrBean.create();
server.start();
}
-
+
@Override
protected void tearDown() throws Exception {
if (server != null) {
server.stop();
}
}
-
+
public void testInvokeOfServer() throws Exception {
- CxfExchange exchange = (CxfExchange)
- template.send(getUri(),
- new Processor() {
- public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
- params.add(testMessage);
- exchange.getIn().setBody(params);
- }
- });
+ CxfExchange exchange = (CxfExchange)template.send(getUri(), new Processor() {
+ public void process(final Exchange exchange) {
+ final List<String> params = new ArrayList<String>();
+ params.add(testMessage);
+ exchange.getIn().setBody(params);
+ }
+ });
org.apache.camel.Message out = exchange.getOut();
Object[] output = (Object[])out.getBody();
- log.info("Received output text: " + output[0]);
-
+ LOG.info("Received output text: " + output[0]);
+
assertEquals("reply body on Camel", testMessage, output[0]);
}
private String getUri() {
- return "cxf:" + transportAddress
- + "?sei=org.apache.camel.component.cxf.HelloService&method=echo";
+ return "cxf:" + transportAddress + "?sei=org.apache.camel.component.cxf.HelloService&method=echo";
}
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloService.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloService.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloService.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloService.java Tue Aug 7 14:33:00 2007
@@ -1,21 +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;
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?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- 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 Tue Aug 7 14:33:00 2007
@@ -1,21 +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;
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java?view=diff&rev=563665&r1=563664&r2=563665
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java Tue Aug 7 14:33:00 2007
@@ -1,72 +1,60 @@
/**
- * 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;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+
public class CamelConduitTest extends CamelTestSupport {
- public void DISABLED_testGetConfiguration() throws Exception {
+ public void xtestGetConfiguration() throws Exception {
// setup the new bus to get the configuration file
SpringBusFactory bf = new SpringBusFactory();
BusFactory.setDefaultBus(null);
bus = bf.createBus("/wsdl/camel_test_config.xml");
BusFactory.setDefaultBus(bus);
- setupServiceInfo("http://cxf.apache.org/camel_conf_test",
- "/wsdl/camel_test_no_addr.wsdl",
- "HelloWorldQueueBinMsgService",
- "HelloWorldQueueBinMsgPort");
+ setupServiceInfo("http://cxf.apache.org/camel_conf_test", "/wsdl/camel_test_no_addr.wsdl", "HelloWorldQueueBinMsgService", "HelloWorldQueueBinMsgPort");
CamelConduit conduit = setupCamelConduit(false, false);
/*
- assertEquals("Can't get the right ClientReceiveTimeout",
- 500L,
- conduit.getClientConfig().getClientReceiveTimeout());
- assertEquals("Can't get the right SessionPoolConfig's LowWaterMark",
- 10,
- conduit.getSessionPool().getLowWaterMark());
- assertEquals("Can't get the right AddressPolicy's ConnectionPassword",
- "testPassword",
- conduit.getCamelAddress().getConnectionPassword());
- */
+ * assertEquals("Can't get the right ClientReceiveTimeout", 500L,
+ * conduit.getClientConfig().getClientReceiveTimeout());
+ * assertEquals("Can't get the right SessionPoolConfig's LowWaterMark",
+ * 10, conduit.getSessionPool().getLowWaterMark()); assertEquals("Can't
+ * get the right AddressPolicy's ConnectionPassword", "testPassword",
+ * conduit.getCamelAddress().getConnectionPassword());
+ */
bus.shutdown(false);
BusFactory.setDefaultBus(null);
}
public void testPrepareSend() throws Exception {
- setupServiceInfo("http://cxf.apache.org/hello_world_camel",
- "/wsdl/camel_test.wsdl",
- "HelloWorldService",
- "HelloWorldPort");
+ setupServiceInfo("http://cxf.apache.org/hello_world_camel", "/wsdl/camel_test.wsdl", "HelloWorldService", "HelloWorldPort");
CamelConduit conduit = setupCamelConduit(false, false);
Message message = new MessageImpl();
try {
conduit.prepare(message);
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
ex.printStackTrace();
}
verifySentMessage(false, message);
@@ -78,10 +66,7 @@
}
public void testSendOut() throws Exception {
- setupServiceInfo("http://cxf.apache.org/hello_world_camel",
- "/wsdl/camel_test.wsdl",
- "HelloWorldServiceLoop",
- "HelloWorldPortLoop");
+ setupServiceInfo("http://cxf.apache.org/hello_world_camel", "/wsdl/camel_test.wsdl", "HelloWorldServiceLoop", "HelloWorldPortLoop");
CamelConduit conduit = setupCamelConduit(true, false);
Message message = new MessageImpl();
@@ -91,24 +76,22 @@
}
public void verifyReceivedMessage(Message message) {
- ByteArrayInputStream bis =
- (ByteArrayInputStream) inMessage.getContent(InputStream.class);
+ ByteArrayInputStream bis = (ByteArrayInputStream)inMessage.getContent(InputStream.class);
byte bytes[] = new byte[bis.available()];
try {
bis.read(bytes);
- }
- catch (IOException ex) {
+ } catch (IOException ex) {
ex.printStackTrace();
}
String reponse = new String(bytes);
assertEquals("The reponse date should be equals", reponse, "HelloWorld");
-/*
- CamelMessageHeadersType inHeader =
- (CamelMessageHeadersType)inMessage.get(CamelConstants.Camel_CLIENT_RESPONSE_HEADERS);
-
- assertTrue("The inMessage Camel Header should not be null", inHeader != null);
-*/
+ /*
+ * CamelMessageHeadersType inHeader =
+ * (CamelMessageHeadersType)inMessage.get(CamelConstants.Camel_CLIENT_RESPONSE_HEADERS);
+ * assertTrue("The inMessage Camel Header should not be null", inHeader !=
+ * null);
+ */
}
}