axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r501294 - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/core/engine/ modules/core/phaseresolver/ samples/server/
Date Tue, 30 Jan 2007 02:14:41 GMT
Author: samisa
Date: Mon Jan 29 18:14:40 2007
New Revision: 501294

URL: http://svn.apache.org/viewvc?view=rev&rev=501294
Log:
Fixed axis2.xml file, removing some outdated comments. Also did some improvements to phase
names and const strings

Modified:
    webservices/axis2/trunk/c/include/axis2_phase_meta.h
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/modules/core/engine/phase.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/samples/server/axis2.xml

Modified: webservices/axis2/trunk/c/include/axis2_phase_meta.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase_meta.h?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_meta.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_meta.h Mon Jan 29 18:14:40 2007
@@ -46,7 +46,7 @@
 /*#define  AXIS2_FAULT_OUT_FLOW 4*/
 
 /** phase transport in */
-#define AXIS2_PHASE_TRANSPORTIN "TransportIn"
+#define AXIS2_PHASE_TRANSPORT_IN "Transport"
 /** phase pre dispatch */
 #define AXIS2_PHASE_PRE_DISPATCH "PreDispatch"
 /** phase dispatch */
@@ -60,8 +60,6 @@
 
 /** phase message out */
 #define AXIS2_PHASE_MESSAGE_OUT "MessageOut"
-/** phase transport out */
-#define AXIS2_PHASE_TRANSPORT_OUT "MessageOut"
 
 /**
  * All the handlers inside transport_sender and tranport_recievre in axis2.xml gose

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?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Jan 29 18:14:40 2007
@@ -1051,7 +1051,7 @@
         phase2 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 2);
         phase3 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 3);
     }
-    if ((phase0 && 0 != AXIS2_STRCMP(phase0, AXIS2_PHASE_TRANSPORTIN)) ||
+    if ((phase0 && 0 != AXIS2_STRCMP(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
             (phase1 && 0 != AXIS2_STRCMP(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
             (phase2 && 0 != AXIS2_STRCMP(phase2, AXIS2_PHASE_DISPATCH)) ||
             (phase3 && 0 != AXIS2_STRCMP(phase3, AXIS2_PHASE_POST_DISPATCH)))
@@ -1581,6 +1581,7 @@
             }
             AXIS2_ARCH_READER_FREE(arch_reader, env);
         }
+        printf("end do dep\n");
     }
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Mon Jan 29 18:14:40 2007
@@ -474,7 +474,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    phase = axis2_hash_get(phases_info_impl->op_in_phases, 
+    /*phase = axis2_hash_get(phases_info_impl->op_in_phases, 
         AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING);
     if(!phase)
     {
@@ -491,7 +491,7 @@
         AXIS2_ARRAY_LIST_FREE(op_in_phases, env);
         op_in_phases = NULL;
         return NULL;
-    }
+    }*/
     if (!phases_info_impl->in_phases)
     {
         return op_in_phases;
@@ -501,7 +501,7 @@
     {
         phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(
                     phases_info_impl->in_phases, env, i);
-        if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name) ||
+        if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
             0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
             0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name) ||
             0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name))
@@ -571,42 +571,35 @@
     {
         phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(phases_info_impl->
                 out_phases, env, i);
-        if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_OUT, phase_name))
-        {
-            /* Do Nothing */
+        phase = axis2_hash_get(phases_info_impl->op_out_phases, phase_name, 
+            AXIS2_HASH_KEY_STRING);
+        if(!phase)
+        {
+            phase = axis2_phase_create(env, phase_name);
+            axis2_hash_set(phases_info_impl->op_out_phases, phase_name,
+                AXIS2_HASH_KEY_STRING, phase);
         }
-        else
+        status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
+        if (AXIS2_SUCCESS != status)
         {
-            phase = axis2_hash_get(phases_info_impl->op_out_phases, phase_name, 
-                AXIS2_HASH_KEY_STRING);
-            if(!phase)
-            {
-                phase = axis2_phase_create(env, phase_name);
-                axis2_hash_set(phases_info_impl->op_out_phases, phase_name,
-                    AXIS2_HASH_KEY_STRING, phase);
-            }
-            status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
-            if (AXIS2_SUCCESS != status)
-            {
-                int i = 0;
-                int size = 0;
+            int i = 0;
+            int size = 0;
 
+            AXIS2_PHASE_FREE(phase, env);
+            phase = NULL;
+            size = AXIS2_ARRAY_LIST_SIZE(op_out_phases, env);
+            for (i = 0; i < size; i++)
+            {
+                phase = AXIS2_ARRAY_LIST_GET(op_out_phases, env, i);
                 AXIS2_PHASE_FREE(phase, env);
                 phase = NULL;
-                size = AXIS2_ARRAY_LIST_SIZE(op_out_phases, env);
-                for (i = 0; i < size; i++)
-                {
-                    phase = AXIS2_ARRAY_LIST_GET(op_out_phases, env, i);
-                    AXIS2_PHASE_FREE(phase, env);
-                    phase = NULL;
-                }
-                AXIS2_ARRAY_LIST_FREE(op_out_phases, env);
-                op_out_phases = NULL;
-                return NULL;
             }
+            AXIS2_ARRAY_LIST_FREE(op_out_phases, env);
+            op_out_phases = NULL;
+            return NULL;
         }
     }
-    phase = axis2_hash_get(phases_info_impl->op_out_phases, 
+    /*phase = axis2_hash_get(phases_info_impl->op_out_phases, 
         AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING);
     if(!phase)
     {
@@ -641,8 +634,13 @@
         axis2_hash_set(phases_info_impl->op_out_phases, 
             AXIS2_PHASE_MESSAGE_OUT, AXIS2_HASH_KEY_STRING, phase);
     }
-    status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
-    if (AXIS2_SUCCESS != status)
+
+    if(phase)
+    {
+        status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
+    }
+    
+    if (AXIS2_SUCCESS != status || !phase)
     {
         int i = 0;
         int size = 0;
@@ -660,7 +658,7 @@
         op_out_phases = NULL;
         return NULL;
 
-    }
+    }*/
     return op_out_phases;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Jan 29 18:14:40 2007
@@ -449,7 +449,7 @@
     {
         axis2_disp_t *uri_dispatch = NULL;
 
-        phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORTIN);
+        phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORT_IN);
         if (NULL == phase)
         {
             axis2_conf_free(&(config_impl->conf), env);

Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Mon Jan 29 18:14:40 2007
@@ -357,7 +357,7 @@
             {
                 AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
                         "Invoke the handler %s within the phase %s",
-                        AXIS2_HANDLER_GET_NAME(handler, env),
+                        axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
                         phase_impl->name);
                 status = AXIS2_HANDLER_INVOKE(handler, env, msg_ctx);
                 if (status != AXIS2_SUCCESS)

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Mon Jan 29 18:14:40
2007
@@ -197,7 +197,8 @@
         phase = axis2_phase_holder_get_phase(phase_holder, env, phase_name);
         status = AXIS2_PHASE_ADD_HANDLER_DESC(phase, env, handler);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Add handler %s to phase %s",
-                AXIS2_HANDLER_DESC_GET_NAME(handler, env), phase_name);
+                axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler, env), env),

