axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r427560 - in /webservices/axis2/trunk/c: modules/core/deployment/ modules/core/description/ modules/core/phaseresolver/ rampart/ rampart/src/ rampart/src/core/ rampart/src/handlers/ rampart/src/util/ samples/client/echo/
Date Tue, 01 Aug 2006 12:39:34 GMT
Author: damitha
Date: Tue Aug  1 05:39:33 2006
New Revision: 427560

URL: http://svn.apache.org/viewvc?rev=427560&view=rev
Log:
Please refer Jira AXIS2C-220


Modified:
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/rampart/Makefile.am
    webservices/axis2/trunk/c/rampart/src/Makefile.am
    webservices/axis2/trunk/c/rampart/src/core/Makefile.am
    webservices/axis2/trunk/c/rampart/src/core/mod_rampart.c
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
    webservices/axis2/trunk/c/samples/client/echo/echo.c

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Aug  1 05:39:33 2006
@@ -1047,9 +1047,10 @@
 }
 
 static axis2_status_t
-axis2_dep_engine_add_new_svc(axis2_dep_engine_t *dep_engine,
-                                const axis2_env_t *env,
-                                axis2_svc_grp_t *svc_metadata)
+axis2_dep_engine_add_new_svc(
+        axis2_dep_engine_t *dep_engine,
+            const axis2_env_t *env,
+            axis2_svc_grp_t *svc_metadata)
 {
     axis2_dep_engine_impl_t *dep_engine_impl = NULL;
     axis2_array_list_t *svcs = NULL;
@@ -1060,7 +1061,8 @@
     AXIS2_PARAM_CHECK(env->error, svc_metadata, AXIS2_FAILURE);
     dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
-    svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(dep_engine_impl->curr_file, env);
+    svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(dep_engine_impl->curr_file, 
+            env);
     if(svcs) 
         sizei = AXIS2_ARRAY_LIST_SIZE(svcs, env);
     
@@ -1103,6 +1105,8 @@
             } 
             else 
             {
+                AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+                        "Invalid module reference taken from conf");
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODUELE_REF,
                     AXIS2_FAILURE);
                 return AXIS2_FAILURE;
@@ -1117,7 +1121,7 @@
             axis2_module_desc_t *module_desc = NULL;
             axis2_qname_t *qmodulename = NULL;
             
-            qmodulename = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(grp_modules, 
+            qmodulename = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(list, 
                 env, j);
             module_desc = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
                 qmodulename);
@@ -1128,6 +1132,8 @@
             } 
             else 
             {
+                AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+                        "Invalid module reference taken from conf");
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODUELE_REF,
                     AXIS2_FAILURE);
                 return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Tue Aug  1 05:39:33 2006
@@ -1090,10 +1090,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_svc_engage_module(axis2_svc_t *svc,
-                            const axis2_env_t *env,
-                            axis2_module_desc_t * moduleref,
-                            axis2_conf_t * conf)
+axis2_svc_engage_module(
+        axis2_svc_t *svc,
+        const axis2_env_t *env,
+        axis2_module_desc_t * moduleref,
+        axis2_conf_t * conf)
 {
     axis2_module_desc_t * modu = NULL;
     axis2_array_list_t *collection_module = NULL;
@@ -1305,8 +1306,7 @@
             
         if(AXIS2_QNAME_EQUALS(module_d_name, env, module_d_name_l))
         {
-            /*AXIS2_ERROR_SET(env->error, 
-                AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC, AXIS2_FAILURE);*/
+            /* Module is already engaged. So we return */
             return AXIS2_SUCCESS;
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Aug  1 05:39:33
2006
@@ -1548,14 +1548,14 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_phase_resolver_engage_module_to_op(axis2_phase_resolver_t *phase_resolver,
-                                            const axis2_env_t *env,
-                                            axis2_op_t *axis_op,
-                                            axis2_module_desc_t *module_desc)
+axis2_phase_resolver_engage_module_to_op(
+        axis2_phase_resolver_t *phase_resolver,
+            const axis2_env_t *env,
+            axis2_op_t *axis_op,
+            axis2_module_desc_t *module_desc)
 {
     axis2_phase_resolver_impl_t *resolver_impl = NULL;
     int type = 0;
-    axis2_status_t status = AXIS2_FAILURE;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, axis_op, AXIS2_FAILURE);
@@ -1639,31 +1639,34 @@
                 axis2_handler_desc_t *metadata = NULL;
                 axis2_char_t *phase_name = NULL;
                 axis2_phase_rule_t *phase_rule = NULL;
+                axis2_status_t status = AXIS2_FAILURE;
 
                 metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
                 phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
                 phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
-                /*if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
+                if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
                     (0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
                     (0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
                     (0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
-                {*/
+                {
                     status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder,

                         env, metadata);
-                    if (status != AXIS2_SUCCESS)
+                    if(AXIS2_SUCCESS != status)
                     {
-                       axis2_phase_resolver_engage_to_global_chain(phase_resolver, env, module_desc);
+                        AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+                            "Handler inclusion failed for %s phase", phase_name);
+                        return status;
                     }
            
-                /*} 
+                } 
                 else 
                 {
                     AXIS2_ERROR_SET(env->error, 
                         AXIS2_ERROR_SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, 
                             AXIS2_FAILURE);
-                    continue;
+                    return AXIS2_FAILURE;
                     
-                }*/
+                }
             }
         }
     }

