axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r640765 - in /webservices/axis2/trunk/c/src/core: deployment/conf_init.c phaseresolver/phase_resolver.c
Date Tue, 25 Mar 2008 10:51:19 GMT
Author: damitha
Date: Tue Mar 25 03:51:03 2008
New Revision: 640765

URL: http://svn.apache.org/viewvc?rev=640765&view=rev
Log:
Refer AXIS2C-1082

Modified:
    webservices/axis2/trunk/c/src/core/deployment/conf_init.c
    webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c

Modified: webservices/axis2/trunk/c/src/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_init.c?rev=640765&r1=640764&r2=640765&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/conf_init.c Tue Mar 25 03:51:03 2008
@@ -47,12 +47,9 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_dep_engine_t *dep_engine = NULL;
     axis2_conf_t *conf = NULL;
-    axis2_phase_resolver_t *phase_resolver = NULL;
     axutil_property_t *property = NULL;
     axis2_ctx_t *conf_ctx_base = NULL;
 
-    AXIS2_ENV_CHECK(env, NULL);
-
     dep_engine = axis2_dep_engine_create_with_repos_name(env, repo_name);
     if (!dep_engine)
     {
@@ -71,15 +68,6 @@
     }
     axis2_conf_set_dep_engine(conf, env, dep_engine);
 
-    phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
-    if (!phase_resolver)
-    {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-            "phase resolver create with config failed. phase resolver value "\
-            "is NULL");
-        return NULL;
-    }
-
     conf_ctx = axis2_conf_ctx_create(env, conf);
     if (!conf_ctx)
     {
@@ -91,14 +79,11 @@
     conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
     property = axutil_property_create_with_args(env, 2, 0, 0, AXIS2_VALUE_TRUE);
     axis2_ctx_set_property(conf_ctx_base, env, AXIS2_IS_SVR_SIDE, property);
-    axis2_phase_resolver_build_chains(phase_resolver, env);
 
     axis2_init_modules(env, conf_ctx);
     axis2_load_services(env, conf_ctx);
     axis2_init_transports(env, conf_ctx);
 
-    axis2_phase_resolver_free(phase_resolver, env);
-
     return conf_ctx;
 }
 
@@ -111,9 +96,6 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_dep_engine_t *dep_engine = NULL;
     axis2_conf_t *conf = NULL;
-    axis2_phase_resolver_t *phase_resolver = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
 
     dep_engine = axis2_dep_engine_create_with_axis2_xml (env, file);
     if (!dep_engine)
@@ -135,16 +117,6 @@
     }
 	
     axis2_conf_set_dep_engine(conf, env, dep_engine);
-    phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
-    if (!phase_resolver)
-    {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                        "phase resolver create with config failed."
-						" phase resolver value is NULL");
-        return NULL;
-    }
-
-	
 	
     conf_ctx = axis2_conf_ctx_create(env, conf);
     if (!conf_ctx)
@@ -154,14 +126,10 @@
         return NULL;
     }
 
-    axis2_phase_resolver_build_chains(phase_resolver, env);
-
     axis2_init_modules(env, conf_ctx);
     axis2_load_services(env, conf_ctx);
     axis2_init_transports(env, conf_ctx);
 
-    axis2_phase_resolver_free(phase_resolver, env);
-
     return conf_ctx;
 }
 
@@ -173,15 +141,12 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_dep_engine_t *dep_engine = NULL;
     axis2_conf_t *conf = NULL;
-    axis2_phase_resolver_t *phase_resolver = NULL;
     axutil_property_t *property = NULL;
     axis2_ctx_t *conf_ctx_base = NULL;
 
     axis2_status_t status;
     unsigned int len = 0;
 
-    AXIS2_ENV_CHECK(env, NULL);
-
     /* building conf using axis2.xml, in that case we check whether
      * last 9 characters of the axis2_home equals to the "axis2.xml"
      * else treat it as a directory 
@@ -233,15 +198,6 @@
     }
     axis2_conf_set_dep_engine(conf, env, dep_engine);
 
-    phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
-    if (!phase_resolver)
-    {
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
-                        "phase resolver create with config failed. \
-phase resolver value is NULL");
-        return NULL;
-    }
-
     conf_ctx = axis2_conf_ctx_create(env, conf);
     if (!conf_ctx)
     {
@@ -252,13 +208,10 @@
     conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
     property = axutil_property_create_with_args(env, 2, 0, 0, AXIS2_VALUE_FALSE);
     axis2_ctx_set_property(conf_ctx_base, env, AXIS2_IS_SVR_SIDE, property);
-    axis2_phase_resolver_build_chains(phase_resolver, env);
 
     axis2_init_modules(env, conf_ctx);
     axis2_init_transports(env, conf_ctx);
 
-    axis2_phase_resolver_free(phase_resolver, env);
-
     return conf_ctx;
 }
 
@@ -270,7 +223,6 @@
     axis2_conf_t *conf = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
 
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -320,7 +272,6 @@
     axis2_conf_t *conf = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
 
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -402,7 +353,6 @@
     axis2_conf_t *conf = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
 
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -456,3 +406,4 @@
 
     return status;
 }
+

Modified: webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c?rev=640765&r1=640764&r2=640765&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c Tue Mar 25 03:51:03
2008
@@ -175,7 +175,6 @@
                                                                  env, j, op);
         }
     }
-
     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