axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r525129 [3/3] - in /webservices/axis2/trunk/java/modules: adb-codegen/src/org/apache/axis2/schema/template/ codegen/src/org/apache/axis2/wsdl/template/c/
Date Tue, 03 Apr 2007 10:23:51 GMT
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?view=diff&rev=525129&r1=525128&r2=525129
==============================================================================
--- 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
Tue Apr  3 03:23:50 2007
@@ -20,7 +20,7 @@
 
         #include "<xsl:value-of select="$svcop-prefix"/>.h"
         #include &lt;axis2_svc_skeleton.h&gt;
-        #include &lt;axis2_array_list.h&gt;
+        #include &lt;axutil_array_list.h&gt;
         #include &lt;stdio.h&gt;
 
         /**
@@ -30,62 +30,64 @@
         /* On fault, handle the fault */
         axiom_node_t* AXIS2_CALL
         <xsl:value-of select="$method-prefix"/>_on_fault(axis2_svc_skeleton_t *svc_skeleton,
-                  const axis2_env_t *env, axiom_node_t *node);
+                  const axutil_env_t *env, axiom_node_t *node);
 
         /* Free the service */
         int AXIS2_CALL
         <xsl:value-of select="$method-prefix"/>_free(axis2_svc_skeleton_t *svc_skeleton,
-                  const axis2_env_t *env);
+                  const axutil_env_t *env);
 
         /* This method invokes the right service method */
         axiom_node_t* AXIS2_CALL
         <xsl:value-of select="$method-prefix"/>_invoke(axis2_svc_skeleton_t *svc_skeleton,
-                    const axis2_env_t *env,
+                    const axutil_env_t *env,
                     axiom_node_t *node,
                     axis2_msg_ctx_t *msg_ctx);
 
         /* Initializing the environment  */
         int AXIS2_CALL
         <xsl:value-of select="$method-prefix"/>_init(axis2_svc_skeleton_t *svc_skeleton,
-                        const axis2_env_t *env);
+                        const axutil_env_t *env);
 
         /* Create the service  */
         axis2_svc_skeleton_t* AXIS2_CALL
-        <xsl:value-of select="$method-prefix"/>_create(const axis2_env_t *env);
+        <xsl:value-of select="$method-prefix"/>_create(const axutil_env_t *env);
+
+        static const axis2_svc_skeleton_ops_t <xsl:value-of select="$skeletonname"/>_svc_skeleton_ops_var
= {
+            <xsl:value-of select="$method-prefix"/>_init,
+            <xsl:value-of select="$method-prefix"/>_invoke,
+            <xsl:value-of select="$method-prefix"/>_on_fault,
+            <xsl:value-of select="$method-prefix"/>_free
+        };
+
 
         /**
          * Implementations for the functions
          */
 
 	axis2_svc_skeleton_t* AXIS2_CALL
