You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/05/18 09:11:30 UTC
svn commit: r407481 - in /incubator/servicemix/trunk: ./
servicemix-components/src/main/java/org/apache/servicemix/components/http/
servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/
Author: gnodet
Date: Thu May 18 00:11:30 2006
New Revision: 407481
URL: http://svn.apache.org/viewvc?rev=407481&view=rev
Log:
Upgrade to xfire 1.1
Modified:
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181ExchangeProcessor.java
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=407481&r1=407480&r2=407481&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Thu May 18 00:11:30 2006
@@ -1394,7 +1394,7 @@
<dependency>
<groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -1441,7 +1441,7 @@
<dependency>
<groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-jaxb</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<exclusions>
<exclusion>
<groupId>xfire</groupId>
@@ -1476,7 +1476,7 @@
<dependency>
<groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-jaxb2</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<exclusions>
<exclusion>
<groupId>httpunit</groupId>
@@ -1531,7 +1531,7 @@
<dependency>
<groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-xmlbeans</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java?rev=407481&r1=407480&r2=407481&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapInOutBinding.java Thu May 18 00:11:30 2006
@@ -46,7 +46,7 @@
import org.codehaus.xfire.attachments.Attachments;
import org.codehaus.xfire.fault.XFireFault;
import org.codehaus.xfire.service.Service;
-import org.codehaus.xfire.service.binding.BeanInvoker;
+import org.codehaus.xfire.service.invoker.BeanInvoker;
import org.codehaus.xfire.service.binding.ObjectServiceFactory;
import org.codehaus.xfire.soap.SoapConstants;
import org.codehaus.xfire.soap.handler.ReadHeadersHandler;
@@ -133,8 +133,6 @@
}
if (exchange.getStatus() == ExchangeStatus.ERROR) {
Exception e = exchange.getError();
- exchange.setStatus(ExchangeStatus.DONE);
- channel.send(exchange);
if (e == null) {
throw new XFireFault("Received error", XFireFault.SENDER);
} else {
@@ -188,7 +186,7 @@
// Set the source
inMessage.setContent(new DOMSource(element));
// Retrieve attachments
- Attachments attachments = (Attachments) ctx.getProperty(Attachments.ATTACHMENTS_KEY);
+ Attachments attachments = (Attachments) ctx.getInMessage().getAttachments();
if (attachments != null) {
for (Iterator it = attachments.getParts(); it.hasNext();) {
Attachment part = (Attachment) it.next();
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java?rev=407481&r1=407480&r2=407481&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java Thu May 18 00:11:30 2006
@@ -50,7 +50,7 @@
import org.codehaus.xfire.annotations.commons.CommonsWebAttributes;
import org.codehaus.xfire.annotations.jsr181.Jsr181WebAnnotations;
import org.codehaus.xfire.service.Service;
-import org.codehaus.xfire.service.binding.BeanInvoker;
+import org.codehaus.xfire.service.invoker.BeanInvoker;
import org.codehaus.xfire.service.binding.ObjectServiceFactory;
import org.codehaus.xfire.soap.SoapConstants;
import org.codehaus.xfire.transport.TransportManager;
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181ExchangeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181ExchangeProcessor.java?rev=407481&r1=407480&r2=407481&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181ExchangeProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181ExchangeProcessor.java Thu May 18 00:11:30 2006
@@ -73,6 +73,7 @@
ctx.setExchange(new org.codehaus.xfire.exchange.MessageExchange(ctx));
InMessage msg = new InMessage();
ctx.getExchange().setInMessage(msg);
+ ctx.setCurrentMessage(msg);
NormalizedMessage in = exchange.getMessage("in");
msg.setXMLStreamReader(getXMLStreamReader(in.getContent()));
c.receive(ctx, msg);