Modified: webservices/axis2/trunk/c/rampart/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/Makefile.am?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/Makefile.am Tue Aug  1 05:39:33 2006
@@ -1,4 +1,4 @@
-SUBDIRS = src samples
+SUBDIRS = src
 include_HEADERS=$(top_builddir)/include/*.h
 EXTRA_DIST = LICENSE build.sh autogen.sh
 

Modified: webservices/axis2/trunk/c/rampart/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/Makefile.am?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/Makefile.am Tue Aug  1 05:39:33 2006
@@ -1 +1 @@
-SUBDIRS = omxmlsec handlers util core data 
+SUBDIRS = handlers util core data 

Modified: webservices/axis2/trunk/c/rampart/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/core/Makefile.am?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/core/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/core/Makefile.am Tue Aug  1 05:39:33 2006
@@ -7,9 +7,7 @@
 			mod_rampart.c
 
 libmod_rampart_la_LIBADD  = ../handlers/librampart_handlers.la \
-			    ../util/librampart_util.la \
-                ../omxmlsec/libomxmlsec.la \
-                ../omxmlsec/openssl/libomopenssl.la
+			    ../util/librampart_util.la
 
 INCLUDES = -I$(top_builddir)/include \
 			@UTILINC@

Modified: webservices/axis2/trunk/c/rampart/src/core/mod_rampart.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/core/mod_rampart.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/core/mod_rampart.c (original)
+++ webservices/axis2/trunk/c/rampart/src/core/mod_rampart.c Tue Aug  1 05:39:33 2006
@@ -15,6 +15,7 @@
  */
 #include <axis2_module.h>
 #include <rampart_mod.h>
+#include <axis2_conf_ctx.h>
 
 axis2_status_t AXIS2_CALL
 mod_rampart_shutdown(axis2_module_t *module,

Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c Tue Aug  1 05:39:33
2006
@@ -103,7 +103,7 @@
     axis2_array_list_t *action_list = NULL;
     axis2_param_t *param_action = NULL;
     axis2_char_t *items = NULL;
-    axis2_status_t enc_status =  AXIS2_FAILURE;
+    axis2_status_t enc_status = AXIS2_FAILURE;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK (env->error, msg_ctx, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Tue Aug  1 05:39:33
2006
@@ -27,6 +27,7 @@
 #include <rampart_callback.h>
 #include <axis2_dll_desc.h>
 #include <axis2_class_loader.h>
+#include <axis2_conf_ctx.h>
 
 AXIS2_EXTERN axis2_param_t* AXIS2_CALL
 rampart_get_security_param( const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?rev=427560&r1=427559&r2=427560&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Tue Aug  1 05:39:33 2006
@@ -39,7 +39,7 @@
     env = axis2_env_create_all("echo.log", AXIS2_LOG_LEVEL_TRACE);
 
     /* Set end point reference of echo service */
-    address = "http://localhost:9090/axis2/services/echo";
+    address = "http://localhost:5555/axis2/services/echo";
     if (argc > 1 )
         address = argv[1];
     if (AXIS2_STRCMP(address, "-h") == 0)



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