-	<xsl:value-of select="$method-prefix"/>_create(const axis2_env_t *env)
+	<xsl:value-of select="$method-prefix"/>_create(const axutil_env_t *env)
 	{
 	    axis2_svc_skeleton_t *svc_skeleton = NULL;
-	    svc_skeleton = AXIS2_MALLOC(env->allocator,
-	        sizeof(axis2_svc_skeleton_t));
+        /* Allocate memory for the structs */
+        svc_skeleton = AXIS2_MALLOC(env->allocator,
+            sizeof(axis2_svc_skeleton_t));
 
-
-	    svc_skeleton->ops = AXIS2_MALLOC(
-	        env->allocator, sizeof(axis2_svc_skeleton_ops_t));
+        svc_skeleton->ops = &amp;<xsl:value-of select="$skeletonname"/>_svc_skeleton_ops_var;
 
 	    svc_skeleton->func_array = NULL;
 
-	    svc_skeleton->ops->free = <xsl:value-of select="$method-prefix"/>_free;
-	    svc_skeleton->ops->init = <xsl:value-of select="$method-prefix"/>_init;
-	    svc_skeleton->ops->invoke = <xsl:value-of select="$method-prefix"/>_invoke;
-	    svc_skeleton->ops->on_fault = <xsl:value-of select="$method-prefix"/>_on_fault;
-
 	    return svc_skeleton;
 	}
 
 
 	int AXIS2_CALL
 	<xsl:value-of select="$method-prefix"/>_init(axis2_svc_skeleton_t *svc_skeleton,
-	                        const axis2_env_t *env)
+	                        const axutil_env_t *env)
 	{
-	    svc_skeleton->func_array = axis2_array_list_create(env, 10);
+	    svc_skeleton->func_array = axutil_array_list_create(env, 10);
         <xsl:for-each select="method">
-	      axis2_array_list_add(svc_skeleton->func_array, env, "<xsl:value-of select="@localpart"/>");
+	      axutil_array_list_add(svc_skeleton->func_array, env, "<xsl:value-of select="@localpart"/>");
         </xsl:for-each>
 
 	    /* Any initialization stuff of <xsl:value-of select="$svcname"/> goes here */
@@ -94,26 +96,23 @@
 
 	int AXIS2_CALL
 	<xsl:value-of select="$method-prefix"/>_free(axis2_svc_skeleton_t *svc_skeleton,
-				 const axis2_env_t *env)
+				 const axutil_env_t *env)
 	{
-          if(svc_skeleton->func_array)
-          {
-            axis2_array_list_free(svc_skeleton->func_array, env);
+        /* Free the function array */
+        if (svc_skeleton->func_array)
+        {
+            axutil_array_list_free(svc_skeleton->func_array, env);
             svc_skeleton->func_array = NULL;
-          }
-
-          if(svc_skeleton->ops)
-          {
-            AXIS2_FREE(env->allocator, svc_skeleton->ops);
-            svc_skeleton->ops = NULL;
-          }
+        }
 
-          if(svc_skeleton)
-          {
+        /* Free the service skeleton */
+        if (svc_skeleton)
+        {
             AXIS2_FREE(env->allocator, svc_skeleton);
             svc_skeleton = NULL;
-          }
-          return AXIS2_SUCCESS;
+        }
+
+        return AXIS2_SUCCESS;
 	}
 
 
