You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/04/16 10:22:35 UTC
svn commit: r529163 - in /activemq/camel/trunk: ./ camel-cxf/
camel-cxf/src/main/java/org/apache/camel/component/cxf/
camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/
camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/
Author: jstrachan
Date: Mon Apr 16 01:22:32 2007
New Revision: 529163
URL: http://svn.apache.org/viewvc?view=rev&rev=529163
Log:
updates for the CXF plugin to keep it up to date with the latest/greatest CXF code
Modified:
activemq/camel/trunk/camel-cxf/pom.xml
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTestSupport.java
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/pom.xml?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/camel-cxf/pom.xml Mon Apr 16 01:22:32 2007
@@ -51,27 +51,29 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<version>${cxf.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${cxf.version}</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
@@ -87,38 +89,20 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!--
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>junit</groupId>
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Mon Apr 16 01:22:32 2007
@@ -59,7 +59,7 @@
m.put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE);
m.setDestination(destination);
synchronized (conduit) {
- conduit.send(m);
+ conduit.prepare(m);
// now lets wait for the response
if (endpoint.isInOut()) {
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Mon Apr 16 01:22:32 2007
@@ -71,7 +71,7 @@
}
// prepare the message for send out , not actually send out the message
- public void send(Message message) throws IOException {
+ public void prepare(Message message) throws IOException {
getLogger().log(Level.FINE, "CamelConduit send message");
message.setContent(OutputStream.class,
@@ -290,4 +290,5 @@
return decoupledMessageObserver;
}
}
+
}
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Mon Apr 16 01:22:32 2007
@@ -170,7 +170,7 @@
*
* @param message the message to be sent.
*/
- public void send(Message message) throws IOException {
+ 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));
@@ -181,6 +181,7 @@
protected Logger getLogger() {
return LOG;
}
+
}
private class CamelOutputStream extends AbstractCachedOutputStream {
Modified: activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java (original)
+++ activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java Mon Apr 16 01:22:32 2007
@@ -64,7 +64,7 @@
CamelConduit conduit = setupCamelConduit(false, false);
Message message = new MessageImpl();
try {
- conduit.send(message);
+ conduit.prepare(message);
}
catch (Exception ex) {
ex.printStackTrace();
Modified: activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTestSupport.java?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTestSupport.java (original)
+++ activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTestSupport.java Mon Apr 16 01:22:32 2007
@@ -28,6 +28,7 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -38,6 +39,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
+import java.util.List;
public abstract class CamelTestSupport extends TestCase {
protected CamelContext camelContext = new DefaultCamelContext();
@@ -69,7 +71,13 @@
WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName));
Service service = factory.create();
- endpointInfo = service.getServiceInfo().getEndpoint(new QName(ns, portName));
+ List<ServiceInfo> list = service.getServiceInfos();
+ for (ServiceInfo serviceInfo : list) {
+ endpointInfo = serviceInfo.getEndpoint(new QName(ns, portName));
+ if (endpointInfo != null) {
+ break;
+ }
+ }
}
protected void sendoutMessage(Conduit conduit, Message message, Boolean isOneWay) throws IOException {
@@ -79,7 +87,7 @@
message.setExchange(exchange);
exchange.setInMessage(message);
try {
- conduit.send(message);
+ conduit.prepare(message);
}
catch (IOException ex) {
assertFalse("CamelConduit can't perpare to send out message", false);
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=529163&r1=529162&r2=529163
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon Apr 16 01:22:32 2007
@@ -145,6 +145,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
<version>${camel-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>