Author: veithen
Date: Fri May 14 20:28:10 2010
New Revision: 944449
URL: http://svn.apache.org/viewvc?rev=944449&view=rev
Log:
WSCOMMONS-518: Generalized the getOMAttachmentAccessorXMLStreamReader method so
that XMLStreamReader wrappers of arbitrary type can be looked up; this also
removes the dependency on the core Axiom API and breaks cyclic package
dependencies.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java?rev=944449&r1=944448&r2=944449&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
Fri May 14 20:28:10 2010
@@ -170,7 +170,7 @@ public class JAXBAttachmentUnmarshaller
return dh;
}
XMLStreamReader attachmentAccessor =
-
XMLStreamReaderUtils.getOMAttachmentAccessorXMLStreamReader(xmlStreamReader);
+ XMLStreamReaderUtils.getWrappedXMLStreamReader(xmlStreamReader,
OMAttachmentAccessor.class);
if (attachmentAccessor != null &&
attachmentAccessor instanceof OMAttachmentAccessor) {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java?rev=944449&r1=944448&r2=944449&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
Fri May 14 20:28:10 2010
@@ -55,7 +55,7 @@ public class JAXBAttachmentUnmarshaller
}
XMLStreamReader attachmentAccessor =
-
XMLStreamReaderUtils.getOMAttachmentAccessorXMLStreamReader(xmlStreamReader);
+ XMLStreamReaderUtils.getWrappedXMLStreamReader(xmlStreamReader,
OMAttachmentAccessor.class);
if (attachmentAccessor != null &&
attachmentAccessor instanceof OMAttachmentAccessor) {