@@ -122,7 +121,7 @@
 	 */
 	axiom_node_t* AXIS2_CALL
 	<xsl:value-of select="$method-prefix"/>_invoke(axis2_svc_skeleton_t *svc_skeleton,
-				const axis2_env_t *env,
+				const axutil_env_t *env,
 				axiom_node_t *content_node,
 				axis2_msg_ctx_t *msg_ctx)
 	{
@@ -132,7 +131,7 @@
 
           axis2_op_ctx_t *operation_ctx = NULL;
           axis2_op_t *operation = NULL;
-          axis2_qname_t *op_qname = NULL;
+          axutil_qname_t *op_qname = NULL;
           axis2_char_t *op_name = NULL;
 
           axiom_node_t *ret_node = NULL;
@@ -158,8 +157,8 @@
 
           operation_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
           operation = axis2_op_ctx_get_op(operation_ctx, env);
-          op_qname = (axis2_qname_t *)axis2_op_get_qname(operation, env);
-          op_name = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+          op_qname = (axutil_qname_t *)axis2_op_get_qname(operation, env);
+          op_name = axutil_qname_get_localpart(op_qname, env);
 
           if (op_name)
           {
@@ -177,7 +176,7 @@
                     input_val<xsl:value-of select="$position"/>_<xsl:value-of select="position()"/>
= <xsl:choose>
                         <xsl:when test="@ours">
                         axis2_<xsl:value-of select="@type"/>_create( env);
-                        AXIS2_<xsl:value-of select="@caps-type"/>_DESERIALIZE(input_val<xsl:value-of
select="$position"/>_<xsl:value-of select="position()"/>, env, content_node );
+                        axis2_<xsl:value-of select="@type"/>_deserialize(input_val<xsl:value-of
select="$position"/>_<xsl:value-of select="position()"/>, env, content_node );
                         </xsl:when>
                         <xsl:otherwise>content_node;</xsl:otherwise>
                         </xsl:choose>
@@ -192,9 +191,9 @@
                     }
                     ret_node = <xsl:choose>
                                    <xsl:when test="@ours">
-                               AXIS2_<xsl:value-of select="$outputCapsType"/>_SERIALIZE(ret_val<xsl:value-of
select="$position"/>, env, NULL, AXIS2_FALSE);
-                               AXIS2_<xsl:value-of select="$outputCapsType"/>_FREE(ret_val<xsl:value-of
select="$position"/>, env);
-                               AXIS2_<xsl:value-of select="@caps-type"/>_FREE(input_val<xsl:value-of
select="$position"/>_<xsl:value-of select="position()"/>, env);
+                               axis2_<xsl:value-of select="$outputtype"/>_serialize(ret_val<xsl:value-of
select="$position"/>, env, NULL, AXIS2_FALSE);
+                               axis2_<xsl:value-of select="$outputtype"/>_free(ret_val<xsl:value-of
select="$position"/>, env);
+                               axis2_<xsl:value-of select="@type"/>_free(input_val<xsl:value-of
select="$position"/>_<xsl:value-of select="position()"/>, env);
                                    </xsl:when>
                                    <xsl:otherwise>ret_val<xsl:value-of select="$position"/>;</xsl:otherwise>
                                 </xsl:choose>
@@ -217,13 +216,13 @@
 
     axiom_node_t* AXIS2_CALL
     <xsl:value-of select="$method-prefix"/>_on_fault(axis2_svc_skeleton_t *svc_skeleton,
-                  const axis2_env_t *env, axiom_node_t *node)
+                  const axutil_env_t *env, axiom_node_t *node)
 	{
 		axiom_node_t *error_node = NULL;
 		axiom_element_t *error_ele = NULL;
 		error_ele = axiom_element_create(env, node, "fault", NULL,
     					&amp;error_node);
-		AXIOM_ELEMENT_SET_TEXT(error_ele, env, "<xsl:value-of select="$qname"/> failed",
+		axiom_element_set_text(error_ele, env, "<xsl:value-of select="$qname"/> failed",
     					error_node);
 		return error_node;
 	}
@@ -235,7 +234,7 @@
 
     AXIS2_EXTERN int
     axis2_get_instance(struct axis2_svc_skeleton **inst,
-	                        const axis2_env_t *env)
+	                        const axutil_env_t *env)
 	{
 		*inst = <xsl:value-of select="$method-prefix"/>_create(env);
 
@@ -249,7 +248,7 @@
 
 	AXIS2_EXTERN int 
     axis2_remove_instance(axis2_svc_skeleton_t *inst,
-                            const axis2_env_t *env)
+                            const axutil_env_t *env)
 	{
         axis2_status_t status = AXIS2_FAILURE;
        	if (inst)

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?view=diff&rev=525129&r1=525128&r2=525129
==============================================================================
--- 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
Tue Apr  3 03:23:50 2007
@@ -15,8 +15,8 @@
 
 
 	#include &lt;axis2_svc_skeleton.h&gt;
-	#include &lt;axis2_log_default.h&gt;
-	#include &lt;axis2_error_default.h&gt;
+	#include &lt;axutil_log_default.h&gt;
+	#include &lt;axutil_error_default.h&gt;
 	#include &lt;axiom_text.h&gt;
 	#include &lt;axiom_node.h&gt;
 	#include &lt;axiom_element.h&gt;
@@ -58,7 +58,7 @@
         <xsl:when test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:when>
         </xsl:choose>
         <xsl:text> </xsl:text>
-        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>
(const axis2_env_t *env <xsl:for-each select="input/param[@type!='']"> ,
+        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>
(const axutil_env_t *env <xsl:for-each select="input/param[@type!='']"> ,
                                           <xsl:variable name="inputtype">
                                              <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                           </xsl:variable>

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?view=diff&rev=525129&r1=525128&r2=525129
==============================================================================
--- 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
Tue Apr  3 03:23:50 2007
@@ -38,7 +38,7 @@
         <xsl:when test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:when>
         </xsl:choose>
         <xsl:text> </xsl:text>
-        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>
(const axis2_env_t *env <xsl:for-each select="input/param[@type!='']"> ,
+        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>
(const axutil_env_t *env <xsl:for-each select="input/param[@type!='']"> ,
                                               <xsl:variable name="inputtype">
                                                   <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                               </xsl:variable>

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?view=diff&rev=525129&r1=525128&r2=525129
==============================================================================
--- 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
Tue Apr  3 03:23:50 2007
@@ -19,7 +19,7 @@
 
         #include &lt;stdio.h&gt;
         #include &lt;axiom.h&gt;
-        #include &lt;axis2_util.h&gt;
+        #include &lt;axutil_utils.h&gt;
         #include &lt;axiom_soap.h&gt;
         #include &lt;axis2_client.h&gt;
         #include &lt;axis2_stub.h&gt;
@@ -43,19 +43,19 @@
          *        - endpoint_uri : service endpoint uri( optional ) - if NULL default picked
from wsdl used
          */
         axis2_stub_t*
-        <xsl:value-of select="$method-prefix"/>_create (const axis2_env_t *env,
+        <xsl:value-of select="$method-prefix"/>_create (const axutil_env_t *env,
                                         axis2_char_t *client_home,
                                         axis2_char_t *endpoint_uri);
         /**
          * <xsl:value-of select="$method-prefix"/>_populate_services
          * populate the svc in stub with the service and operations
          */
-        void <xsl:value-of select="$method-prefix"/>_populate_services( axis2_stub_t
*stub, const axis2_env_t *env);
+        void <xsl:value-of select="$method-prefix"/>_populate_services( axis2_stub_t
*stub, const axutil_env_t *env);
         /**
          * <xsl:value-of select="$method-prefix"/>_get_endpoint_uri_from_wsdl
          * return the endpoint URI picked from wsdl
          */
-        axis2_char_t *<xsl:value-of select="$method-prefix"/>_get_endpoint_uri_from_wsdl
( const axis2_env_t *env );
+        axis2_char_t *<xsl:value-of select="$method-prefix"/>_get_endpoint_uri_from_wsdl
( const axutil_env_t *env );
 
         <xsl:if test="$isSync='1'">
         <xsl:for-each select="method">
@@ -78,7 +78,7 @@
         <xsl:when test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:when>
         </xsl:choose>
         <xsl:text> </xsl:text>
-        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axis2_env_t *env<xsl:for-each select="input/param[@type!='']">,
+        <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axutil_env_t *env<xsl:for-each select="input/param[@type!='']">,
                                                     <xsl:variable name="inputtype">
                                                         <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                                     </xsl:variable>
@@ -101,14 +101,14 @@
 
         <xsl:variable name="mep"><xsl:value-of select="@mep"/></xsl:variable>
         <xsl:if test="$mep='12'">
-        void <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>_start(
axis2_stub_t *stub, const axis2_env_t *env<xsl:for-each select="input/param[@type!='']">,
+        void <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>_start(
axis2_stub_t *stub, const axutil_env_t *env<xsl:for-each select="input/param[@type!='']">,
                                                         <xsl:variable name="inputtype">
                                                             <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                                         </xsl:variable>
                                                         <xsl:if test="position()>1">,</xsl:if><xsl:value-of
select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
                                                     </xsl:for-each>,
-                                                        axis2_status_t ( AXIS2_CALL *on_complete
) (struct axis2_callback *, const axis2_env_t* ) ,
-                                                        axis2_status_t ( AXIS2_CALL *on_error
) (struct axis2_callback *, const axis2_env_t*, int ) );
+                                                        axis2_status_t ( AXIS2_CALL *on_complete
) (struct axis2_callback *, const axutil_env_t* ) ,
+                                                        axis2_status_t ( AXIS2_CALL *on_error
) (struct axis2_callback *, const axutil_env_t*, int ) );
 
         </xsl:if>  <!--close for  test="$mep='http://www.w3.org/2004/08/wsdl/in-out'"-->
         </xsl:for-each>

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?view=diff&rev=525129&r1=525128&r2=525129
==============================================================================
--- 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
Tue Apr  3 03:23:50 2007
@@ -25,7 +25,7 @@
        */
 
       axis2_stub_t*
-      <xsl:value-of select="$method-prefix"/>_create (const axis2_env_t *env,
+      <xsl:value-of select="$method-prefix"/>_create (const axutil_env_t *env,
                                       axis2_char_t *client_home,
                                       axis2_char_t *endpoint_uri)
       {
@@ -46,25 +46,25 @@
       }
 
 
-      void <xsl:value-of select="$method-prefix"/>_populate_services( axis2_stub_t
*stub, const axis2_env_t *env)
+      void <xsl:value-of select="$method-prefix"/>_populate_services( axis2_stub_t
*stub, const axutil_env_t *env)
       {
          axis2_svc_client_t *svc_client = NULL;
-         axis2_qname_t *svc_qname =  NULL;
-         axis2_qname_t *op_qname =  NULL;
+         axutil_qname_t *svc_qname =  NULL;
+         axutil_qname_t *op_qname =  NULL;
          axis2_svc_t *svc = NULL;
          axis2_op_t *op = NULL;
 
          /* Modifying the Service */
-         svc_client = AXIS2_STUB_GET_SVC_CLIENT (stub, env );
-         svc = (axis2_svc_t*)AXIS2_SVC_CLIENT_GET_AXIS_SERVICE ( svc_client, env );
-         axis2_qname_create(env,"<xsl:value-of select="@servicename"/>" ,NULL, NULL);
-         AXIS2_SVC_SET_QNAME (svc, env, svc_qname);
+         svc_client = axis2_stub_get_svc_client (stub, env );
+         svc = (axis2_svc_t*)axis2_svc_client_get_svc( svc_client, env );
+         axutil_qname_create(env,"<xsl:value-of select="@servicename"/>" ,NULL, NULL);
+         axis2_svc_set_qname (svc, env, svc_qname);
 
          /* creating the operations*/
 
          <xsl:for-each select="method">
 
-           op_qname = axis2_qname_create(env,
+           op_qname = axutil_qname_create(env,
                                          "<xsl:value-of select="@localpart"/>" ,
                                          "<xsl:value-of select="@namespace"/>",
                                          NULL);
@@ -77,7 +77,7 @@
                axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
              </xsl:otherwise>
            </xsl:choose>
-           AXIS2_SVC_ADD_OP(svc, env, op);
+           axis2_svc_add_op(svc, env, op);
 
          </xsl:for-each>
       }
@@ -86,7 +86,7 @@
        *return end point picked from wsdl
        */
       axis2_char_t*
-      <xsl:value-of select="$method-prefix"/>_get_endpoint_uri_from_wsdl ( const axis2_env_t
*env )
+      <xsl:value-of select="$method-prefix"/>_get_endpoint_uri_from_wsdl ( const axutil_env_t
*env )
       {
         axis2_char_t *endpoint_uri = NULL;
         /* set the address from here */
@@ -131,7 +131,7 @@
          <xsl:otherwise><xsl:value-of select="$outputtype"/></xsl:otherwise>
          </xsl:choose>
          <xsl:text> </xsl:text>
-         <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axis2_env_t *env<xsl:for-each select="input/param[@type!='']">,
+         <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axutil_env_t *env<xsl:for-each select="input/param[@type!='']">,
                                               <xsl:variable name="inputtype">
                                                   <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                               </xsl:variable>
@@ -143,7 +143,7 @@
             axiom_node_t *ret_node = NULL;
 
             const axis2_char_t *soap_action = NULL;
-            axis2_qname_t *op_qname =  NULL;
+            axutil_qname_t *op_qname =  NULL;
             axiom_node_t *payload = NULL;
             <xsl:if test="output/param/@ours">
            	    <!-- this means data binding is enable -->
@@ -156,7 +156,7 @@
                 <xsl:if test="position()=1">
                     <xsl:choose>
                         <xsl:when test="@ours">
-                            payload = AXIS2_<xsl:value-of select="@caps-type"/>_SERIALIZE(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
+                            payload = axis2_<xsl:value-of select="@type"/>_serialize(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
                         </xsl:when>
                         <xsl:otherwise>
                             payload = <xsl:value-of select="@name"/>;
@@ -166,7 +166,7 @@
             </xsl:for-each>
 
 
-            options = AXIS2_STUB_GET_OPTIONS( stub, env);
+            options = axis2_stub_get_options( stub, env);
             if ( NULL == options )
             {
               AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error
code:"
@@ -174,24 +174,24 @@
                     AXIS2_ERROR_GET_MESSAGE(env->error));
               return NULL;
             }
-            svc_client = AXIS2_STUB_GET_SVC_CLIENT (stub, env );
-            soap_action = AXIS2_OPTIONS_GET_ACTION ( options, env );
+            svc_client = axis2_stub_get_svc_client(stub, env );
+            soap_action = axis2_options_get_action( options, env );
             if ( NULL == soap_action )
             {
               soap_action = "<xsl:value-of select="$soapAction"/>";
-              AXIS2_OPTIONS_SET_ACTION( options, env, soap_action );
+              axis2_options_set_action( options, env, soap_action );
             }
             <xsl:if test="$soapVersion='1.2'">
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP12 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP12 );
             </xsl:if>
             <xsl:if test="$soapVersion!='1.1'">
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP11 );
             </xsl:if>
-            op_qname = axis2_qname_create(env,
+            op_qname = axutil_qname_create(env,
                                         "<xsl:value-of select="@localpart"/>" ,
                                         "<xsl:value-of select="@namespace"/>",
                                         NULL);
-            ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME( svc_client, env, op_qname,
payload);
+            ret_node =  axis2_svc_client_send_receive_with_op_qname( svc_client, env, op_qname,
payload);
 
 
             <xsl:choose>
@@ -205,7 +205,7 @@
                     }
                     ret_val = axis2_<xsl:value-of select="output/param/@type"/>_create(env);
 
-                    AXIS2_<xsl:value-of select="$caps-outputtype"/>_DESERIALIZE(ret_val,
env, ret_node );
+                    axis2_<xsl:value-of select="output/param/@type"/>_deserialize(ret_val,
env, ret_node );
                     return ret_val;
                 </xsl:when>
                 <xsl:otherwise>
@@ -226,14 +226,14 @@
           */
          <xsl:variable name="callbackoncomplete"><xsl:value-of select="$callbackname"></xsl:value-of><xsl:text>_on_complete</xsl:text></xsl:variable>
          <xsl:variable name="callbackonerror"><xsl:value-of select="$callbackname"></xsl:value-of><xsl:text>_on_error</xsl:text></xsl:variable>
-         void <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>_start(
axis2_stub_t *stub, const axis2_env_t *env<xsl:for-each select="input/param[@type!='']">,
+         void <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>_start(
axis2_stub_t *stub, const axutil_env_t *env<xsl:for-each select="input/param[@type!='']">,
                                                     <xsl:variable name="inputtype">
                                                         <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                                     </xsl:variable>
                                                     <xsl:if test="position()>1">,</xsl:if><xsl:value-of
select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
                                                   </xsl:for-each>,
-                                                  axis2_status_t ( AXIS2_CALL *on_complete
) (struct axis2_callback *, const axis2_env_t *) ,
-                                                  axis2_status_t ( AXIS2_CALL *on_error )
(struct axis2_callback *, const axis2_env_t *, int ) )
+                                                  axis2_status_t ( AXIS2_CALL *on_complete
) (struct axis2_callback *, const axutil_env_t *) ,
+                                                  axis2_status_t ( AXIS2_CALL *on_error )
(struct axis2_callback *, const axutil_env_t *, int ) )
          {
 
             axis2_callback_t *callback = NULL;
@@ -249,7 +249,7 @@
                 <xsl:if test="position()=1">
                     <xsl:choose>
                         <xsl:when test="@ours">
-                            payload = AXIS2_<xsl:value-of select="@caps-type"/>_SERIALIZE(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
+                            payload = axis2_<xsl:value-of select="@type"/>_serialize(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
                         </xsl:when>
                         <xsl:otherwise>
                             payload = <xsl:value-of select="@name"/>;
@@ -259,7 +259,7 @@
             </xsl:for-each>
 
 
-            options = AXIS2_STUB_GET_OPTIONS( stub, env);
+            options = axis2_stub_get_options( stub, env);
             if ( NULL == options )
             {
               AXIS2_LOG_ERROR( env->log, AXIS2_LOG_SI, "options is null in stub: Error
code:"
@@ -267,30 +267,30 @@
                       AXIS2_ERROR_GET_MESSAGE(env->error));
               return;
             }
-            svc_client = AXIS2_STUB_GET_SVC_CLIENT (stub, env );
-            soap_action = AXIS2_OPTIONS_GET_ACTION ( options, env );
+            svc_client = axis2_stub_get_svc_client (stub, env );
+            soap_action =axis2_options_get_action ( options, env );
             if ( NULL == soap_action )
             {
               soap_action = "<xsl:value-of select="$soapAction"/>";
-              AXIS2_OPTIONS_SET_ACTION( options, env, soap_action );
+              axis2_options_set_action( options, env, soap_action );
             }
             <xsl:choose>
              <xsl:when test="$soapVersion='1.2'">
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP12 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP12 );
              </xsl:when>
              <xsl:otherwise>
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP11 );
              </xsl:otherwise>
             </xsl:choose>
 
             callback = axis2_callback_create(env);
             /* Set our on_complete fucntion pointer to the callback object */
-            AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+            axis2_callback_set_on_complete(callback, on_complete);
             /* Set our on_error function pointer to the callback object */
-            AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+            axis2_callback_set_on_error(callback, on_error);
 
             /* Send request */
-            AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
+            axis2_svc_client_send_receive_non_blocking(svc_client, env, payload, callback);
          }
 
          </xsl:if>  <!--close for  test="$isASync='1'-->
@@ -307,7 +307,7 @@
           * @param on_error callback to handle on error
           */
          axis2_status_t
-         <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axis2_env_t *env <xsl:for-each select="input/param[@type!='']">
,
+         <xsl:value-of select="$method-prefix"/>_<xsl:value-of select="@name"/>(
axis2_stub_t *stub, const axutil_env_t *env <xsl:for-each select="input/param[@type!='']">
,
                                                  <xsl:variable name="inputtype">
                                                     <xsl:if test="@ours">axis2_</xsl:if><xsl:value-of
select="@type"/><xsl:if test="@ours">_t*</xsl:if>
                                                  </xsl:variable>
@@ -320,7 +320,7 @@
             axis2_options_t *options = NULL;
 
             const axis2_char_t *soap_action = NULL;
-            axis2_qname_t *op_qname =  NULL;
+            axutil_qname_t *op_qname =  NULL;
             axiom_node_t *payload = NULL;
 
             <!-- for service client currently suppported only 1 input param -->
@@ -328,7 +328,7 @@
                 <xsl:if test="position()=1">
                     <xsl:choose>
                         <xsl:when test="@ours">
-                            payload = AXIS2_<xsl:value-of select="@caps-type"/>_SERIALIZE(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
+                            payload = axis2_<xsl:value-of select="@type"/>_serialize(<xsl:value-of
select="@name"/>, env, NULL, AXIS2_FALSE);
                         </xsl:when>
                         <xsl:otherwise>
                             payload = <xsl:value-of select="@name"/>;
@@ -338,7 +338,7 @@
             </xsl:for-each>
 
 
-            options = AXIS2_STUB_GET_OPTIONS( stub, env);
+            options = axis2_stub_get_options( stub, env);
             if ( NULL == options )
             {
               AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error
code:"
@@ -346,26 +346,26 @@
                       AXIS2_ERROR_GET_MESSAGE(env->error));
               return AXIS2_FAILURE;
             }
-            svc_client = AXIS2_STUB_GET_SVC_CLIENT (stub, env );
-            soap_action = AXIS2_OPTIONS_GET_ACTION ( options, env );
+            svc_client = axis2_stub_get_svc_client (stub, env );
+            soap_action = axis2_options_get_action ( options, env );
             if ( NULL == soap_action )
             {
               soap_action = "<xsl:value-of select="$soapAction"/>";
-              AXIS2_OPTIONS_SET_ACTION( options, env, soap_action );
+              axis2_options_set_action( options, env, soap_action );
             }
             <xsl:choose>
              <xsl:when test="$soapVersion='1.2'">
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP12 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP12 );
              </xsl:when>
              <xsl:otherwise>
-            AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11 );
+            axis2_options_set_soap_version(options, env, AXIOM_SOAP11 );
              </xsl:otherwise>
             </xsl:choose>
-            op_qname = axis2_qname_create(env,
+            op_qname = axutil_qname_create(env,
                                         "<xsl:value-of select="@localpart"/>" ,
                                         "<xsl:value-of select="@namespace"/>",
                                         NULL);
-            status =  AXIS2_SVC_CLIENT_SEND_ROBUST_WITH_OP_QNAME( svc_client, env, op_qname,
payload);
+            status =  axis2_svc_client_send_robust_with_op_qname( svc_client, env, op_qname,
payload);
             return status;
 
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message