+                phase_name);
     }
     else
     {

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?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Jan 29 18:14:40
2007
@@ -426,7 +426,7 @@
                 {
                     return AXIS2_FAILURE;
                 }
-                if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
+                if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, 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)))
@@ -541,7 +541,7 @@
                 return AXIS2_FAILURE;
 
             }
-            else if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) ||
+            else if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, 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)))
@@ -1236,7 +1236,7 @@
                     {
                         return AXIS2_FAILURE;
                     }
-                    if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
+                    if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, 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)))
@@ -1380,7 +1380,7 @@
                 {
                     return AXIS2_FAILURE;
                 }
-                if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) ||
+                if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, 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)))
@@ -1582,7 +1582,7 @@
                 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_TRANSPORT_IN, 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)))
@@ -1598,7 +1598,7 @@
                     }
 
                 }
-                if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) ||
+                if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, 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)))

Modified: webservices/axis2/trunk/c/samples/server/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/axis2.xml?view=diff&rev=501294&r1=501293&r2=501294
==============================================================================
--- webservices/axis2/trunk/c/samples/server/axis2.xml (original)
+++ webservices/axis2/trunk/c/samples/server/axis2.xml Mon Jan 29 18:14:40 2007
@@ -90,64 +90,31 @@
     <!-- Phases  -->
     <!-- ================================================= -->
     <phaseOrder type="inflow">
-        <!--  System pre defined phases       -->
-        <phase name="TransportIn"/>
+        <!-- System pre defined phases       -->
+        <phase name="Transport"/>
         <phase name="PreDispatch"/>
-        <phase name="Dispatch">
-            <handler name="AddressingBasedDispatcher"
-                     class="axis2_engine">
-                <order phase="Dispatch"/>
-            </handler>
-             <handler name="RequestURIBasedDispatcher"
-                     class="axis2_engine">
-                <order phase="Dispatch"/>
-            </handler>
-             <handler name="SOAPActionBasedDispatcher"
-                     class="axis2_engine">
-                <order phase="Dispatch"/>
-            </handler>
-             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="axis2_engine">
-                <order phase="Dispatch"/>
-            </handler>
-        </phase>
-        <phase name="PostDispatch">
-             <handler name="DispatchPostConditionsEvaluator"
-                     class="axis2_engine">
-                <order phase="PostDispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="axis2_engine">
-                <order phase="PostDispatch"/>
-            </handler>
-            <handler name="SOAPProcessingModelChecker"
-                     class="axis2_engine">
-                <order phase="PostDispatch"/>
-            </handler>
-        </phase>
-        <!--  System pre defined phases       -->
-        <!--   After Postdispatch phase module author or or service author can add any
phase he want      -->
+        <phase name="Dispatch"/>
+        <phase name="PostDispatch"/>
+        <!-- System pre defined phases       -->
+        <!-- After PostDispatch phase, module or service author can add any phase as required
 -->
         <!--phase name="userphase1"/-->
     </phaseOrder>
     <phaseOrder type="outflow">
-        <!--      user can add his own phases to this area  -->
+        <!-- User defined phases could be added here -->
 	    <!--phase name="RMPhase"/-->
         <!--phase name="userphase1"/-->
         <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <!--phase name="PolicyDetermination"/-->
-        <!--phase name="MessageOut"/-->
+        <phase name="MessageOut"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
-        <!--      user can add his own phases to this area  -->
+        <!-- User defined phases could be added here -->
         <!--phase name="userphase1"/-->
 	    <!--phase name="RMPhase"/-->
     </phaseOrder>
     <phaseOrder type="Outfaultflow">
-        <!--      user can add his own phases to this area  -->
+        <!-- User defined phases could be added here -->
         <!--phase name="RMPhase"/-->
         <!--phase name="userphase1"/-->
-        <!--phase name="PolicyDetermination"/-->
         <phase name="MessageOut"/>
     </phaseOrder>
 </axisconfig>



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