Author: veithen
Date: Sun Jun 12 15:31:35 2016
New Revision: 1748022
URL: http://svn.apache.org/viewvc?rev=1748022&view=rev
Log:
Use the new unmarshalling API in Axiom.
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=1748022&r1=1748021&r2=1748022&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Sun Jun 12 15:31:35 2016
@@ -37,10 +37,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-jaxb</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>${project.version}</version>
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?rev=1748022&r1=1748021&r2=1748022&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/jaxbri/src/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
Sun Jun 12 15:31:35 2016
@@ -208,11 +208,7 @@
org.apache.axiom.om.OMElement param,
java.lang.Class type) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = wsContext;
- javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
- org.apache.axiom.util.jaxb.UnmarshallerAdapter adapter =
org.apache.axiom.util.jaxb.JAXBUtils.getUnmarshallerAdapter(param.getXMLStreamReaderWithoutCaching());
-
unmarshaller.setAttachmentUnmarshaller(adapter.getAttachmentUnmarshaller());
- return unmarshaller.unmarshal(adapter.getReader(),
type).getValue();
+ return param.unmarshal(wsContext, null, type,
false).getValue();
} catch (javax.xml.bind.JAXBException bex){
throw org.apache.axis2.AxisFault.makeFault(bex);
}
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1748022&r1=1748021&r2=1748022&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Jun 12 15:31:35 2016
@@ -733,11 +733,6 @@
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-jaxb</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testutils</artifactId>
<version>${axiom.version}</version>
</dependency>
