Author: veithen
Date: Tue Jul 31 22:05:33 2012
New Revision: 1367798
URL: http://svn.apache.org/viewvc?rev=1367798&view=rev
Log:
Replace JaxbRIDataSource with the new JAXBOMDataSource from Axiom. This should
provide MTOM support (test cases to be added) and improve performance in
certain scenarios.
Removed:
axis/axis2/java/core/trunk/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/JaxbRIDataSource.java
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/modules/parent/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=1367798&r1=1367797&r2=1367798&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Tue Jul 31 22:05:33 2012
@@ -37,6 +37,10 @@
<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=1367798&r1=1367797&r2=1367798&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
Tue Jul 31 22:05:33 2012
@@ -66,7 +66,7 @@
org.apache.axiom.om.OMFactory factory =
org.apache.axiom.om.OMAbstractFactory.getOMFactory();
java.lang.Object object = param; <!-- This is
necessary to convert primitive types to their corresponding wrapper types (so
that we can call getClass()) -->
- org.apache.axis2.jaxbri.JaxbRIDataSource source = new
org.apache.axis2.jaxbri.JaxbRIDataSource( wsContext,
+ org.apache.axiom.om.ds.jaxb.JAXBOMDataSource source =
new org.apache.axiom.om.ds.jaxb.JAXBOMDataSource( wsContext,
new javax.xml.bind.JAXBElement(elementQName,
object.getClass(), object));
org.apache.axiom.om.OMNamespace namespace =
factory.createOMNamespace(elementQName.getNamespaceURI(), null);
return factory.createOMElement(source,
elementQName.getLocalPart(), namespace);
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1367798&r1=1367797&r2=1367798&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue Jul 31 22:05:33 2012
@@ -633,6 +633,11 @@
<version>${axiom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-jaxb</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>${xmlschema.version}</version>
