axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dushshan...@apache.org
Subject svn commit: r521228 - in /webservices/axis2/trunk/c/modules/core/deployment: arch_reader.c axis2_svc_grp_builder.h svc_grp_builder.c
Date Thu, 22 Mar 2007 11:50:26 GMT
Author: dushshantha
Date: Thu Mar 22 04:50:25 2007
New Revision: 521228

URL: http://svn.apache.org/viewvc?view=rev&rev=521228
Log:
removed macros


Modified:
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=521228&r1=521227&r2=521228
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Thu Mar 22 04:50:25 2007
@@ -223,7 +223,7 @@
         axis2_svc_grp_builder_t *grp_builder = NULL;
         grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
             svcs, dep_engine);
-        status = AXIS2_SVC_GRP_BUILDER_POPULATE_SVC_GRP(grp_builder, env, svc_grp);
+        status = axis2_svc_grp_builder_populate_svc_grp(grp_builder, env, svc_grp);
         axis2_dep_engine_add_svc_grp_builder(dep_engine, env, grp_builder);
     }
     return status;

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h?view=diff&rev=521228&r1=521227&r2=521228
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h Thu Mar 22 04:50:25
2007
@@ -102,20 +102,6 @@
         axiom_node_t *svc,
         axis2_dep_engine_t *dep_engine);
 
-/** Frees the service group builder. */
-#define AXIS2_SVC_GRP_BUILDER_FREE(svc_grp_builder, env) \
-      axis2_svc_grp_builder_free (svc_grp_builder, env)
-
-/** Populates the service group. */
-#define AXIS2_SVC_GRP_BUILDER_POPULATE_SVC_GRP(svc_grp_builder, env, svc_grp) \
-      axis2_svc_grp_builder_populate_svc_grp (svc_grp_builder, env, svc_grp)
-
-/** Process module refs. */
-#define AXIS2_SVC_GRP_BUILDER_PROCESS_MODULE_REFS(svc_grp_builder, env, \
-        module_refs, svc_grp) \
-      axis2_svc_grp_builder_process_module_refs (svc_grp_builder, env, \
-            module_refs, svc_grp)
-
 /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=521228&r1=521227&r2=521228
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Thu Mar 22 04:50:25
2007
@@ -24,16 +24,14 @@
 };
 
 AXIS2_EXTERN axis2_svc_grp_builder_t *AXIS2_CALL
