axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r379080 - in /webservices/axis2/trunk/c: include/axis2_soap_header_block.h modules/xml/soap/soap_body.c modules/xml/soap/soap_builder.c modules/xml/soap/soap_header.c modules/xml/soap/soap_header_block.c
Date Mon, 20 Feb 2006 11:03:11 GMT
Author: nandika
Date: Mon Feb 20 03:03:09 2006
New Revision: 379080

URL: http://svn.apache.org/viewcvs?rev=379080&view=rev
Log:
set_soap_version method removed

Modified:
    webservices/axis2/trunk/c/include/axis2_soap_header_block.h
    webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_header.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c

Modified: webservices/axis2/trunk/c/include/axis2_soap_header_block.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_header_block.h?rev=379080&r1=379079&r2=379080&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_header_block.h Mon Feb 20 03:03:09 2006
@@ -121,10 +121,7 @@
         int (AXIS2_CALL *get_soap_version)  
                             (axis2_soap_header_block_t *header_block,
                              axis2_env_t **env);
-        int (AXIS2_CALL *set_soap_version)  
-                            (axis2_soap_header_block_t *header_block,
-                             axis2_env_t **env,
-                             int soap_version);
+       
     };
 
   /**
@@ -152,16 +149,6 @@
                                            axis2_om_namespace_t *ns,
                                            struct axis2_soap_header *parent);
                             
-AXIS2_DECLARE(axis2_soap_header_block_t *)
-axis2_soap11_header_block_create_with_parent(axis2_env_t **env,
-                                           axis2_char_t *localname,
-                                           axis2_om_namespace_t *ns,
-                                           struct axis2_soap_header *parent);
-AXIS2_DECLARE(axis2_soap_header_block_t *)
-axis2_soap12_header_block_create_with_parent(axis2_env_t **env,
-                                           axis2_char_t *localname,
-                                           axis2_om_namespace_t *ns,
-                                           struct axis2_soap_header *parent);           
                                                            
 /******************** Macros **************************************************/
     
 /** free soap_header_block */
@@ -195,9 +182,6 @@
         
 #define AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env) \
         ((header_block)->ops->get_base_node(header_block, env))   
-        
-#define AXIS2_SOAP_HEADER_BLOCK_SET_SOAP_VERSION(header_block, env, version) \
-        ((header_block)->ops->set_soap_version(header_block, env, version))
         
 #define AXIS2_SOAP_HEADER_BLOCK_GET_SOAP_VERSION(header_block, env) \
         ((header_block)->ops->get_soap_version(header_block, env))

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_body.c?rev=379080&r1=379079&r2=379080&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_body.c Mon Feb 20 03:03:09 2006
@@ -76,11 +76,6 @@
                                  
                                  
 axis2_status_t AXIS2_CALL 
-axis2_soap_body_set_soap_version(axis2_soap_body_t *body,
-                                 axis2_env_t **env,
-                                 int soap_version);
-                                 
-axis2_status_t AXIS2_CALL 
 axis2_soap_body_set_builder(axis2_soap_body_t *body,
                             axis2_env_t **env,
                             axis2_soap_builder_t *builder);   
@@ -381,16 +376,6 @@
     return AXIS2_INTF_TO_IMPL(body)->soap_version;    
 }
                                              
