Author: amilas
Date: Sun Dec 26 15:24:05 2010
New Revision: 1052896
URL: http://svn.apache.org/viewvc?rev=1052896&view=rev
Log:
AXIS2-4197
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/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
axis/axis2/java/core/trunk/pom.xml
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=1052896&r1=1052895&r2=1052896&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
Sun Dec 26 15:24:05 2010
@@ -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)
+ 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)
throws org.apache.axis2.AxisFault{
<xsl:choose>
@@ -253,7 +253,7 @@
<xsl:variable name="outElementType"
select="../../par...@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="../../par...@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../par...@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
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=1052896&r1=1052895&r2=1052896&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
Sun Dec 26 15:24:05 2010
@@ -374,7 +374,8 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of
select="input/par...@location='body' and @type!='']/@name"/>,
optimizeContent(new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>")));
+ "<xsl:value-of
select="$method-name"/>")), new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
+ "<xsl:value-of
select="$method-name"/>"));
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -662,7 +663,8 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of
select="input/par...@location='body' and @type!='']/@name"/>,
optimizeContent(new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
- "<xsl:value-of
select="$method-name"/>")));
+ "<xsl:value-of
select="$method-name"/>")), new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
+ "<xsl:value-of
select="$method-name"/>"));
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -980,7 +982,8 @@
env =
toEnvelope(getFactory(_operationClient.getOptions().getSoapVersionURI()),
<xsl:value-of select="input/par...@location='body' and @type!='']/@name"/>,
optimizeContent(new javax.xml.namespace.QName("<xsl:value-of
select="$method-ns"/>",
-
"<xsl:value-of select="$method-name"/>")));
+
"<xsl:value-of select="$method-name"/>")),new
javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>",
+
"<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=1052896&r1=1052895&r2=1052896&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
Sun Dec 26 15:24:05 2010
@@ -245,7 +245,8 @@
<xsl:choose>
<xsl:when
test="string-length(normalize-space($returntype)) > 0">
- envelope =
toEnvelope(getSOAPFactory(msgContext), <xsl:value-of
select="$returnvariable"/>, false);
+ 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"/>"));
</xsl:when>
<xsl:otherwise>
envelope =
getSOAPFactory(msgContext).getDefaultEnvelope();
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=1052896&r1=1052895&r2=1052896&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
Sun Dec 26 15:24:05 2010
@@ -61,7 +61,7 @@
<xsl:for-each select="param[not(@type =
preceding-sibling::param/@type)]">
<xsl:if test="@type!=''">
- private org.apache.axiom.om.OMElement toOM(<xsl:value-of
select="@type"/> param, boolean optimizeContent)
+ private org.apache.axiom.om.OMElement toOM(<xsl:value-of
select="@type"/> param, boolean optimizeContent, javax.xml.namespace.QName
methodQName)
throws org.apache.axis2.AxisFault {
try {
javax.xml.bind.JAXBContext context = wsContext;
@@ -73,20 +73,20 @@
JaxbRIDataSource source = new JaxbRIDataSource(
<xsl:value-of select="@type"/>.class,
param,
marshaller,
-
"<xsl:value-of select="qname/@nsuri"/>",
-
"<xsl:value-of select="qname/@localname"/>");
- org.apache.axiom.om.OMNamespace namespace =
factory.createOMNamespace("<xsl:value-of select="qname/@nsuri"/>",
+
methodQName.getNamespaceURI(),
+
methodQName.getLocalPart());
+ org.apache.axiom.om.OMNamespace namespace =
factory.createOMNamespace(methodQName.getNamespaceURI(),
null);
- return factory.createOMElement(source, "<xsl:value-of
select="qname/@localname"/>", namespace);
+ return factory.createOMElement(source,
methodQName.getLocalPart(), namespace);
} catch (javax.xml.bind.JAXBException bex){
throw org.apache.axis2.AxisFault.makeFault(bex);
}
}
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="@type"/> param, boolean optimizeContent)
+ 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)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
- envelope.getBody().addChild(toOM(param, optimizeContent));
+ envelope.getBody().addChild(toOM(param, optimizeContent,
methodQName));
return envelope;
}
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=1052896&r1=1052895&r2=1052896&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
Sun Dec 26 15:24:05 2010
@@ -139,7 +139,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)
+ 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)
throws org.apache.axis2.AxisFault{
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
if (param != null){
@@ -168,7 +168,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="../../par...@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of
select="../../par...@type!='' and @direction='out' and
@opname=$opname]/@type"/> param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
if (param != null){
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1052896&r1=1052895&r2=1052896&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Dec 26 15:24:05 2010
@@ -61,8 +61,8 @@
<module>modules/testutils</module>
<module>modules/tool/axis2-aar-maven-plugin</module>
<module>modules/tool/axis2-ant-plugin</module>
- <module>modules/tool/axis2-eclipse-codegen-plugin</module>
- <module>modules/tool/axis2-eclipse-service-plugin</module>
+<!-- <module>modules/tool/axis2-eclipse-codegen-plugin</module>
+ <module>modules/tool/axis2-eclipse-service-plugin</module> -->
<module>modules/tool/axis2-idea-plugin</module>
<module>modules/tool/axis2-java2wsdl-maven-plugin</module>
<module>modules/tool/axis2-mar-maven-plugin</module>
@@ -82,6 +82,7 @@
<module>modules/osgi</module>
<module>modules/transport/local</module>
<module>modules/transport/http</module>
+ <module>modules/all</module>
</modules>
<profiles>
<profile>
