You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2009/02/07 15:32:45 UTC
svn commit: r741901 - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c:
ServiceSkeleton.xsl SkelHeaderTemplate.xsl SkelSourceTemplate.xsl
StubHeaderTemplate.xsl StubSourceTemplate.xsl
Author: dimuthu
Date: Sat Feb 7 14:32:45 2009
New Revision: 741901
URL: http://svn.apache.org/viewvc?rev=741901&view=rev
Log:
correcting error xsl condition commited in 741899
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl?rev=741901&r1=741900&r2=741901&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl Sat Feb 7 14:32:45 2009
@@ -58,7 +58,7 @@
/* union to keep all the exception objects */
union {
<xsl:for-each select="method">
- <xsl:if test="fault">
+ <xsl:if test="count(fault/*)">
<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault </xsl:text> <xsl:value-of select="@name"/>_fault;
</xsl:if>
</xsl:for-each>
@@ -561,7 +561,7 @@
<xsl:value-of select="$outputparam_types"/> ret_unwrapped = <xsl:value-of select="$svcop-prefix"/>_<xsl:value-of select="$method-name"/><xsl:text>(env</xsl:text>
<xsl:value-of select="$inputparam_values"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:text>&_</xsl:text><xsl:value-of select="@name"/><xsl:value-of select="$position"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
(<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault*</xsl:text>)&(svc_skeleton_wrapper->fault)</xsl:if>);
<xsl:choose>
<xsl:when test="output/param/@complextype">
@@ -594,7 +594,7 @@
ret_val<xsl:value-of select="$position"/> = <xsl:value-of select="$svcop-prefix"/>_<xsl:value-of select="$method-name"/><xsl:text>(env</xsl:text>
<xsl:value-of select="$inputparam_values"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:text>&_</xsl:text><xsl:value-of select="@name"/><xsl:value-of select="$position"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
(<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault*</xsl:text>)&(svc_skeleton_wrapper->fault)</xsl:if>);
</xsl:otherwise>
</xsl:choose>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl?rev=741901&r1=741900&r2=741901&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl Sat Feb 7 14:32:45 2009
@@ -77,7 +77,7 @@
<xsl:variable name="count"><xsl:value-of select="count(output/param)"/></xsl:variable>
- <xsl:if test="fault">
+ <xsl:if test="count(fault/*)">
/**
* the generated fault union for operation "<xsl:value-of select="@qname"/>",
* in a case you want to return a fault, put the appropriate adb object for
@@ -130,7 +130,7 @@
<xsl:value-of select="$inputparams"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="outputtype"><xsl:value-of select="@type"/><xsl:if test="@ours">*</xsl:if></xsl:variable>
<xsl:value-of select="$outputtype"/><xsl:text> dp_</xsl:text><xsl:value-of select="@name"/><xsl:text> /* output header double ptr*/</xsl:text>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
<xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> *fault</xsl:if>);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl?rev=741901&r1=741900&r2=741901&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl Sat Feb 7 14:32:45 2009
@@ -87,7 +87,7 @@
<xsl:value-of select="$inputparams"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="outputtype"><xsl:value-of select="@type"/><xsl:if test="@ours">*</xsl:if></xsl:variable>
<xsl:value-of select="$outputtype"/><xsl:text> dp_</xsl:text><xsl:value-of select="@name"/><xsl:text> /* output header double ptr*/</xsl:text>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
<xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> *fault</xsl:if> )
{
/* TODO fill this with the necessary business logic */
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl?rev=741901&r1=741900&r2=741901&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl Sat Feb 7 14:32:45 2009
@@ -98,7 +98,7 @@
<xsl:for-each select="method">
- <xsl:if test="fault">
+ <xsl:if test="count(fault/*)">
/**
* the generated fault union for operation "<xsl:value-of select="@name"/>",
* in a case you want to return a fault, put the appropriate adb object for
@@ -163,7 +163,7 @@
<xsl:value-of select="$inputparams"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="outputtype"><xsl:value-of select="@type"/><xsl:if test="@ours">*</xsl:if></xsl:variable>
<xsl:value-of select="$outputtype"/><xsl:text> dp_</xsl:text><xsl:value-of select="@name"/><xsl:text> /* output header double ptr*/</xsl:text>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> *fault</xsl:if>);
</xsl:if>
</xsl:for-each>
@@ -223,7 +223,7 @@
axis2_status_t ( AXIS2_CALL *on_complete ) (const axutil_env_t *, <xsl:value-of select="$outputtype"/><xsl:text> _</xsl:text><xsl:value-of select="output/param/@name"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="header_outputtype"><xsl:value-of select="@type"/></xsl:variable>
<xsl:value-of select="$header_outputtype"/><xsl:text> _</xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault</xsl:if>, void *data),
axis2_status_t ( AXIS2_CALL *on_error ) (const axutil_env_t *, int exception, void *data) );
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl?rev=741901&r1=741900&r2=741901&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl Sat Feb 7 14:32:45 2009
@@ -244,7 +244,7 @@
<xsl:value-of select="$inputparams"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="outputtype"><xsl:value-of select="@type"/><xsl:if test="@ours">*</xsl:if></xsl:variable>
<xsl:value-of select="$outputtype"/><xsl:text> dp_</xsl:text><xsl:value-of select="@name"/><xsl:text> /* output header double ptr*/</xsl:text>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> *fault</xsl:if>)
{
axis2_svc_client_t *svc_client = NULL;
@@ -383,7 +383,7 @@
axutil_string_free(soap_act, env);
}
- <xsl:if test="fault">
+ <xsl:if test="count(fault/*)">
if (axis2_svc_client_get_last_response_has_fault (svc_client, env) && fault)
{
/* so it is a fault, will try to create soap elements */
@@ -672,7 +672,7 @@
axis2_status_t ( AXIS2_CALL *on_complete ) (const axutil_env_t *, <xsl:value-of select="$outputtype"/><xsl:text> _</xsl:text><xsl:value-of select="output/param/@name"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="header_outputtype"><xsl:value-of select="@type"/></xsl:variable>
<xsl:value-of select="$header_outputtype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault</xsl:if>, void *data);
axis2_status_t ( AXIS2_CALL *on_error ) (const axutil_env_t *, int exception, void *data);
};
@@ -705,12 +705,12 @@
axis2_status_t ( AXIS2_CALL *on_complete ) (const axutil_env_t *, <xsl:value-of select="$outputtype"/><xsl:text> _</xsl:text><xsl:value-of select="output/param/@name"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="header_outputtype"><xsl:value-of select="@type"/></xsl:variable>
<xsl:value-of select="$header_outputtype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault</xsl:if>, void *data);
struct axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/>_callback_data* callback_data = NULL;
void *user_data = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- <xsl:if test="fault">axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault;
+ <xsl:if test="count(fault/*)">axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault;
</xsl:if>
<xsl:if test="output/param/@ours">
@@ -743,7 +743,7 @@
axiom_soap_fault_t *soap_fault = NULL;
axiom_node_t *body_node = axiom_soap_body_get_base_node(soap_body, env);
- <xsl:if test="fault">
+ <xsl:if test="count(fault/*)">
soap_fault = axiom_soap_body_get_fault (soap_body, env);
if (soap_fault)
{
@@ -923,20 +923,20 @@
if(ret_val == NULL) {
status = on_complete(env, (<xsl:value-of select="output/param/param/@type"/>)NULL<xsl:for-each select="output/param[@location='soap_header']">,
<xsl:text>_</xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">, fault </xsl:if>, user_data);
+ </xsl:for-each><xsl:if test="count(fault/*)">, fault </xsl:if>, user_data);
}
else {
status = on_complete(env, <xsl:if test="output/param/@complextype">
<xsl:value-of select="substring-before(output/param/@complextype, '_t*')"/>_free_popping_value(
</xsl:if><xsl:value-of select="substring-before(output/param/@type, '_t*')"/>_free_popping_value(ret_val, env)<xsl:if test="output/param/@complextype">, env)</xsl:if><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:text>_</xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">, fault </xsl:if>, user_data);
+ </xsl:for-each><xsl:if test="count(fault/*)">, fault </xsl:if>, user_data);
}
</xsl:when>
<xsl:otherwise>
status = on_complete(env, ret_val<xsl:for-each select="output/param[@location='soap_header']">,
<xsl:text>_</xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">, fault </xsl:if>, user_data);
+ </xsl:for-each><xsl:if test="count(fault/*)">, fault </xsl:if>, user_data);
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -975,7 +975,7 @@
axis2_status_t ( AXIS2_CALL *on_complete ) (const axutil_env_t *, <xsl:value-of select="$outputtype"/><xsl:text> _</xsl:text><xsl:value-of select="output/param/@name"/><xsl:for-each select="output/param[@location='soap_header']">,
<xsl:variable name="header_outputtype"><xsl:value-of select="@type"/></xsl:variable>
<xsl:value-of select="$header_outputtype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each><xsl:if test="fault">,
+ </xsl:for-each><xsl:if test="count(fault/*)">,
axis2_stub_<xsl:value-of select="$servicename"/>_<xsl:value-of select="@name"/><xsl:text>_fault</xsl:text> fault</xsl:if>, void *data) ,
axis2_status_t ( AXIS2_CALL *on_error ) (const axutil_env_t *, int exception, void *data) )
{