Author: dkulp
Date: Tue Jan 27 20:12:18 2009
New Revision: 738217
URL: http://svn.apache.org/viewvc?rev=738217&view=rev
Log:
Merged revisions 738210 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r738210 | dkulp | 2009-01-27 15:06:57 -0500 (Tue, 27 Jan 2009) | 2 lines
[CXF-2007] Add support for Source objects that have a XMLReader, but not
really a valid InputSource. JAXBSource objects do this.
........
Added:
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
- copied unchanged from r738210,
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 20:12:18 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Tue Jan 27 20:12:18 2009
@@ -48,6 +48,7 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -60,6 +61,9 @@
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
@@ -287,6 +291,30 @@
}
return false;
}
+ public static void copy(Source source, XMLStreamWriter writer) throws
XMLStreamException {
+ if (source instanceof SAXSource) {
+ InputSource src = ((SAXSource)source).getInputSource();
+ if (src.getByteStream() == null && src.getCharacterStream() == null
+ && src.getSystemId() == null && src.getPublicId() == null
+ && ((SAXSource)source).getXMLReader() != null) {
+ //OK - reader is OK. We'll dump that out
+ StreamWriterContentHandler ch = new
StreamWriterContentHandler(writer);
+ XMLReader reader = ((SAXSource)source).getXMLReader();
+ reader.setContentHandler(ch);
+ try {
+ reader.parse(((SAXSource)source).getInputSource());
+ return;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new XMLStreamException(e);
+ }
+ }
+ }
+
+ XMLStreamReader reader = createXMLStreamReader(source);
+ copy(reader, writer);
+ reader.close();
+ }
public static Document copy(Document doc)
throws XMLStreamException, ParserConfigurationException {
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
Tue Jan 27 20:12:18 2009
@@ -22,7 +22,6 @@
import java.util.logging.Logger;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -56,9 +55,7 @@
}
XMLStreamWriter writer = new W3CDOMStreamWriter((Element)n);
- XMLStreamReader reader = StaxUtils.createXMLStreamReader(s);
- StaxUtils.copy(reader, writer);
- reader.close();
+ StaxUtils.copy(s, writer);
} catch (XMLStreamException e) {
throw new Fault(new Message("COULD_NOT_READ_XML_STREAM", LOG), e);
}
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
Tue Jan 27 20:12:18 2009
@@ -51,17 +51,16 @@
if (obj instanceof DataSource) {
DataSource ds = (DataSource)obj;
reader = StaxUtils.createXMLStreamReader(ds.getInputStream());
+ StaxUtils.copy(reader, writer);
+ reader.close();
} else {
Source s = (Source) obj;
if (s instanceof DOMSource
&& ((DOMSource) s).getNode() == null) {
return;
}
-
- reader = StaxUtils.createXMLStreamReader(s);
+ StaxUtils.copy(s, writer);
}
- StaxUtils.copy(reader, writer);
- reader.close();
} catch (XMLStreamException e) {
throw new Fault(new Message("COULD_NOT_READ_XML_STREAM", LOG), e);
} catch (IOException e) {
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
Tue Jan 27 20:12:18 2009
@@ -20,7 +20,6 @@
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -98,8 +97,7 @@
StaxUtils.writeElement(element, writer, false);
} else {
- XMLStreamReader reader =
StaxUtils.createXMLStreamReader((Source)object);
- StaxUtils.copy(reader, writer);
+ StaxUtils.copy((Source)object, writer);
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
Tue Jan 27 20:12:18 2009
@@ -246,9 +246,7 @@
}
XMLStreamWriter writer = new W3CDOMStreamWriter((Element)n);
- XMLStreamReader reader = StaxUtils.createXMLStreamReader(source);
- StaxUtils.copy(reader, writer);
- reader.close();
+ StaxUtils.copy(source, writer);
} catch (XMLStreamException e) {
throw new Fault(e);
}
Modified:
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=738217&r1=738216&r2=738217&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
Tue Jan 27 20:12:18 2009
@@ -43,7 +43,6 @@
import javax.mail.util.ByteArrayDataSource;
import javax.xml.bind.JAXBContext;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
@@ -233,11 +232,10 @@
throw new Fault(e);
}
} else {
- XMLStreamReader reader =
StaxUtils.createXMLStreamReader((Source)o);
StringWriter stringWriter = new StringWriter();
XMLStreamWriter writer =
StaxUtils.createXMLStreamWriter(stringWriter);
try {
- StaxUtils.copy(reader, writer);
+ StaxUtils.copy((Source)o, writer);
writer.flush();
ds = new ByteArrayDataSource(stringWriter.toString(), ct);
} catch (XMLStreamException e1) {