-axis2_svc_grp_builder_create(
-    const axis2_env_t *env)
+axis2_svc_grp_builder_create(const axis2_env_t *env)
 {
     axis2_svc_grp_builder_t *svc_grp_builder = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    svc_grp_builder = (axis2_svc_grp_builder_t *) AXIS2_MALLOC(env->
-            allocator, sizeof(axis2_svc_grp_builder_t));
-
+    svc_grp_builder = (axis2_svc_grp_builder_t *) AXIS2_MALLOC(env->allocator,
+        sizeof(axis2_svc_grp_builder_t));
 
     if (! svc_grp_builder)
     {
@@ -48,15 +46,14 @@
 }
 
 AXIS2_EXTERN axis2_svc_grp_builder_t *AXIS2_CALL
-axis2_svc_grp_builder_create_with_svc_and_dep_engine(
-    const axis2_env_t *env,
+axis2_svc_grp_builder_create_with_svc_and_dep_engine(const axis2_env_t *env,
     axiom_node_t *svc_grp,
     axis2_dep_engine_t *dep_engine)
 {
     axis2_svc_grp_builder_t *svc_grp_builder = NULL;
 
     svc_grp_builder = (axis2_svc_grp_builder_t *)
-            axis2_svc_grp_builder_create(env);
+        axis2_svc_grp_builder_create(env);
     if (!svc_grp_builder)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -75,8 +72,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_svc_grp_builder_free(
-    axis2_svc_grp_builder_t *svc_grp_builder,
+axis2_svc_grp_builder_free(axis2_svc_grp_builder_t *svc_grp_builder,
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -84,7 +80,7 @@
     if (svc_grp_builder->desc_builder)
     {
         axis2_desc_builder_free(svc_grp_builder->desc_builder,
-                env);
+            env);
     }
     if (svc_grp_builder)
     {
@@ -95,8 +91,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_svc_grp_builder_populate_svc_grp(
-    axis2_svc_grp_builder_t *svc_grp_builder,
+axis2_svc_grp_builder_populate_svc_grp(axis2_svc_grp_builder_t *svc_grp_builder,
     const axis2_env_t *env,
     axis2_svc_grp_t *svc_grp)
 {
@@ -115,8 +110,8 @@
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
 
     itr = axiom_element_get_children_with_qname(svc_grp_element, env, qparamst,
-            svc_grp_builder->svc_grp);
-    
+        svc_grp_builder->svc_grp);
+
     if (qparamst)
     {
         axis2_qname_free(qparamst, env);
@@ -125,13 +120,13 @@
 
     parent =  axis2_svc_grp_get_parent(svc_grp, env);
     status = axis2_desc_builder_process_params(svc_grp_builder->desc_builder, env, itr,

-            axis2_svc_grp_get_param_container(svc_grp, env), 
-            axis2_conf_get_param_container(parent, env));
+        axis2_svc_grp_get_param_container(svc_grp, env), 
+        axis2_conf_get_param_container(parent, env));
 
     /* Processing service modules required to be engaged globally */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
     module_ref_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
-            qmodulest, svc_grp_builder->svc_grp);
+        qmodulest, svc_grp_builder->svc_grp);
 
     if (qmodulest)
     {
@@ -140,10 +135,10 @@
     }
 
     axis2_svc_grp_builder_process_module_refs(svc_grp_builder, env, module_ref_itr,
-            svc_grp);
+        svc_grp);
     qsvc_element = axis2_qname_create(env, AXIS2_SVC_ELEMENT, NULL, NULL);
     svc_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
-            qsvc_element, svc_grp_builder->svc_grp);
+        qsvc_element, svc_grp_builder->svc_grp);
 
     if (qsvc_element)
     {
@@ -160,7 +155,7 @@
         axis2_qname_t *qattname = NULL;
 
         svc_node = (axiom_node_t *) axiom_children_qname_iterator_next(
-                    svc_itr, env);
+            svc_itr, env);
         svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
         svc_name_att = axiom_element_get_attribute(svc_element, env, qattname);
@@ -175,7 +170,7 @@
         if (! svc_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_NAME_ERROR,
-                    AXIS2_FAILURE);
+                AXIS2_FAILURE);
             return AXIS2_FAILURE;
         }
         else
@@ -202,7 +197,7 @@
             /* the service that has to be deployed */
 
             deployable_svcs = axis2_arch_file_data_get_deployable_svcs(file_data,
-                    env);
+                env);
             axis2_array_list_add(deployable_svcs, env, axis_svc);
             AXIS2_SVC_SET_PARENT(axis_svc, env, svc_grp);
             svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
@@ -217,8 +212,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_svc_grp_builder_process_module_refs(
-    axis2_svc_grp_builder_t *svc_grp_builder,
+axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *svc_grp_builder,
     const axis2_env_t *env,
     axiom_children_qname_iterator_t *module_refs ,
     axis2_svc_grp_t *svc_grp)
@@ -234,12 +228,12 @@
         axiom_attribute_t *module_ref_att = NULL;
         axis2_qname_t *qref = NULL;
 
-        module_ref_node = (axiom_node_t *) axiom_children_qname_iterator_next(
-                    module_refs, env);
+        module_ref_node = (axiom_node_t *) 
+            axiom_children_qname_iterator_next(module_refs, env);
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
         module_ref_att = axiom_element_get_attribute(module_ref_element, env,
-                qref);
+            qref);
         if (module_ref_att)
         {
             axis2_char_t *ref_name = NULL;
@@ -255,7 +249,7 @@
             if (! module)
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
-                        AXIS2_FAILURE);
+                    AXIS2_FAILURE);
                 return AXIS2_FAILURE;
             }
             else



---------------------------------------------------------------------
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