Author: veithen
Date: Wed Oct 26 21:02:06 2011
New Revision: 1189456
URL: http://svn.apache.org/viewvc?rev=1189456&view=rev
Log:
Use the feature introduced by AXIOM-114 to take into account the namespace
declarations on the SOAP envelope and body.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -397,8 +397,7 @@
private java.lang.Object fromOM(
org.apache.axiom.om.OMElement param,
- java.lang.Class type,
- java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+ java.lang.Class type) throws org.apache.axis2.AxisFault{
try {
<xsl:for-each select="param[not(@primitive) and @type!='']">
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -460,42 +460,33 @@
<xsl:when test="$style='document' or $style='rpc'">
<xsl:choose>
<xsl:when test="$outputtype='byte'">
- return
toByte(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toByte(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='char'">
- return
toChar(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toChar(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='double'">
- return
toDouble(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toDouble(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='float'">
- return
toFloat(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toFloat(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='int'">
- return
toInt(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toInt(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='long'">
- return
toLong(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toLong(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='short'">
- return
toShort(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toShort(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:when test="$outputtype='boolean'">
- return
toBoolean(_returnEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(_returnEnv));
+ return
toBoolean(_returnEnv.getBody().getFirstElement());
</xsl:when>
<xsl:otherwise>
java.lang.Object object = fromOM(
_returnEnv.getBody().getFirstElement() ,
- <xsl:value-of
select="$outputtype"/>.class,
-
getEnvelopeNamespaces(_returnEnv));
+ <xsl:value-of
select="$outputtype"/>.class);
<xsl:choose>
<xsl:when test="$outputparamcount=1">
@@ -535,7 +526,7 @@
//message class
java.lang.String messageClassName =
(java.lang.String)faultMessageMap.get(new
org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of
select="@originalName"/>"));
java.lang.Class messageClass =
java.lang.Class.forName(messageClassName);
- java.lang.Object messageObject =
fromOM(faultElt,messageClass,null);
+ java.lang.Object messageObject =
fromOM(faultElt,messageClass);
java.lang.reflect.Method m =
exceptionClass.getMethod("setFaultMessage",
new java.lang.Class[]{messageClass});
m.invoke(ex,new java.lang.Object[]{messageObject});
@@ -741,41 +732,32 @@
org.apache.axiom.soap.SOAPEnvelope resultEnv =
resultContext.getEnvelope();
<xsl:choose>
<xsl:when test="$outputtype='byte'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toByte(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toByte(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='char'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toChar(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toChar(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='double'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toDouble(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toDouble(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='float'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toFloat(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toFloat(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='int'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toInt(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toInt(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='long'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toLong(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toLong(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='short'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toShort(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toShort(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:when test="$outputtype='boolean'">
- callback.receiveResult<xsl:value-of
select="@name"/>(toBoolean(resultEnv.getBody().getFirstElement(),
-
getEnvelopeNamespaces(resultEnv)));
+ callback.receiveResult<xsl:value-of
select="@name"/>(toBoolean(resultEnv.getBody().getFirstElement()));
</xsl:when>
<xsl:otherwise>
java.lang.Object object =
fromOM(resultEnv.getBody().getFirstElement(),
-
<xsl:value-of select="$outputtype"/>.class,
-
getEnvelopeNamespaces(resultEnv));
+
<xsl:value-of select="$outputtype"/>.class);
callback.receiveResult<xsl:value-of
select="@name"/>(<xsl:choose>
<xsl:when
test="$outputtype=''">);</xsl:when>
<xsl:when test="$outputparamcount=1">
@@ -811,7 +793,7 @@
//message class
java.lang.String messageClassName =
(java.lang.String)faultMessageMap.get(new
org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of
select="@originalName"/>"));
java.lang.Class messageClass =
java.lang.Class.forName(messageClassName);
-
java.lang.Object messageObject =
fromOM(faultElt,messageClass,null);
+
java.lang.Object messageObject =
fromOM(faultElt,messageClass);
java.lang.reflect.Method m =
exceptionClass.getMethod("setFaultMessage",
new java.lang.Class[]{messageClass});
m.invoke(ex,new java.lang.Object[]{messageObject});
@@ -1069,7 +1051,7 @@
//message class
java.lang.String messageClassName =
(java.lang.String)faultMessageMap.get(new
org.apache.axis2.client.FaultMapKey(faultElt.getQName(),"<xsl:value-of
select="@originalName"/>"));
java.lang.Class messageClass =
java.lang.Class.forName(messageClassName);
- java.lang.Object messageObject =
fromOM(faultElt,messageClass,null);
+ java.lang.Object messageObject =
fromOM(faultElt,messageClass);
java.lang.reflect.Method m =
exceptionClass.getMethod("setFaultMessage",
new java.lang.Class[]{messageClass});
m.invoke(ex,new
java.lang.Object[]{messageObject});
@@ -1122,20 +1104,6 @@
</xsl:if>
</xsl:for-each>
-
- /**
- * A utility method that copies the namepaces from the SOAPEnvelope
- */
- private java.util.Map
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
- java.util.Map returnMap = new java.util.HashMap();
- java.util.Iterator namespaceIterator =
env.getBody().getNamespacesInScope();
- while (namespaceIterator.hasNext()) {
- org.apache.axiom.om.OMNamespace ns =
(org.apache.axiom.om.OMNamespace) namespaceIterator.next();
- returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
- }
- return returnMap;
- }
-
<xsl:if test="//@policy">
////////////////////////////////////////////////////////////////////////
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -134,8 +134,7 @@
<xsl:value-of
select="$inputtype"/> wrappedParam =
(<xsl:value-of select="$inputtype"/>)fromOM(
msgContext.getEnvelope().getBody().getFirstElement(),
- <xsl:value-of
select="$inputtype"/>.class,
-
getEnvelopeNamespaces(msgContext.getEnvelope()));
+ <xsl:value-of
select="$inputtype"/>.class);
<xsl:if
test="string-length(normalize-space($returntype)) > 0"><xsl:value-of
select="$returnvariable"/> =</xsl:if>
<xsl:choose>
@@ -176,8 +175,7 @@
<xsl:value-of
select="$inputtype"/> wrappedParam =
(<xsl:value-of
select="$inputtype"/>)fromOM(
msgContext.getEnvelope().getBody().getFirstElement(),
- <xsl:value-of select="$inputtype"/>.class,
-
getEnvelopeNamespaces(msgContext.getEnvelope()));
+ <xsl:value-of select="$inputtype"/>.class);
<!-- Even when the parameters
are 1 we have to see whether we have the
wrapped parameters -->
<xsl:variable
name="isUnwrapParameters" select="input/param[@location='body' and
@type!='']/@unwrappParameters"/>
@@ -296,19 +294,6 @@
<!-- Call templates recursively-->
//<xsl:apply-templates><xsl:with-param
name="context">message-receiver</xsl:with-param></xsl:apply-templates>
- /**
- * A utility method that copies the namepaces from the SOAPEnvelope
- */
- private java.util.Map
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
- java.util.Map returnMap = new java.util.HashMap();
- java.util.Iterator namespaceIterator =
env.getBody().getNamespacesInScope();
- while (namespaceIterator.hasNext()) {
- org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace)
namespaceIterator.next();
- returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
- }
- return returnMap;
- }
-
private org.apache.axis2.AxisFault createAxisFault(java.lang.Exception
e) {
org.apache.axis2.AxisFault f;
Throwable cause = e.getCause();
@@ -383,8 +368,7 @@
<xsl:when test="$paramCount =1">
<xsl:value-of
select="input/param[@location='body' and @type!='']/@type"/> wrappedParam =
(<xsl:value-of select="input/param[@location='body' and
@type!='']/@type"/>)fromOM(
inMessage.getEnvelope().getBody().getFirstElement(),
- <xsl:value-of
select="input/param[@location='body' and @type!='']/@type"/>.class,
-
getEnvelopeNamespaces(inMessage.getEnvelope()));
+ <xsl:value-of
select="input/param[@location='body' and @type!='']/@type"/>.class);
<xsl:choose>
<xsl:when
test="($isUnwrapParameters)">
<!-- generate the
references. the getters need to be
@@ -438,23 +422,6 @@
<!-- Call templates recursively-->
//<xsl:apply-templates><xsl:with-param
name="context">message-receiver</xsl:with-param></xsl:apply-templates>
-
-
- /**
- * A utility method that copies the namepaces from the SOAPEnvelope
- */
- private java.util.Map
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
- java.util.Map returnMap = new java.util.HashMap();
- java.util.Iterator namespaceIterator =
env.getBody().getNamespacesInScope();
- while (namespaceIterator.hasNext()) {
- org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace)
namespaceIterator.next();
- returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
- }
- return returnMap;
- }
-
-
-
}//end of class
</xsl:template>
@@ -525,8 +492,7 @@
<xsl:value-of
select="$inputtype"/> wrappedParam =
(<xsl:value-of
select="$inputtype"/>)fromOM(
msgContext.getEnvelope().getBody().getFirstElement(),
- <xsl:value-of
select="$inputtype"/>.class,
-
getEnvelopeNamespaces(msgContext.getEnvelope()));
+ <xsl:value-of
select="$inputtype"/>.class);
<!-- Even when the parameters are
1 we have to see whether we have the
wrapped parameters -->
<xsl:variable
name="inputComplexType" select="count(input/param[@location='body' and
@type!='']/param)"/>
@@ -553,8 +519,7 @@
<xsl:value-of
select="$inputtype"/> wrappedParam =
(<xsl:value-of
select="$inputtype"/>)fromOM(
msgContext.getEnvelope().getBody().getFirstElement(),
- <xsl:value-of
select="$inputtype"/>.class,
-
getEnvelopeNamespaces(msgContext.getEnvelope()));
+ <xsl:value-of
select="$inputtype"/>.class);
<!-- Even when the parameters are
1 we have to see whether we have the
wrapped parameters -->
<xsl:variable
name="isUnwrapParameters" select="input/param[@location='body' and
@type!='']/@unwrappParameters"/>
@@ -622,19 +587,6 @@
<!-- Call templates recursively-->
//<xsl:apply-templates><xsl:with-param
name="context">message-receiver</xsl:with-param></xsl:apply-templates>
- /**
- * A utility method that copies the namepaces from the SOAPEnvelope
- */
- private java.util.Map
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
- java.util.Map returnMap = new java.util.HashMap();
- java.util.Iterator namespaceIterator =
env.getBody().getNamespacesInScope();
- while (namespaceIterator.hasNext()) {
- org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace)
namespaceIterator.next();
- returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
- }
- return returnMap;
- }
-
private org.apache.axis2.AxisFault createAxisFault(java.lang.Exception
e) {
org.apache.axis2.AxisFault f;
Throwable cause = e.getCause();
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -26,8 +26,7 @@
<xsl:template match="databinders[@dbtype='none']">
private org.apache.axiom.om.OMElement fromOM(
org.apache.axiom.om.OMElement param,
- java.lang.Class type,
- java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault {
+ java.lang.Class type) throws org.apache.axis2.AxisFault {
return param;
}
Modified:
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -115,8 +115,7 @@
<xsl:choose>
<xsl:when test="$propertyType='byte'">
private byte toByte (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -130,8 +129,7 @@
</xsl:when>
<xsl:when test="$propertyType='char'">
private char toChar (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -145,8 +143,7 @@
</xsl:when>
<xsl:when test="$propertyType='double'">
private double toDouble (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -160,8 +157,7 @@
</xsl:when>
<xsl:when test="$propertyType='float'">
private float toFloat (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -175,8 +171,7 @@
</xsl:when>
<xsl:when test="$propertyType='int'">
private int toInt (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -190,8 +185,7 @@
</xsl:when>
<xsl:when test="$propertyType='long'">
private long toLong (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -205,8 +199,7 @@
</xsl:when>
<xsl:when test="$propertyType='short'">
private short toShort (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -220,8 +213,7 @@
</xsl:when>
<xsl:when test="$propertyType='boolean'">
private boolean toBoolean (
- org.apache.axiom.om.OMElement param,
- java.util.Map extraNamespaces) throws
org.apache.axis2.AxisFault{
+ org.apache.axiom.om.OMElement param) throws
org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
@@ -246,8 +238,7 @@
private java.lang.Object fromOM (
org.apache.axiom.om.OMElement param,
- java.lang.Class type,
- java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+ java.lang.Class type) throws org.apache.axis2.AxisFault{
try {
javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller =
context.createUnmarshaller();
Modified:
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -689,7 +689,7 @@
// build the message object from the details
String messageClassName =
(String)faultMessageMap.get(faultElt.getQName());
Class messageClass = Class.forName(messageClassName);
- Object messageObject = fromOM(faultElt, messageClass,
null);
+ Object messageObject = fromOM(faultElt, messageClass);
java.lang.reflect.Method m =
exceptionClass.getMethod("setFaultMessage",
new Class[] { messageClass });
m.invoke(e, new Object[] { messageObject });
@@ -849,8 +849,7 @@
}
<!-- shouldn't be needed when no actual binding, but called by fault
conversion code so must be left in for now -->
- private static Object fromOM(org.apache.axiom.om.OMElement param, Class
type,
- java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+ private static Object fromOM(org.apache.axiom.om.OMElement param, Class
type) throws org.apache.axis2.AxisFault{
try {
org.jibx.runtime.impl.UnmarshallingContext ctx =
getNewUnmarshalContext(param);
return ctx.unmarshalElement(type);
Modified:
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?rev=1189456&r1=1189455&r2=1189456&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Wed Oct 26 21:02:06 2011
@@ -238,20 +238,13 @@
public org.apache.xmlbeans.XmlObject fromOM(
org.apache.axiom.om.OMElement param,
- java.lang.Class type,
- java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+ java.lang.Class type) throws org.apache.axis2.AxisFault{
try{
<xsl:for-each select="param[@type!='' and not(@primitive)]">
if (<xsl:value-of select="@type"/>.class.equals(type)){
- if (extraNamespaces!=null){
return <xsl:value-of select="@type"/>.Factory.parse(
- param.getXMLStreamReaderWithoutCaching(),
- new
org.apache.xmlbeans.XmlOptions().setLoadAdditionalNamespaces(extraNamespaces));
- }else{
- return <xsl:value-of select="@type"/>.Factory.parse(
- param.getXMLStreamReaderWithoutCaching());
- }
+ param.getXMLStreamReader(false, true));
}
</xsl:for-each>
