Author: gnodet
Date: Wed Feb 22 02:27:56 2006
New Revision: 379740
URL: http://svn.apache.org/viewcvs?rev=379740&view=rev
Log:
SM-320: upgrade to xfire svn head
Modified:
incubator/servicemix/trunk/etc/project.properties
incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml
incubator/servicemix/trunk/servicemix-assembly/project.xml
incubator/servicemix/trunk/servicemix-bpe/project.xml
incubator/servicemix/trunk/servicemix-components/project.xml
incubator/servicemix/trunk/servicemix-http/project.xml
incubator/servicemix/trunk/servicemix-jsr181/project.xml
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
Modified: incubator/servicemix/trunk/etc/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.properties?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Wed Feb 22 02:27:56 2006
@@ -279,8 +279,8 @@
# http://www.xbean.org/, ASL 2
xbean_version=2.2
# http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD
-xfire_version=1.0-20060106
-xfire_jaxws_version=1.0-20060106
+xfire_version=1.0-20060222
+#xfire_jaxws_version=1.0-20060106
# from ws-commons ?
xfire_xmlschema_version=20051110
# ?
Modified: incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml Wed Feb
22 02:27:56 2006
@@ -191,7 +191,7 @@
<version>${jencks_version}</version>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>${xfire_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Wed Feb 22
02:27:56 2006
@@ -652,7 +652,7 @@
</properties>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>${xfire_version}</version>
<properties>
Modified: incubator/servicemix/trunk/servicemix-bpe/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/project.xml Wed Feb 22 02:27:56
2006
@@ -262,7 +262,7 @@
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Wed Feb 22
02:27:56 2006
@@ -447,7 +447,7 @@
<!-- for XFire component -->
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>${xfire_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-http/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/project.xml Wed Feb 22 02:27:56
2006
@@ -120,7 +120,7 @@
</properties>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>${xfire_version}</version>
<properties>
Modified: incubator/servicemix/trunk/servicemix-jsr181/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Wed Feb 22
02:27:56 2006
@@ -81,17 +81,9 @@
</properties>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>${xfire_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>xfire-jaxws</artifactId>
- <version>${xfire_jaxws_version}</version>
<properties>
<jbi.bundle>true</jbi.bundle>
</properties>
Modified:
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
URL:
http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java?rev=379740&r1=379739&r2=379740&view=diff
==============================================================================
---
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
(original)
+++
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
Wed Feb 22 02:27:56 2006
@@ -27,13 +27,12 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
import org.codehaus.xfire.MessageContext;
import org.codehaus.xfire.XFireException;
@@ -44,7 +43,6 @@
import org.codehaus.xfire.soap.AbstractSoapBinding;
import org.codehaus.xfire.transport.AbstractChannel;
import org.codehaus.xfire.transport.Channel;
-import org.codehaus.xfire.util.STAXUtils;
/**
* Jbi channel, only support local invocations.
@@ -56,11 +54,13 @@
public static final String JBI_ENDPOINT = "jbi.endpoint";
private StAXSourceTransformer sourceTransformer;
+ private XMLOutputFactory outputFactory;
public JbiChannel(String uri, JbiTransport transport) {
setTransport(transport);
setUri(uri);
this.sourceTransformer = new StAXSourceTransformer();
+ this.outputFactory = XMLOutputFactory.newInstance();
}
public void open() throws Exception {
@@ -70,9 +70,9 @@
if (message.getUri().equals(Channel.BACKCHANNEL_URI)) {
final OutputStream out = (OutputStream)
context.getProperty(Channel.BACKCHANNEL_URI);
if (out != null) {
- final XMLStreamWriter writer =
STAXUtils.createXMLStreamWriter(out, message.getEncoding());
- message.getSerializer().writeMessage(message, writer, context);
try {
+ final XMLStreamWriter writer =
outputFactory.createXMLStreamWriter(out, message.getEncoding());
+ message.getSerializer().writeMessage(message, writer,
context);
writer.close();
} catch (XMLStreamException e) {
throw new XFireException("Error closing output stream", e);
@@ -128,7 +128,7 @@
protected Source getContent(MessageContext context, OutMessage message)
throws XMLStreamException, IOException, XFireException {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
- XMLStreamWriter writer = STAXUtils.createXMLStreamWriter(outStream,
message.getEncoding());
+ XMLStreamWriter writer =
outputFactory.createXMLStreamWriter(outStream, message.getEncoding());
MessageSerializer serializer = context.getOutMessage().getSerializer();
if (serializer == null)
{