-axis2_status_t AXIS2_CALL 
-axis2_soap_body_set_soap_version(axis2_soap_body_t *body,
-                                   axis2_env_t **env,
-                                   int soap_version)
-{
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_INTF_TO_IMPL(body)->soap_version = soap_version;
-    return AXIS2_SUCCESS;
-}
-
 axis2_status_t AXIS2_CALL 
 axis2_soap_body_set_builder(axis2_soap_body_t *body,
                             axis2_env_t **env,

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c?rev=379080&r1=379079&r2=379080&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c Mon Feb 20 03:03:09 2006
@@ -471,7 +471,7 @@
             builder_impl->header_present = AXIS2_TRUE;
             soap_header = axis2_soap_header_create(env);
             AXIS2_SOAP_HEADER_SET_BASE_NODE(soap_header, env, om_element_node);
-/*            AXIS2_SOAP_HEADER_SET_SOAP_VERSION(soap_header, env, builder_impl->soap_version);
*/
+
             AXIS2_SOAP_ENVELOPE_SET_HEADER(builder_impl->soap_envelope, env, soap_header);
             AXIS2_SOAP_HEADER_SET_BUILDER(soap_header, env, builder);
             status = axis2_soap_builder_process_namespace_data(builder, env, 
@@ -517,7 +517,7 @@
             axis2_soap_header_t *soap_header = NULL;
             header_block = axis2_soap_header_block_create(env);
             AXIS2_SOAP_HEADER_BLOCK_SET_BASE_NODE(header_block, env, om_element_node);
-            AXIS2_SOAP_HEADER_BLOCK_SET_SOAP_VERSION(header_block, env, builder_impl->soap_version);
+           
             soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope,
env);
             AXIS2_SOAP_HEADER_SET_HEADER_BLOCK(soap_header, env, header_block);
 

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_header.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_header.c?rev=379080&r1=379079&r2=379080&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_header.c Mon Feb 20 03:03:09 2006
@@ -258,18 +258,7 @@
     AXIS2_PARAM_CHECK((*env)->error, ns, NULL);
     header_impl = AXIS2_INTF_TO_IMPL(header);
     
-    if(header_impl->soap_version == AXIS2_SOAP11)
-    {
-        header_block = 
-        axis2_soap11_header_block_create_with_parent(env,
-                    localname, ns, header);
-    }
-    if(header_impl->soap_version == AXIS2_SOAP12)
-    {
-        header_block =
-        axis2_soap12_header_block_create_with_parent(env, 
-                localname, ns, header);            
-    }
+    header_block = axis2_soap_header_block_create_with_parent(env, localname, ns, header);
     
     header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(
                             header_block, env);

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c?rev=379080&r1=379079&r2=379080&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c Mon Feb 20 03:03:09 2006
@@ -75,10 +75,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_soap_header_block_set_processed
                         (axis2_soap_header_block_t *header_block,
-                         axis2_env_t **env);                                            
                                                                                         
                                             
-                                                                                        
                                   
-                            
-axis2_char_t* AXIS2_CALL 
+                         axis2_env_t **env);                                            
                                                                         axis2_char_t* AXIS2_CALL

 axis2_soap_header_block_get_role
                         (axis2_soap_header_block_t *header_block,
                          axis2_env_t **env);
@@ -165,16 +162,13 @@
         axis2_soap_header_block_set_processed;
     header_block_impl->header_block.ops->get_role =
         axis2_soap_header_block_get_role;
-    header_block_impl->header_block.ops->set_soap_version =
-        axis2_soap_header_block_set_soap_version;
+
     header_block_impl->header_block.ops->get_soap_version =
         axis2_soap_header_block_get_soap_version;
     header_block_impl->header_block.ops->set_base_node =
         axis2_soap_header_block_set_base_node;
     header_block_impl->header_block.ops->get_base_node =
         axis2_soap_header_block_get_base_node;    
-            
-
     return &(header_block_impl->header_block);
 }
 
@@ -204,6 +198,8 @@
 
     header_block_impl->om_ele_node = this_node; 
     AXIS2_SOAP_HEADER_SET_HEADER_BLOCK(header, env, header_block);
+    header_block_impl->soap_version = 
+        AXIS2_SOAP_HEADER_GET_SOAP_VERSION(header, env);
     return &(header_block_impl->header_block);                                
 }
 
@@ -516,44 +512,4 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(header_block)->soap_version;
 }
-axis2_status_t AXIS2_CALL 
-axis2_soap_header_block_set_soap_version  
-                        (axis2_soap_header_block_t *header_block,
-                         axis2_env_t **env,
-                         int soap_version)
-{
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
-    AXIS2_INTF_TO_IMPL(header_block)->soap_version = soap_version;
-    return AXIS2_SUCCESS;
-}
-/******************** soap11 **************************************************/
-AXIS2_DECLARE(axis2_soap_header_block_t *)
-axis2_soap11_header_block_create_with_parent(axis2_env_t **env,
-                                           axis2_char_t *localname,
-                                           axis2_om_namespace_t *ns,
-                                           axis2_soap_header_t *header)
-{
-    axis2_soap_header_block_t *header_block = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
-    header_block = axis2_soap_header_block_create_with_parent(env, localname, ns, header);
-    if(!header_block)
-        return NULL;
-    axis2_soap_header_block_set_soap_version(header_block, env, AXIS2_SOAP11);
-    return header_block;
-}                                           
-/******************** soap12 **************************************************/        
                                  
-AXIS2_DECLARE(axis2_soap_header_block_t *)
-axis2_soap12_header_block_create_with_parent(axis2_env_t **env,
-                                           axis2_char_t *localname,
-                                           axis2_om_namespace_t *ns,
-                                           axis2_soap_header_t *header)
-{
-    axis2_soap_header_block_t *header_block = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
-    header_block = axis2_soap_header_block_create_with_parent(env, localname, ns, header);
-    if(!header_block)
-        return NULL;
-    axis2_soap_header_block_set_soap_version(header_block, env, AXIS2_SOAP12);
-    return header_block;
-}
+



Mime
View raw message