Author: veithen
Date: Fri Jun 29 18:56:13 2012
New Revision: 1355509
URL: http://svn.apache.org/viewvc?rev=1355509&view=rev
Log:
Completely reverted the original change for AXIS2-4197 (i.e. r1052896, r1053240
and r1082726): the methodQName parameter is never used.
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/main/resources/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -135,7 +135,7 @@
</xsl:when>
<xsl:otherwise>
<!-- Assumption - the parameter is always
an ADB element-->
- private
org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory
factory, <xsl:value-of select="$inputElementType"/> param, boolean
optimizeContent, javax.xml.namespace.QName methodQName)
+ private
org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory
factory, <xsl:value-of select="$inputElementType"/> param, boolean
optimizeContent)
throws org.apache.axis2.AxisFault{
<xsl:choose>
@@ -253,7 +253,7 @@
<xsl:variable name="outElementType"
select="../../param[@type!='' and @direction='out' and
@opname=$opname]/@type"></xsl:variable>
<!-- Assumption - The ADBBean here is always an element
based bean -->
<xsl:if test="generate-id($outElement) =
generate-id(key('paramsOut', $outElementType)[1])">
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../param[@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../param[@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault{
try{
org.apache.axiom.soap.SOAPEnvelope emptyEnvelope =
factory.getDefaultEnvelope();
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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -374,8 +374,7 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of
select="input/param[@location='body' and @type!='']/@name"/>,
optimizeContent(new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>")), new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>"));
+ "<xsl:value-of
select="$method-name"/>")));
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -655,8 +654,7 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of
select="input/param[@location='body' and @type!='']/@name"/>,
optimizeContent(new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>")), new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>"));
+ "<xsl:value-of
select="$method-name"/>")));
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -969,8 +967,7 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of select="input/param[@location='body' and @type!='']/@name"/>,
optimizeContent(new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
-
"<xsl:value-of select="$method-name"/>")),new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
-
"<xsl:value-of select="$method-name"/>"));
+
"<xsl:value-of select="$method-name"/>")));
</xsl:otherwise>
</xsl:choose>
</xsl:when>
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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -243,8 +243,7 @@
<xsl:choose>
<xsl:when
test="string-length(normalize-space($returntype)) > 0">
- envelope =
toEnvelope(getSOAPFactory(msgContext), <xsl:value-of
select="$returnvariable"/>, false, new javax.xml.namespace.QName("<xsl:value-of
select="$namespace"/>",
- "<xsl:value-of
select="$name"/>"));
+ envelope =
toEnvelope(getSOAPFactory(msgContext), <xsl:value-of
select="$returnvariable"/>, false);
</xsl:when>
<xsl:otherwise>
envelope =
getSOAPFactory(msgContext).getDefaultEnvelope();
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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -34,7 +34,7 @@
return param;
}
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,
org.apache.axiom.om.OMElement param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,
org.apache.axiom.om.OMElement param, boolean optimizeContent)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
envelope.getBody().addChild(param);
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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -73,7 +73,7 @@
return factory.createOMElement(source, "<xsl:value-of
select="qname/@localname"/>", namespace);
}
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="@type"/> param, boolean optimizeContent, javax.xml.namespace.QName
methodQName)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="@type"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
envelope.getBody().addChild(toOM(param, optimizeContent));
Modified:
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl?rev=1355509&r1=1355508&r2=1355509&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
Fri Jun 29 18:56:13 2012
@@ -116,7 +116,7 @@
<xsl:template name="toEnvelope-method">
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="@type"/> param, boolean optimizeContent, javax.xml.namespace.QName
methodQName) {
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="@type"/> param, boolean optimizeContent) {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
if (param != null){
envelope.getBody().addChild(toOM(param, factory,
optimizeContent));
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=1355509&r1=1355508&r2=1355509&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
Fri Jun 29 18:56:13 2012
@@ -153,7 +153,7 @@
</xsl:when>
<xsl:otherwise>
<!-- Assumption - the parameter is always an
XMLBeans -->
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="$inputElementType"/> param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="$inputElementType"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault{
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
if (param != null){
@@ -182,7 +182,7 @@
<!-- Assumption - This is an XMLBeans element-->
<xsl:if test="generate-id($outElement) =
generate-id(key('paramsOut', $outElementType)[1])">
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../param[@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../param[@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
if (param != null){
