You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/03/27 06:06:02 UTC

svn commit: r389016 [1/5] - in /webservices/axis2/trunk/c: include/ modules/core/context/ modules/core/description/ modules/core/engine/ modules/mod_addr/ modules/util/ modules/xml/om/ test/resources/xml/ test/resources/xml/om/ test/resources/xml/soap/...

Author: nandika
Date: Sun Mar 26 20:05:56 2006
New Revision: 389016

URL: http://svn.apache.org/viewcvs?rev=389016&view=rev
Log:
xml files in test/xml/om and test/xml/soap  moved to test/resources/om and test/resources/soap , code formatted according to coding standards , om_navigater added , warning and memory leaks removed 

Added:
    webservices/axis2/trunk/c/include/axis2_om_navigator.h
    webservices/axis2/trunk/c/modules/xml/om/om_navigator.c
    webservices/axis2/trunk/c/test/resources/xml/
    webservices/axis2/trunk/c/test/resources/xml/om/
    webservices/axis2/trunk/c/test/resources/xml/om/axis.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/axis.xml
    webservices/axis2/trunk/c/test/resources/xml/om/basic.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/basic.xml
    webservices/axis2/trunk/c/test/resources/xml/om/basicupdate.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/basicupdate.xml
    webservices/axis2/trunk/c/test/resources/xml/om/contents.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/contents.xml
    webservices/axis2/trunk/c/test/resources/xml/om/defaultNamespace.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/defaultNamespace.xml
    webservices/axis2/trunk/c/test/resources/xml/om/evaluate.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/evaluate.xml
    webservices/axis2/trunk/c/test/resources/xml/om/fibo.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/fibo.xml
    webservices/axis2/trunk/c/test/resources/xml/om/id.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/id.xml
    webservices/axis2/trunk/c/test/resources/xml/om/jaxen24.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/jaxen24.xml
    webservices/axis2/trunk/c/test/resources/xml/om/jaxen3.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/jaxen3.xml
    webservices/axis2/trunk/c/test/resources/xml/om/lang.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/lang.xml
    webservices/axis2/trunk/c/test/resources/xml/om/message.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/message.xml
    webservices/axis2/trunk/c/test/resources/xml/om/moreover.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/moreover.xml
    webservices/axis2/trunk/c/test/resources/xml/om/much_ado.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/much_ado.xml
    webservices/axis2/trunk/c/test/resources/xml/om/namespaces.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/namespaces.xml
    webservices/axis2/trunk/c/test/resources/xml/om/nitf.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/nitf.xml
    webservices/axis2/trunk/c/test/resources/xml/om/numbers.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/numbers.xml
    webservices/axis2/trunk/c/test/resources/xml/om/pi.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/pi.xml
    webservices/axis2/trunk/c/test/resources/xml/om/pi2.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/pi2.xml
    webservices/axis2/trunk/c/test/resources/xml/om/simple.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/simple.xml
    webservices/axis2/trunk/c/test/resources/xml/om/spaces.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/spaces.xml
    webservices/axis2/trunk/c/test/resources/xml/om/test.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/test.xml
    webservices/axis2/trunk/c/test/resources/xml/om/testNamespaces.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/testNamespaces.xml
    webservices/axis2/trunk/c/test/resources/xml/om/underscore.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/underscore.xml
    webservices/axis2/trunk/c/test/resources/xml/om/web.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/web.xml
    webservices/axis2/trunk/c/test/resources/xml/om/web2.xml
      - copied unchanged from r388496, webservices/axis2/trunk/c/test/xml/om/web2.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/
    webservices/axis2/trunk/c/test/resources/xml/soap/OMElementTest.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/
      - copied from r388496, webservices/axis2/trunk/c/test/xml/soap/badsoap/
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/bodyNotQualified.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/bodyNotQualified.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/envelopeMissing.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/envelopeMissing.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/haederBodyWrongOrder.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/haederBodyWrongOrder.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/notnamespaceQualified.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/notnamespaceQualified.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/twoBodymessage.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/twoBodymessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/twoheaders.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/twoheaders.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/badsoap/wrongSoapNs.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/badsoap/wrongSoapNs.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/emtyBodymessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/invalidMustUnderstandSOAP12.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/minimalMessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/reallyReallyBigMessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/sample1.txt
    webservices/axis2/trunk/c/test/resources/xml/soap/sample1.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/security2-soap.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/soap11/
      - copied from r388496, webservices/axis2/trunk/c/test/xml/soap/soap11/
    webservices/axis2/trunk/c/test/resources/xml/soap/soap11/soap11fault.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/soap11/soap11fault.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/soap11/soap11message.xml
      - copied, changed from r389013, webservices/axis2/trunk/c/test/xml/soap/soap11/soap11message.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/soap12message.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/soapmessage.txt
    webservices/axis2/trunk/c/test/resources/xml/soap/soapmessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/soapmessage1.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/test.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/whitespacedMessage.xml
    webservices/axis2/trunk/c/test/resources/xml/soap/wrongEnvelopeNamespace.xml
Removed:
    webservices/axis2/trunk/c/test/xml/om/axis.xml
    webservices/axis2/trunk/c/test/xml/om/basic.xml
    webservices/axis2/trunk/c/test/xml/om/basicupdate.xml
    webservices/axis2/trunk/c/test/xml/om/contents.xml
    webservices/axis2/trunk/c/test/xml/om/defaultNamespace.xml
    webservices/axis2/trunk/c/test/xml/om/evaluate.xml
    webservices/axis2/trunk/c/test/xml/om/fibo.xml
    webservices/axis2/trunk/c/test/xml/om/id.xml
    webservices/axis2/trunk/c/test/xml/om/jaxen24.xml
    webservices/axis2/trunk/c/test/xml/om/jaxen3.xml
    webservices/axis2/trunk/c/test/xml/om/lang.xml
    webservices/axis2/trunk/c/test/xml/om/message.xml
    webservices/axis2/trunk/c/test/xml/om/moreover.xml
    webservices/axis2/trunk/c/test/xml/om/much_ado.xml
    webservices/axis2/trunk/c/test/xml/om/namespaces.xml
    webservices/axis2/trunk/c/test/xml/om/nitf.xml
    webservices/axis2/trunk/c/test/xml/om/numbers.xml
    webservices/axis2/trunk/c/test/xml/om/pi.xml
    webservices/axis2/trunk/c/test/xml/om/pi2.xml
    webservices/axis2/trunk/c/test/xml/om/simple.xml
    webservices/axis2/trunk/c/test/xml/om/spaces.xml
    webservices/axis2/trunk/c/test/xml/om/t.xml
    webservices/axis2/trunk/c/test/xml/om/test.xml
    webservices/axis2/trunk/c/test/xml/om/testNamespaces.xml
    webservices/axis2/trunk/c/test/xml/om/text.xml
    webservices/axis2/trunk/c/test/xml/om/underscore.xml
    webservices/axis2/trunk/c/test/xml/om/web.xml
    webservices/axis2/trunk/c/test/xml/om/web2.xml
    webservices/axis2/trunk/c/test/xml/soap/OMElementTest.xml
    webservices/axis2/trunk/c/test/xml/soap/badsoap/
    webservices/axis2/trunk/c/test/xml/soap/emtyBodymessage.xml
    webservices/axis2/trunk/c/test/xml/soap/invalidMustUnderstandSOAP12.xml
    webservices/axis2/trunk/c/test/xml/soap/minimalMessage.xml
    webservices/axis2/trunk/c/test/xml/soap/reallyReallyBigMessage.xml
    webservices/axis2/trunk/c/test/xml/soap/sample1.xml
    webservices/axis2/trunk/c/test/xml/soap/security2-soap.xml
    webservices/axis2/trunk/c/test/xml/soap/soap11/
    webservices/axis2/trunk/c/test/xml/soap/soap12message.xml
    webservices/axis2/trunk/c/test/xml/soap/soapmessage.xml
    webservices/axis2/trunk/c/test/xml/soap/soapmessage1.xml
    webservices/axis2/trunk/c/test/xml/soap/test.xml
    webservices/axis2/trunk/c/test/xml/soap/whitespacedMessage.xml
    webservices/axis2/trunk/c/test/xml/soap/wrongEnvelopeNamespace.xml
Modified:
    webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
    webservices/axis2/trunk/c/modules/core/context/ctx.c
    webservices/axis2/trunk/c/modules/core/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
    webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
    webservices/axis2/trunk/c/modules/core/description/phase_rule.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/axis2_engine.h
    webservices/axis2/trunk/c/modules/core/engine/axis2_event.h
    webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
    webservices/axis2/trunk/c/modules/core/engine/disp.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/event.c
    webservices/axis2/trunk/c/modules/core/engine/handler.c
    webservices/axis2/trunk/c/modules/core/engine/phase.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
    webservices/axis2/trunk/c/modules/util/axis2_string.h
    webservices/axis2/trunk/c/modules/util/string.c
    webservices/axis2/trunk/c/modules/xml/om/Makefile.am
    webservices/axis2/trunk/c/modules/xml/om/om_element.c
    webservices/axis2/trunk/c/modules/xml/om/om_node.c
    webservices/axis2/trunk/c/test/unit/main.c
    webservices/axis2/trunk/c/test/xml/om/test_om.c
    webservices/axis2/trunk/c/test/xml/soap/test_soap.c

Added: webservices/axis2/trunk/c/include/axis2_om_navigator.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_navigator.h?rev=389016&view=auto
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_navigator.h (added)
+++ webservices/axis2/trunk/c/include/axis2_om_navigator.h Sun Mar 26 20:05:56 2006
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+ #ifndef AXIS2_OM_NAVIGATOR_H
+ #define AXIS2_OM_NAVIGATOR_H
+ 
+/** @defgroup axis2_om AXIOM (Axis Object Model)
+ * @ingroup axis2
+ * @{
+ */
+
+/** @} */
+      
+/**
+ * @file axis2_om_navigator.h
+ * @brief defines axis2_om_navigator struct and its ops
+ */
+
+#include <axis2.h>
+#include <axis2_env.h>
+#include <axis2_om_node.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/**
+ * @defgroup axis2_om_navigator  om_navigator 
+ * @ingroup axis2_om
+ * @{
+ */
+ 
+ typedef struct axis2_om_navigator axis2_om_navigator_t;
+
+ typedef struct axis2_om_navigator_ops axis2_om_navigator_ops_t;
+ 
+/**
+ * @brief OM Node ops struct
+ * Encapsulator struct for ops of axis2_om_node
+ */
+ 
+ struct axis2_om_navigator_ops 
+ {
+    /**
+     * free function , free the axis2_om_navigator struct
+     * @param om_navigator axis2_om_navigator_struct
+     * @param env environment MUST not be NULL
+     * @returns AXIS2_SUCCESS 
+     */
+     
+     axis2_status_t (AXIS2_CALL *
+     free)(axis2_om_navigator_t *om_navigator,
+           axis2_env_t **env); 
+ 
+    /**
+     *  returns the navigable status 
+     * @param  om_navigator axis2_om_navigator_struct
+     * @param env environment MUST not be NULL
+     * @returns AXIS2_TRUE if the om is navigable 
+     * otherwise returns AXIS2_FALSE
+     */
+
+     axis2_bool_t (AXIS2_CALL *
+     is_navigable)(axis2_om_navigator_t *om_navigator,
+                   axis2_env_t **env);
+
+    /**
+     * returns the build status of this node 
+     * if the node is completly build returns AXIS2_TRUE
+     * otherwise AXIS2_FALSE
+     * @param om_navigator axis2_om_navigator struct
+     * @param env environment MUST not be NULL
+     * @return AXIS2_TRUE if this node is completly built
+     * otherwise return AXIS2_FALSE
+     */
+     
+     axis2_bool_t (AXIS2_CALL *
+     is_completed)(axis2_om_navigator_t *om_navigator,
+                        axis2_env_t **env);
+
+    /**
+     * gets the next node 
+     * @param om_navigator om_navigaot struct 
+     * @param env environment MUST not be NULL
+     * @returns axis2_om_node_t pointer in the sequence of preorder travasal 
+     * however the an element node is treated slightly differently
+     * Once the om_element type om node is passed it returns the same om_node 
+     * pointer in the next , returns NULL on error or if there is no more nodes
+     */
+
+     axis2_om_node_t* (AXIS2_CALL *
+     next)(axis2_om_navigator_t *om_navigator, 
+           axis2_env_t **env);
+
+    /**
+     * method visited 
+     * @param om_navigator om_navigaot struct
+     * @param env environment MUST not be NULL
+     * @returns AXIS2_TRUE if this node is alrady visited
+     * otherwise AXIS2_FALSE
+     */
+     axis2_bool_t (AXIS2_CALL *
+     visited)(axis2_om_navigator_t *om_navigator,
+              axis2_env_t **env);
+
+ };
+    
+/** axis2_om_navigator_t struct */
+
+struct axis2_om_navigator
+{
+    axis2_om_navigator_ops_t *ops;
+};
+
+/** create an axis2_om_navigator 
+ * @param env environment MUST not be NULL
+ * @param node a pointer to axis2_om_node_t struct 
+ * which is to be navigated
+ * @returns a pointer to axis2_om_navigator_t struct
+ * or returns NULL on error
+ */
+
+AXIS2_DECLARE(axis2_om_navigator_t *)
+axis2_om_navigator_create(axis2_env_t **env,
+                          axis2_om_node_t *node);
+                          
+/** Macros ********************************************************************/
+
+#define AXIS2_OM_NAVIGATOR_FREE(navigator, env) \
+        ((navigator)->ops->free(navigator, env))
+
+#define AXIS2_OM_NAVIGATOR_IS_NAVIGABLE(navigator, env) \
+        ((navigator)->ops->is_navigable(navigator, env))
+
+#define AXIS2_OM_NAVIGATOR_IS_COMPLETED(navigator, env) \
+        ((navigator)->ops->is_completed(navigator, env))
+
+#define AXIS2_OM_NAVIGATOR_VISITED(navigator, env) \
+        ((navigator)->ops->visited(navigator, env))
+
+#define AXIS2_OM_NAVIGATOR_NEXT(navigator, env) \
+        ((navigator)->ops->next(navigator, env))
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AXIS2_OM_NAVIGATOR_H */

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Sun Mar 26 20:05:56 2006
@@ -47,53 +47,93 @@
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(conf_ctx) ((axis2_conf_ctx_impl_t *)conf_ctx)
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_set_conf(struct axis2_conf_ctx *conf_ctx, 
-    axis2_env_t **env, 
-    axis2_conf_t *conf);
-axis2_ctx_t* AXIS2_CALL axis2_conf_ctx_get_base(struct axis2_conf_ctx *conf_ctx, 
-    axis2_env_t **env);
-axis2_conf_t* AXIS2_CALL axis2_conf_ctx_get_conf(struct axis2_conf_ctx *conf_ctx, 
-    axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_op_ctx_map(struct axis2_conf_ctx *conf_ctx, 
-    axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_ctx_map(struct axis2_conf_ctx *conf_ctx, 
-    axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_grp_ctx_map(struct axis2_conf_ctx *conf_ctx, 
-                                                            axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_op_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *message_id,
-                                                                axis2_op_ctx_t *op_ctx);
-axis2_op_ctx_t* AXIS2_CALL axis2_conf_ctx_get_op_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *message_id);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *svc_id,
-                                                                axis2_svc_ctx_t *svc_ctx);
-axis2_svc_ctx_t* AXIS2_CALL axis2_conf_ctx_get_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *svc_id);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *svc_grp_id,
-                                                                axis2_svc_grp_ctx_t *svc_grp_ctx);
-axis2_svc_grp_ctx_t* AXIS2_CALL axis2_conf_ctx_get_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *svc_grp_id);
-axis2_char_t* AXIS2_CALL axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_set_root_dir(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env,
-                                                        axis2_char_t *path);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_init(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env,
-                                                        axis2_conf_t *conf);
-axis2_status_t AXIS2_CALL axis2_conf_ctx_free(struct axis2_conf_ctx *conf_ctx, 
+
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_set_conf(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env, 
+                        axis2_conf_t *conf);
+                        
+axis2_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_base(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env);
+                        
+axis2_conf_t* AXIS2_CALL 
+axis2_conf_ctx_get_conf(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env);
+                        
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_op_ctx_map(struct axis2_conf_ctx *conf_ctx, 
+                              axis2_env_t **env);
+                              
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_ctx_map(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env);
+                               
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_grp_ctx_map(struct axis2_conf_ctx *conf_ctx, 
                                    axis2_env_t **env);
-axis2_svc_grp_ctx_t* AXIS2_CALL axis2_conf_ctx_fill_ctxs(struct axis2_conf_ctx *conf_ctx, 
-                                               axis2_env_t **env,
-                                               axis2_msg_ctx_t *msg_ctx);
+                                   
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_op_ctx(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env,
+                               axis2_char_t *message_id,
+                               axis2_op_ctx_t *op_ctx);
+
+                               
+axis2_op_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_op_ctx(struct axis2_conf_ctx *conf_ctx, 
+                          axis2_env_t **env,
+                          axis2_char_t *message_id);
+
+                          
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
+                                axis2_env_t **env,
+                                axis2_char_t *svc_id,
+                                axis2_svc_ctx_t *svc_ctx);
+
+                                
+axis2_svc_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
+                           axis2_env_t **env,
+                           axis2_char_t *svc_id);
+                           
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
+                                    axis2_env_t **env,
+                                    axis2_char_t *svc_grp_id,
+                                    axis2_svc_grp_ctx_t *svc_grp_ctx);
+
+                                    
+axis2_svc_grp_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env,
+                               axis2_char_t *svc_grp_id);
+
+                               
+axis2_char_t* AXIS2_CALL 
+axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx, 
+                            axis2_env_t **env);
+                            
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_set_root_dir(struct axis2_conf_ctx *conf_ctx, 
+                            axis2_env_t **env,
+                            axis2_char_t *path);
+
+                            
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_init(struct axis2_conf_ctx *conf_ctx, 
+                    axis2_env_t **env,
+                    axis2_conf_t *conf);
+                    
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_free(struct axis2_conf_ctx *conf_ctx, 
+                    axis2_env_t **env);
+                    
+axis2_svc_grp_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_fill_ctxs(struct axis2_conf_ctx *conf_ctx, 
+                         axis2_env_t **env,
+                         axis2_msg_ctx_t *msg_ctx);
 
 
 AXIS2_DECLARE(axis2_conf_ctx_t*)
@@ -157,7 +197,9 @@
     }
     
     /* initialize ops */    
-    conf_ctx_impl->conf_ctx.ops  = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_conf_ctx_ops_t) );
+    conf_ctx_impl->conf_ctx.ops  = 
+        AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_conf_ctx_ops_t) );
+    
     if (!conf_ctx_impl->conf_ctx.ops)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -165,71 +207,118 @@
         return NULL;        
     }
 
-    conf_ctx_impl->conf_ctx.ops->free = axis2_conf_ctx_free;
+    conf_ctx_impl->conf_ctx.ops->free = 
+        axis2_conf_ctx_free;
 
-    conf_ctx_impl->conf_ctx.ops->set_conf = axis2_conf_ctx_set_conf;
-    conf_ctx_impl->conf_ctx.ops->get_base = axis2_conf_ctx_get_base;
-    conf_ctx_impl->conf_ctx.ops->get_conf = axis2_conf_ctx_get_conf;
-    conf_ctx_impl->conf_ctx.ops->get_op_ctx_map = axis2_conf_ctx_get_op_ctx_map;
-    conf_ctx_impl->conf_ctx.ops->get_svc_ctx_map = axis2_conf_ctx_get_svc_ctx_map;
-    conf_ctx_impl->conf_ctx.ops->get_svc_grp_ctx_map = axis2_conf_ctx_get_svc_grp_ctx_map;
-    conf_ctx_impl->conf_ctx.ops->register_op_ctx = axis2_conf_ctx_register_op_ctx;
-    conf_ctx_impl->conf_ctx.ops->get_op_ctx = axis2_conf_ctx_get_op_ctx;
-    conf_ctx_impl->conf_ctx.ops->register_svc_ctx = axis2_conf_ctx_register_svc_ctx;
-    conf_ctx_impl->conf_ctx.ops->get_svc_ctx = axis2_conf_ctx_get_svc_ctx;
-    conf_ctx_impl->conf_ctx.ops->register_svc_grp_ctx = axis2_conf_ctx_register_svc_grp_ctx;
-    conf_ctx_impl->conf_ctx.ops->get_svc_grp_ctx = axis2_conf_ctx_get_svc_grp_ctx;
-    conf_ctx_impl->conf_ctx.ops->get_root_dir = axis2_conf_ctx_get_root_dir;
-    conf_ctx_impl->conf_ctx.ops->set_root_dir = axis2_conf_ctx_set_root_dir;
-    conf_ctx_impl->conf_ctx.ops->init = axis2_conf_ctx_init;
-    conf_ctx_impl->conf_ctx.ops->free = axis2_conf_ctx_free;
-    conf_ctx_impl->conf_ctx.ops->fill_ctxs = axis2_conf_ctx_fill_ctxs;
+    conf_ctx_impl->conf_ctx.ops->set_conf = 
+        axis2_conf_ctx_set_conf;
+        
+    conf_ctx_impl->conf_ctx.ops->get_base = 
+        axis2_conf_ctx_get_base;
+        
+    conf_ctx_impl->conf_ctx.ops->get_conf = 
+        axis2_conf_ctx_get_conf;
+        
+    conf_ctx_impl->conf_ctx.ops->get_op_ctx_map = 
+        axis2_conf_ctx_get_op_ctx_map;
+        
+    conf_ctx_impl->conf_ctx.ops->get_svc_ctx_map = 
+        axis2_conf_ctx_get_svc_ctx_map;
+        
+    conf_ctx_impl->conf_ctx.ops->get_svc_grp_ctx_map = 
+        axis2_conf_ctx_get_svc_grp_ctx_map;
+        
+    conf_ctx_impl->conf_ctx.ops->register_op_ctx = 
+        axis2_conf_ctx_register_op_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->get_op_ctx = 
+        axis2_conf_ctx_get_op_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->register_svc_ctx = 
+        axis2_conf_ctx_register_svc_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->get_svc_ctx = 
+        axis2_conf_ctx_get_svc_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->register_svc_grp_ctx = 
+        axis2_conf_ctx_register_svc_grp_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->get_svc_grp_ctx = 
+        axis2_conf_ctx_get_svc_grp_ctx;
+        
+    conf_ctx_impl->conf_ctx.ops->get_root_dir = 
+        axis2_conf_ctx_get_root_dir;
+        
+    conf_ctx_impl->conf_ctx.ops->set_root_dir = 
+        axis2_conf_ctx_set_root_dir;
+        
+    conf_ctx_impl->conf_ctx.ops->init = 
+        axis2_conf_ctx_init;
+        
+    conf_ctx_impl->conf_ctx.ops->free = 
+        axis2_conf_ctx_free;
+        
+    conf_ctx_impl->conf_ctx.ops->fill_ctxs = 
+        axis2_conf_ctx_fill_ctxs;
 
     return &(conf_ctx_impl->conf_ctx);
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_set_conf(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env, axis2_conf_t *conf) 
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_set_conf(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env, 
+                        axis2_conf_t *conf) 
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(conf_ctx)->conf = conf; /* we just maitain a shalow copy here */
     return AXIS2_SUCCESS;
 }
 
-axis2_ctx_t* AXIS2_CALL axis2_conf_ctx_get_base(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
+axis2_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_base(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->base;
 }
 
-axis2_conf_t* AXIS2_CALL axis2_conf_ctx_get_conf(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
+axis2_conf_t* AXIS2_CALL 
+axis2_conf_ctx_get_conf(struct axis2_conf_ctx *conf_ctx, 
+                        axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->conf;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_op_ctx_map(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_op_ctx_map(struct axis2_conf_ctx *conf_ctx, 
+                              axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->op_ctx_map;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_ctx_map(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_ctx_map(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->svc_ctx_map;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_grp_ctx_map(struct axis2_conf_ctx *conf_ctx, 
-                                                            axis2_env_t **env)
+axis2_hash_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_grp_ctx_map(struct axis2_conf_ctx *conf_ctx, 
+                                   axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->svc_grp_ctx_map;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_op_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *message_id,
-                                                                axis2_op_ctx_t *op_ctx) 
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_op_ctx(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env,
+                               axis2_char_t *message_id,
+                               axis2_op_ctx_t *op_ctx) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -239,15 +328,17 @@
     axis2_thread_mutex_lock(conf_ctx_impl->mutex);
     if (conf_ctx_impl->op_ctx_map)
     {
-        axis2_hash_set(conf_ctx_impl->op_ctx_map, message_id, AXIS2_HASH_KEY_STRING, op_ctx);
+        axis2_hash_set(conf_ctx_impl->op_ctx_map, 
+            message_id, AXIS2_HASH_KEY_STRING, op_ctx);
     }
     axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
     return AXIS2_SUCCESS;
 }
 
-axis2_op_ctx_t* AXIS2_CALL axis2_conf_ctx_get_op_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *message_id) 
+axis2_op_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_op_ctx(struct axis2_conf_ctx *conf_ctx, 
+                          axis2_env_t **env,
+                          axis2_char_t *message_id) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -261,6 +352,7 @@
 		axis2_op_ctx_t *rv = NULL;
         rv = (axis2_op_ctx_t*)axis2_hash_get(conf_ctx_impl->op_ctx_map, 
 						message_id, AXIS2_HASH_KEY_STRING);
+                        
 		axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
 		return rv;
     }
@@ -268,10 +360,11 @@
     return NULL;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *svc_id,
-                                                                axis2_svc_ctx_t *svc_ctx) 
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
+                                axis2_env_t **env,
+                                axis2_char_t *svc_id,
+                                axis2_svc_ctx_t *svc_ctx) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -281,15 +374,17 @@
     axis2_thread_mutex_lock(conf_ctx_impl->mutex);
     if (conf_ctx_impl->svc_ctx_map)
     {
-        axis2_hash_set(conf_ctx_impl->svc_ctx_map, svc_id, AXIS2_HASH_KEY_STRING, svc_ctx);
+        axis2_hash_set(conf_ctx_impl->svc_ctx_map, 
+            svc_id, AXIS2_HASH_KEY_STRING, svc_ctx);
     }
     axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
     return AXIS2_SUCCESS;
 }
 
-axis2_svc_ctx_t* AXIS2_CALL axis2_conf_ctx_get_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *svc_id) 
+axis2_svc_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_ctx(struct axis2_conf_ctx *conf_ctx, 
+                           axis2_env_t **env,
+                           axis2_char_t *svc_id) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -309,10 +404,11 @@
     return NULL;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_register_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                axis2_env_t **env,
-                                                                axis2_char_t *svc_grp_id,
-                                                                axis2_svc_grp_ctx_t *svc_grp_ctx) 
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_register_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
+                                    axis2_env_t **env,
+                                    axis2_char_t *svc_grp_id,
+                                    axis2_svc_grp_ctx_t *svc_grp_ctx) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -322,15 +418,17 @@
     axis2_thread_mutex_lock(conf_ctx_impl->mutex);
     if (conf_ctx_impl->svc_grp_ctx_map)
     {
-        axis2_hash_set(conf_ctx_impl->svc_grp_ctx_map, svc_grp_id, AXIS2_HASH_KEY_STRING, svc_grp_ctx);
+        axis2_hash_set(conf_ctx_impl->svc_grp_ctx_map, 
+            svc_grp_id, AXIS2_HASH_KEY_STRING, svc_grp_ctx);
     }
     axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
     return AXIS2_SUCCESS;
 }
 
-axis2_svc_grp_ctx_t* AXIS2_CALL axis2_conf_ctx_get_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
-                                                                        axis2_env_t **env,
-                                                                        axis2_char_t *svc_grp_id) 
+axis2_svc_grp_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_get_svc_grp_ctx(struct axis2_conf_ctx *conf_ctx, 
+                               axis2_env_t **env,
+                               axis2_char_t *svc_grp_id) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -350,8 +448,9 @@
     return NULL;
 }
 
-axis2_char_t* AXIS2_CALL axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env) 
+axis2_char_t* AXIS2_CALL 
+axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx, 
+                            axis2_env_t **env) 
 {
 	axis2_char_t *rv = NULL;
 	axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
@@ -363,9 +462,10 @@
 	return rv;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_set_root_dir(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env,
-                                                        axis2_char_t *path) 
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_set_root_dir(struct axis2_conf_ctx *conf_ctx, 
+                            axis2_env_t **env,
+                            axis2_char_t *path) 
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -393,9 +493,10 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_init(struct axis2_conf_ctx *conf_ctx, 
-                                                        axis2_env_t **env,
-                                                        axis2_conf_t *conf)
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_init(struct axis2_conf_ctx *conf_ctx, 
+                    axis2_env_t **env,
+                    axis2_conf_t *conf)
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     axis2_hash_index_t *hi = NULL;
@@ -443,8 +544,9 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL axis2_conf_ctx_free (struct axis2_conf_ctx *conf_ctx, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_conf_ctx_free (struct axis2_conf_ctx *conf_ctx, 
+                     axis2_env_t **env)
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
@@ -543,9 +645,10 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_svc_grp_ctx_t* AXIS2_CALL axis2_conf_ctx_fill_ctxs(struct axis2_conf_ctx *conf_ctx, 
-                                               axis2_env_t **env,
-                                               axis2_msg_ctx_t *msg_ctx)
+axis2_svc_grp_ctx_t* AXIS2_CALL 
+axis2_conf_ctx_fill_ctxs(struct axis2_conf_ctx *conf_ctx, 
+                         axis2_env_t **env,
+                         axis2_msg_ctx_t *msg_ctx)
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     axis2_char_t *svc_grp_ctx_id = NULL;
@@ -566,21 +669,24 @@
     svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
     if (!svc)
     {
-        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SERVICE_NOT_YET_FOUND, AXIS2_FAILURE);
+        AXIS2_ERROR_SET((*env)->error, 
+            AXIS2_ERROR_SERVICE_NOT_YET_FOUND, AXIS2_FAILURE);
         return NULL;
     }
     
     qname = AXIS2_SVC_GET_QNAME(svc, env);
     if (!qname)
     {
-        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC, AXIS2_FAILURE);
+        AXIS2_ERROR_SET((*env)->error, 
+            AXIS2_ERROR_INVALID_STATE_SVC, AXIS2_FAILURE);
         return NULL;
     }
     
     svc_id = AXIS2_QNAME_GET_LOCALPART(qname, env);
     if (!svc_id)
     {
-        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC, AXIS2_FAILURE);
+        AXIS2_ERROR_SET((*env)->error, 
+            AXIS2_ERROR_INVALID_STATE_SVC, AXIS2_FAILURE);
         return NULL;
     }
     
@@ -590,14 +696,16 @@
     either from transport or from addressing */
     if (svc_grp_ctx_id)
     {
-        svc_grp_ctx = (axis2_svc_grp_ctx_t*) axis2_hash_get(conf_ctx_impl->svc_grp_ctx_map, 
-                                                                 svc_grp_ctx_id, AXIS2_HASH_KEY_STRING);
+        svc_grp_ctx = (axis2_svc_grp_ctx_t*) 
+            axis2_hash_get(conf_ctx_impl->svc_grp_ctx_map, 
+                           svc_grp_ctx_id, AXIS2_HASH_KEY_STRING);
         if (svc_grp_ctx)
         {
             svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env, svc_id);
             if (!svc_ctx)
             {
-                AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC_GRP, AXIS2_FAILURE);
+                AXIS2_ERROR_SET((*env)->error, 
+                    AXIS2_ERROR_INVALID_STATE_SVC_GRP, AXIS2_FAILURE);
                 return NULL;
             }
         }

Modified: webservices/axis2/trunk/c/modules/core/context/ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/ctx.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/ctx.c Sun Mar 26 20:05:56 2006
@@ -46,10 +46,19 @@
                        axis2_property_t *value, 
                        axis2_bool_t persistent);
 
-axis2_hash_t* AXIS2_CALL axis2_ctx_get_non_persistent_map(struct axis2_ctx *ctx, axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_ctx_get_persistent_map(struct axis2_ctx *ctx, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_ctx_free (struct axis2_ctx *ctx, 
-                                   axis2_env_t **env);
+axis2_hash_t* AXIS2_CALL 
+axis2_ctx_get_non_persistent_map(struct axis2_ctx *ctx, 
+                                axis2_env_t **env);
+
+                                
+axis2_hash_t* AXIS2_CALL 
+axis2_ctx_get_persistent_map(struct axis2_ctx *ctx, 
+                            axis2_env_t **env);
+                            
+axis2_status_t AXIS2_CALL 
+axis2_ctx_free (struct axis2_ctx *ctx, 
+                axis2_env_t **env);
+                
 
 AXIS2_DECLARE(axis2_ctx_t*)
 axis2_ctx_create(axis2_env_t **env) 
@@ -92,11 +101,20 @@
         return NULL;        
     }
 
-    ctx_impl->ctx.ops->get_property = axis2_ctx_get_property;
-    ctx_impl->ctx.ops->set_property = axis2_ctx_set_property;
-    ctx_impl->ctx.ops->get_non_persistent_map = axis2_ctx_get_non_persistent_map;
-    ctx_impl->ctx.ops->get_persistent_map = axis2_ctx_get_persistent_map;
-    ctx_impl->ctx.ops->free = axis2_ctx_free;
+    ctx_impl->ctx.ops->get_property = 
+        axis2_ctx_get_property;
+        
+    ctx_impl->ctx.ops->set_property = 
+        axis2_ctx_set_property;
+        
+    ctx_impl->ctx.ops->get_non_persistent_map = 
+        axis2_ctx_get_non_persistent_map;
+        
+    ctx_impl->ctx.ops->get_persistent_map = 
+        axis2_ctx_get_persistent_map;
+        
+    ctx_impl->ctx.ops->free = 
+        axis2_ctx_free;
 
     return &(ctx_impl->ctx);
 }
@@ -117,12 +135,14 @@
     if (persistent) 
     {
         if (ctx_impl->persistent_map)
-            axis2_hash_set(ctx_impl->persistent_map, key, AXIS2_HASH_KEY_STRING, value);
+            axis2_hash_set(ctx_impl->persistent_map, key, 
+                AXIS2_HASH_KEY_STRING, value);
     } 
     else 
     {
         if (ctx_impl->non_persistent_map)
-            axis2_hash_set(ctx_impl->non_persistent_map, key, AXIS2_HASH_KEY_STRING, value);
+            axis2_hash_set(ctx_impl->non_persistent_map, key, 
+                AXIS2_HASH_KEY_STRING, value);
     }
     return AXIS2_SUCCESS;
 }
@@ -160,20 +180,24 @@
 }
 
 axis2_hash_t* AXIS2_CALL 
-axis2_ctx_get_non_persistent_map(struct axis2_ctx *ctx, axis2_env_t **env) 
+axis2_ctx_get_non_persistent_map(struct axis2_ctx *ctx, 
+                                 axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(ctx)->non_persistent_map;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_ctx_get_persistent_map(struct axis2_ctx *ctx, axis2_env_t **env) 
+axis2_hash_t* AXIS2_CALL 
+axis2_ctx_get_persistent_map(struct axis2_ctx *ctx, 
+                             axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(ctx)->persistent_map;
 }
 
-axis2_status_t AXIS2_CALL axis2_ctx_free (struct axis2_ctx *ctx, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_ctx_free (struct axis2_ctx *ctx, 
+                axis2_env_t **env)
 {
     axis2_ctx_impl_t *ctx_impl = NULL;
     

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Sun Mar 26 20:05:56 2006
@@ -53,41 +53,74 @@
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(op_ctx) ((axis2_op_ctx_impl_t *)op_ctx)
 
-axis2_ctx_t* AXIS2_CALL axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx, 
-                                            axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_op_ctx_free (struct axis2_op_ctx *op_ctx, 
-                                   axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_op_ctx_init(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, 
-    struct axis2_conf *conf);
-axis2_op_t* AXIS2_CALL axis2_op_ctx_getAxisOperation(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
-struct axis2_svc_ctx * AXIS2_CALL axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, 
-    axis2_msg_ctx_t *msg_ctx);
-axis2_msg_ctx_t* AXIS2_CALL axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, axis2_char_t *messageLabel);
-axis2_bool_t AXIS2_CALL axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, 
-    axis2_bool_t is_complete);
-axis2_status_t AXIS2_CALL axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, 
-    struct axis2_svc_ctx* svc_ctx);
-axis2_op_t* AXIS2_CALL axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env);
+
+axis2_ctx_t* AXIS2_CALL 
+axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx, 
+                      axis2_env_t **env);
+                      
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_free (struct axis2_op_ctx *op_ctx, 
+                   axis2_env_t **env);
+                   
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_init(struct axis2_op_ctx *op_ctx, 
+                 axis2_env_t **env, 
+                 struct axis2_conf *conf);
+                 
+axis2_op_t* AXIS2_CALL 
+axis2_op_ctx_getAxisOperation(struct axis2_op_ctx *op_ctx, 
+                             axis2_env_t **env);
+
+                             
+struct axis2_svc_ctx * AXIS2_CALL 
+axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env);
+
+                        
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env, 
+                        axis2_msg_ctx_t *msg_ctx);
+
+                        
+axis2_msg_ctx_t* AXIS2_CALL 
+axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env, 
+                        axis2_char_t *messageLabel);
+                        
+axis2_bool_t AXIS2_CALL 
+axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx, 
+                            axis2_env_t **env);
+                            
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx, 
+                          axis2_env_t **env, 
+                          axis2_bool_t is_complete);
+                          
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx, 
+                     axis2_env_t **env);
+                     
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env, 
+                        struct axis2_svc_ctx* svc_ctx);
+
+                        
+axis2_op_t* AXIS2_CALL 
+axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx, 
+                    axis2_env_t **env);
+                    
+axis2_hash_t* AXIS2_CALL 
+axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx, 
+                             axis2_env_t **env);
+
+
 
 AXIS2_DECLARE(axis2_op_ctx_t*)
 axis2_op_ctx_create(axis2_env_t **env, 
-    axis2_op_t *op,
-    struct axis2_svc_ctx* svc_ctx) 
+                    axis2_op_t *op,
+                    struct axis2_svc_ctx* svc_ctx) 
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     
@@ -156,32 +189,58 @@
         return NULL;        
     }
 
-    op_ctx_impl->op_ctx.ops->get_base = axis2_op_ctx_get_base;
-    op_ctx_impl->op_ctx.ops->free = axis2_op_ctx_free;
-    op_ctx_impl->op_ctx.ops->init = axis2_op_ctx_init;
-    op_ctx_impl->op_ctx.ops->get_op = axis2_op_ctx_get_op;
-    op_ctx_impl->op_ctx.ops->get_parent = axis2_op_ctx_get_parent;
-    op_ctx_impl->op_ctx.ops->add_msg_ctx = axis2_op_ctx_add_msg_ctx;
-    op_ctx_impl->op_ctx.ops->get_msg_ctx = axis2_op_ctx_get_msg_ctx;
-    op_ctx_impl->op_ctx.ops->get_is_complete = axis2_op_ctx_get_is_complete;
-    op_ctx_impl->op_ctx.ops->set_complete = axis2_op_ctx_set_complete;
-    op_ctx_impl->op_ctx.ops->cleanup = axis2_op_ctx_cleanup;
-    op_ctx_impl->op_ctx.ops->set_parent = axis2_op_ctx_set_parent;
-    op_ctx_impl->op_ctx.ops->get_msg_ctx_map = axis2_op_ctx_get_msg_ctx_map;
+    op_ctx_impl->op_ctx.ops->get_base = 
+        axis2_op_ctx_get_base;
+        
+    op_ctx_impl->op_ctx.ops->free = 
+        axis2_op_ctx_free;
+        
+    op_ctx_impl->op_ctx.ops->init = 
+        axis2_op_ctx_init;
+        
+    op_ctx_impl->op_ctx.ops->get_op = 
+        axis2_op_ctx_get_op;
+        
+    op_ctx_impl->op_ctx.ops->get_parent = 
+        axis2_op_ctx_get_parent;
+        
+    op_ctx_impl->op_ctx.ops->add_msg_ctx = 
+        axis2_op_ctx_add_msg_ctx;
+        
+    op_ctx_impl->op_ctx.ops->get_msg_ctx = 
+        axis2_op_ctx_get_msg_ctx;
+        
+    op_ctx_impl->op_ctx.ops->get_is_complete = 
+        axis2_op_ctx_get_is_complete;
+        
+    op_ctx_impl->op_ctx.ops->set_complete = 
+        axis2_op_ctx_set_complete;
+        
+    op_ctx_impl->op_ctx.ops->cleanup = 
+        axis2_op_ctx_cleanup;
+        
+    op_ctx_impl->op_ctx.ops->set_parent = 
+        axis2_op_ctx_set_parent;
+        
+    op_ctx_impl->op_ctx.ops->get_msg_ctx_map = 
+        axis2_op_ctx_get_msg_ctx_map;
+        
 
     return &(op_ctx_impl->op_ctx);
 }
 
-axis2_ctx_t* AXIS2_CALL axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx, 
-                                            axis2_env_t **env)
+axis2_ctx_t* AXIS2_CALL 
+axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx, 
+                      axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(op_ctx)->base;
 }
 
 
-axis2_status_t AXIS2_CALL axis2_op_ctx_free (struct axis2_op_ctx *op_ctx, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_free (struct axis2_op_ctx *op_ctx, 
+                   axis2_env_t **env)
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     
@@ -221,7 +280,10 @@
 /**
  * The method is used to do the intialization of the axis2_op_ctx
  */
-axis2_status_t AXIS2_CALL axis2_op_ctx_init(struct axis2_op_ctx *op_ctx, axis2_env_t **env, struct axis2_conf *conf)
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_init(struct axis2_op_ctx *op_ctx, 
+                  axis2_env_t **env, 
+                  struct axis2_conf *conf)
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     axis2_hash_index_t *hi = NULL;
@@ -244,7 +306,8 @@
             
             if (svc)
             {
-                op_ctx_impl->op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_ctx_impl->op_qname);
+                op_ctx_impl->op = 
+                    AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_ctx_impl->op_qname);
             }
         }
     }
@@ -269,7 +332,9 @@
 /**
  * @return Returns the op.
  */
-axis2_op_t* AXIS2_CALL axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx, axis2_env_t **env) 
+axis2_op_t* AXIS2_CALL 
+axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx, 
+                    axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(op_ctx)->op;
@@ -280,7 +345,9 @@
  *
  * @return parent struct axis2_svc_ctx *
  */
-struct axis2_svc_ctx * AXIS2_CALL axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx, axis2_env_t **env) 
+struct axis2_svc_ctx * AXIS2_CALL 
+axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(op_ctx)->parent;
@@ -294,7 +361,10 @@
  *
  * @param msgContext
  */
-axis2_status_t AXIS2_CALL axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx, axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)  
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env, 
+                        axis2_msg_ctx_t *msg_ctx)  
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     
@@ -308,7 +378,8 @@
         axis2_char_t *message_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
         if (message_id)
         {
-            axis2_hash_set(op_ctx_impl->msg_ctx_map, message_id, AXIS2_HASH_KEY_STRING, msg_ctx); 
+            axis2_hash_set(op_ctx_impl->msg_ctx_map, 
+                message_id, AXIS2_HASH_KEY_STRING, msg_ctx); 
         }
     }
     axis2_thread_mutex_unlock(op_ctx_impl->mutex);
@@ -321,8 +392,10 @@
  * @
  */
 
-axis2_msg_ctx_t* AXIS2_CALL axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, axis2_char_t *message_id)
+axis2_msg_ctx_t* AXIS2_CALL 
+axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx, 
+                         axis2_env_t **env, 
+                         axis2_char_t *message_id)
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     
@@ -348,16 +421,18 @@
  * are associated with the MEP has arrived and MEP is complete.
  *
  */
-axis2_bool_t AXIS2_CALL axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env) 
+axis2_bool_t AXIS2_CALL 
+axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx, 
+                             axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(op_ctx)->is_complete;
 }
 
-axis2_status_t AXIS2_CALL axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env, 
-    axis2_bool_t is_complete) 
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx, 
+                          axis2_env_t **env, 
+                          axis2_bool_t is_complete) 
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(op_ctx)->is_complete = is_complete;
@@ -374,8 +449,9 @@
  * and OUT_OPTIONAL_IN, it is possibe this will get called without the MEP
  * being complete due to the optional nature of the MEP.
  */
-axis2_status_t AXIS2_CALL axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx, 
-    axis2_env_t **env) 
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx, 
+                    axis2_env_t **env) 
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     axis2_hash_index_t *hi = NULL;
@@ -398,7 +474,8 @@
             axis2_char_t *message_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
             if (message_id)
             {
-                axis2_hash_set(op_ctx_impl->msg_ctx_map, message_id, AXIS2_HASH_KEY_STRING, NULL);
+                axis2_hash_set(op_ctx_impl->msg_ctx_map, 
+                    message_id, AXIS2_HASH_KEY_STRING, NULL);
                 return AXIS2_MSG_CTX_FREE(msg_ctx, env);
             }
         }
@@ -407,7 +484,10 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx, axis2_env_t **env, struct axis2_svc_ctx* svc_ctx) 
+axis2_status_t AXIS2_CALL 
+axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx, 
+                        axis2_env_t **env, 
+                        struct axis2_svc_ctx* svc_ctx) 
 {
     axis2_op_ctx_impl_t *op_ctx_impl = NULL;
     
@@ -426,15 +506,19 @@
         conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(op_ctx_impl->parent, env);
         if (conf_ctx)
         {
-            op_ctx_impl->op_ctx_map = AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
+            op_ctx_impl->op_ctx_map = 
+                AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
         }
-        op_ctx_impl->svc_qname = AXIS2_SVC_GET_QNAME(AXIS2_SVC_CTX_GET_SVC(op_ctx_impl->parent, env), env);
+        op_ctx_impl->svc_qname = 
+            AXIS2_SVC_GET_QNAME(AXIS2_SVC_CTX_GET_SVC(op_ctx_impl->parent, env), env);
     }
     
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx, axis2_env_t **env) 
+axis2_hash_t* AXIS2_CALL 
+axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx, 
+                             axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(op_ctx)->msg_ctx_map;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Sun Mar 26 20:05:56 2006
@@ -38,27 +38,45 @@
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(svc_ctx) ((axis2_svc_ctx_impl_t *)svc_ctx)
 
-axis2_ctx_t* AXIS2_CALL axis2_svc_ctx_get_base(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
-struct axis2_svc_grp_ctx * AXIS2_CALL axis2_svc_ctx_get_parent(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_ctx_free(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_ctx_init(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env,
-                                            axis2_conf_t *conf);
-axis2_char_t* AXIS2_CALL axis2_svc_ctx_get_svc_id(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
-axis2_svc_t* AXIS2_CALL axis2_svc_ctx_get_svc(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
+axis2_ctx_t* AXIS2_CALL 
+axis2_svc_ctx_get_base(struct axis2_svc_ctx *svc_ctx, 
+                       axis2_env_t **env);
+                       
+struct axis2_svc_grp_ctx * AXIS2_CALL 
+axis2_svc_ctx_get_parent(struct axis2_svc_ctx *svc_ctx, 
+                         axis2_env_t **env);
+                         
+axis2_status_t AXIS2_CALL 
+axis2_svc_ctx_free(struct axis2_svc_ctx *svc_ctx, 
+                   axis2_env_t **env);
+                   
+axis2_status_t AXIS2_CALL 
+axis2_svc_ctx_init(struct axis2_svc_ctx *svc_ctx, 
+                   axis2_env_t **env,
+                   axis2_conf_t *conf);
+                   
+axis2_char_t* AXIS2_CALL 
+axis2_svc_ctx_get_svc_id(struct axis2_svc_ctx *svc_ctx, 
+                         axis2_env_t **env);
+                         
+axis2_svc_t* AXIS2_CALL 
+axis2_svc_ctx_get_svc(struct axis2_svc_ctx *svc_ctx, 
+                      axis2_env_t **env);
+                      
 axis2_status_t AXIS2_CALL
 axis2_svc_ctx_set_svc(axis2_svc_ctx_t *svc_ctx,
                         axis2_env_t **env,
                         axis2_svc_t *svc);
-struct axis2_conf_ctx* AXIS2_CALL axis2_svc_ctx_get_conf_ctx(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env);
-axis2_op_ctx_t* AXIS2_CALL axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env, axis2_qname_t *qname);
+
+                        
+struct axis2_conf_ctx* AXIS2_CALL 
+axis2_svc_ctx_get_conf_ctx(struct axis2_svc_ctx *svc_ctx, 
+                           axis2_env_t **env);
+                           
+axis2_op_ctx_t* AXIS2_CALL 
+axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx, 
+                            axis2_env_t **env, 
+                            axis2_qname_t *qname);
 
 AXIS2_DECLARE(axis2_svc_ctx_t*)
 axis2_svc_ctx_create(axis2_env_t **env, 
@@ -128,15 +146,18 @@
     return &(svc_ctx_impl->svc_ctx);
 }
 
-axis2_ctx_t* AXIS2_CALL axis2_svc_ctx_get_base(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env)
+axis2_ctx_t* AXIS2_CALL 
+axis2_svc_ctx_get_base(struct axis2_svc_ctx *svc_ctx, 
+                       axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->base;
 }
 
 
-struct axis2_svc_grp_ctx * AXIS2_CALL axis2_svc_ctx_get_parent(struct axis2_svc_ctx *svc_ctx, axis2_env_t **env) 
+struct axis2_svc_grp_ctx * AXIS2_CALL 
+axis2_svc_ctx_get_parent(struct axis2_svc_ctx *svc_ctx, 
+                         axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->parent;
@@ -144,8 +165,9 @@
 
 
 
-axis2_status_t AXIS2_CALL axis2_svc_ctx_free (struct axis2_svc_ctx *svc_ctx, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_svc_ctx_free (struct axis2_svc_ctx *svc_ctx, 
+                    axis2_env_t **env)
 {
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     
@@ -175,9 +197,10 @@
 /**
  * The method is used to do the intialization of the EngineContext
  */
-axis2_status_t AXIS2_CALL axis2_svc_ctx_init(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env,
-                    axis2_conf_t *conf) 
+axis2_status_t AXIS2_CALL 
+axis2_svc_ctx_init(struct axis2_svc_ctx *svc_ctx, 
+                   axis2_env_t **env,
+                   axis2_conf_t *conf) 
 {
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     
@@ -197,16 +220,18 @@
 /**
  * @return Returns the svc_id.
  */
-axis2_char_t* AXIS2_CALL axis2_svc_ctx_get_svc_id(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env) 
+axis2_char_t* AXIS2_CALL 
+axis2_svc_ctx_get_svc_id(struct axis2_svc_ctx *svc_ctx, 
+                         axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->svc_id;
 }
 
 
-axis2_svc_t* AXIS2_CALL axis2_svc_ctx_get_svc(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env) 
+axis2_svc_t* AXIS2_CALL 
+axis2_svc_ctx_get_svc(struct axis2_svc_ctx *svc_ctx, 
+                      axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->svc;
@@ -233,15 +258,18 @@
     return AXIS2_SUCCESS;
 }
 
-struct axis2_conf_ctx* AXIS2_CALL axis2_svc_ctx_get_conf_ctx(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env) 
+struct axis2_conf_ctx* AXIS2_CALL 
+axis2_svc_ctx_get_conf_ctx(struct axis2_svc_ctx *svc_ctx, 
+                           axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_SVC_GRP_CTX_GET_PARENT(AXIS2_INTF_TO_IMPL(svc_ctx)->parent, env);
 }
 
-axis2_op_ctx_t* AXIS2_CALL axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx, 
-                                            axis2_env_t **env, axis2_qname_t *qname) 
+axis2_op_ctx_t* AXIS2_CALL 
+axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx, 
+                            axis2_env_t **env, 
+                            axis2_qname_t *qname) 
 {
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     axis2_op_t *op = NULL;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Sun Mar 26 20:05:56 2006
@@ -40,29 +40,55 @@
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(svc_grp_ctx) ((axis2_svc_grp_ctx_impl_t *)svc_grp_ctx)
 
-axis2_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_get_base(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                            axis2_env_t **env);
-struct axis2_conf_ctx* AXIS2_CALL axis2_svc_grp_ctx_get_parent(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_free(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                   axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_init(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                            axis2_env_t **env,
-                                            axis2_conf_t *conf);
-axis2_char_t* AXIS2_CALL axis2_svc_grp_ctx_get_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_set_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env, axis2_char_t *id);
-axis2_svc_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_ctx(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env,
-                        axis2_char_t *svc_name);
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_fill_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env);
-axis2_svc_grp_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_grp(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env);
-axis2_hash_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+
+axis2_ctx_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_base(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                           axis2_env_t **env);
+
+                           
+struct axis2_conf_ctx* AXIS2_CALL 
+axis2_svc_grp_ctx_get_parent(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                             axis2_env_t **env);
+
+                             
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_free(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                         axis2_env_t **env);
 
+                        
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_init(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                       axis2_env_t **env,
+                       axis2_conf_t *conf);
+
+                       
+axis2_char_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                         axis2_env_t **env);
+
+                         
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_set_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                         axis2_env_t **env, 
+                         axis2_char_t *id);
+                         
+axis2_svc_ctx_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_ctx(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                              axis2_env_t **env,
+                              axis2_char_t *svc_name);
+
+                              
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_fill_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                                   axis2_env_t **env);
+axis2_svc_grp_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_grp(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                              axis2_env_t **env);
+                              
+axis2_hash_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                                  axis2_env_t **env);
+
 
 AXIS2_DECLARE(axis2_svc_grp_ctx_t*)
 axis2_svc_grp_ctx_create(axis2_env_t **env, 
@@ -126,30 +152,51 @@
         return NULL;        
     }
 
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_base = axis2_svc_grp_ctx_get_base;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_parent = axis2_svc_grp_ctx_get_parent;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->free = axis2_svc_grp_ctx_free;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->init = axis2_svc_grp_ctx_init;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_id = axis2_svc_grp_ctx_get_id;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->set_id = axis2_svc_grp_ctx_set_id;
-    
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_ctx = axis2_svc_grp_ctx_get_svc_ctx;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->fill_svc_ctx_map = axis2_svc_grp_ctx_fill_svc_ctx_map;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_grp = axis2_svc_grp_ctx_get_svc_grp;
-    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_ctx_map = axis2_svc_grp_ctx_get_svc_ctx_map;
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_base = 
+        axis2_svc_grp_ctx_get_base;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_parent = 
+        axis2_svc_grp_ctx_get_parent;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->free = 
+        axis2_svc_grp_ctx_free;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->init = 
+        axis2_svc_grp_ctx_init;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_id = 
+        axis2_svc_grp_ctx_get_id;
+
+    svc_grp_ctx_impl->svc_grp_ctx.ops->set_id = 
+        axis2_svc_grp_ctx_set_id;
+    
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_ctx = 
+        axis2_svc_grp_ctx_get_svc_ctx;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->fill_svc_ctx_map = 
+        axis2_svc_grp_ctx_fill_svc_ctx_map;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_grp = 
+        axis2_svc_grp_ctx_get_svc_grp;
+        
+    svc_grp_ctx_impl->svc_grp_ctx.ops->get_svc_ctx_map = 
+        axis2_svc_grp_ctx_get_svc_ctx_map;
     
     return &(svc_grp_ctx_impl->svc_grp_ctx);
 }
 
-axis2_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_get_base(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                            axis2_env_t **env)
+axis2_ctx_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_base(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                           axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->base;
 }
 
 
-struct axis2_conf_ctx* AXIS2_CALL axis2_svc_grp_ctx_get_parent(struct axis2_svc_grp_ctx *svc_grp_ctx, axis2_env_t **env) 
+struct axis2_conf_ctx* AXIS2_CALL 
+axis2_svc_grp_ctx_get_parent(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                             axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->parent;
@@ -157,8 +204,9 @@
 
 
 
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_free (struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_free (struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                        axis2_env_t **env)
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
@@ -214,9 +262,10 @@
 /**
  * The method is used to do the intialization of the EngineContext
  */
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_init(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                                            axis2_env_t **env,
-                    axis2_conf_t *conf) 
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_init(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                       axis2_env_t **env,
+                       axis2_conf_t *conf) 
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
@@ -226,22 +275,26 @@
 
     if (svc_grp_ctx_impl->svc_grp_name)
     {        
-        svc_grp_ctx_impl->svc_grp = AXIS2_CONF_GET_SVC_GRP(conf, env, svc_grp_ctx_impl->svc_grp_name);
+        svc_grp_ctx_impl->svc_grp = 
+            AXIS2_CONF_GET_SVC_GRP(conf, env, svc_grp_ctx_impl->svc_grp_name);
     }
     
     return AXIS2_SUCCESS;
 }
 
 
-axis2_char_t* AXIS2_CALL axis2_svc_grp_ctx_get_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+axis2_char_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                         axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->id;
 }
 
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_set_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env, axis2_char_t *id) 
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_set_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                         axis2_env_t **env, 
+                         axis2_char_t *id) 
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
@@ -264,9 +317,10 @@
 }
 
 /** if the servic name is foo:bar , you should pass only bar */
-axis2_svc_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_ctx(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env,
-                        axis2_char_t *svc_name) 
+axis2_svc_ctx_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_ctx(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                              axis2_env_t **env,
+                              axis2_char_t *svc_name) 
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
@@ -282,8 +336,9 @@
  * if service group has 2 service init , then two service contexts will be
  * created
  */
-axis2_status_t AXIS2_CALL axis2_svc_grp_ctx_fill_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_svc_grp_ctx_fill_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                                   axis2_env_t **env)
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     axis2_hash_index_t *hi = NULL;
@@ -319,15 +374,17 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_svc_grp_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_grp(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env) 
+axis2_svc_grp_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_grp(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                              axis2_env_t **env) 
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->svc_grp;
 }
 
-axis2_hash_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
-                        axis2_env_t **env)
+axis2_hash_t* AXIS2_CALL 
+axis2_svc_grp_ctx_get_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
+                                  axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->svc_ctx_map;

Modified: webservices/axis2/trunk/c/modules/core/description/phase_rule.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/phase_rule.c?rev=389016&r1=389015&r2=389016&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Sun Mar 26 20:05:56 2006
@@ -38,34 +38,69 @@
 /** Interface to implementation conversion macro */
 #define AXIS2_INTF_TO_IMPL(phase_rule) ((axis2_phase_rule_impl_t *)phase_rule)
 
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_before (struct axis2_phase_rule *phase_rule, 
-                                       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_before (struct axis2_phase_rule *phase_rule, 
-                                       axis2_env_t **env, axis2_char_t *before);
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_after (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_after (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_char_t *after);
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_name (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_name (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, const axis2_char_t *name);
-axis2_bool_t AXIS2_CALL axis2_phase_rule_is_phase_first (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_phase_first (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_bool_t phae_first);
-axis2_bool_t AXIS2_CALL axis2_phase_rule_is_phase_last (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_phase_last (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_bool_t phae_last);
-axis2_status_t AXIS2_CALL axis2_phase_rule_free (struct axis2_phase_rule *phase_rule, 
-                                   axis2_env_t **env);
-axis2_phase_rule_t*  AXIS2_CALL axis2_phase_rule_clone (struct axis2_phase_rule *phase_rule, 
-                                   axis2_env_t **env);
+
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_before (struct axis2_phase_rule *phase_rule, 
+                             axis2_env_t **env);
+                             
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_before (struct axis2_phase_rule *phase_rule, 
+                             axis2_env_t **env, 
+                             axis2_char_t *before);
+                             
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_after (struct axis2_phase_rule * phase_rule, 
+                            axis2_env_t **env);
+                            
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_after (struct axis2_phase_rule * phase_rule, 
+                            axis2_env_t **env, 
+                            axis2_char_t *after);
+                            
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_name (struct axis2_phase_rule * phase_rule, 
+                           axis2_env_t **env);
+                           
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_name (struct axis2_phase_rule * phase_rule, 
+                           axis2_env_t **env, 
+                           const axis2_char_t *name);
+
+                           
+axis2_bool_t AXIS2_CALL 
+axis2_phase_rule_is_phase_first (struct axis2_phase_rule * phase_rule, 
+                                 axis2_env_t **env);
+
+                                 
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_phase_first (struct axis2_phase_rule * phase_rule, 
+                                  axis2_env_t **env, 
+                                  axis2_bool_t phae_first);
+
+                                  
+axis2_bool_t AXIS2_CALL 
+axis2_phase_rule_is_phase_last (struct axis2_phase_rule * phase_rule, 
+                                axis2_env_t **env);
+                                
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_phase_last (struct axis2_phase_rule * phase_rule, 
+                                 axis2_env_t **env, 
+                                 axis2_bool_t phae_last);
+                                 
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_free (struct axis2_phase_rule *phase_rule, 
+                       axis2_env_t **env);
+
+                       
+axis2_phase_rule_t*  AXIS2_CALL 
+axis2_phase_rule_clone (struct axis2_phase_rule *phase_rule, 
+                        axis2_env_t **env);
+                        
 
 
 AXIS2_DECLARE(axis2_phase_rule_t*)
-axis2_phase_rule_create(axis2_env_t **env, axis2_char_t *name)
+axis2_phase_rule_create(axis2_env_t **env, 
+                        axis2_char_t *name)
 {
     axis2_phase_rule_impl_t *phase_rule_impl = NULL;
     
@@ -101,31 +136,58 @@
         return NULL;        
     }
 
-    phase_rule_impl->phase_rule.ops->get_before = axis2_phase_rule_get_before;
-    phase_rule_impl->phase_rule.ops->set_before = axis2_phase_rule_set_before;
-    phase_rule_impl->phase_rule.ops->get_after = axis2_phase_rule_get_after;
-    phase_rule_impl->phase_rule.ops->set_after = axis2_phase_rule_set_after;
-    phase_rule_impl->phase_rule.ops->get_name = axis2_phase_rule_get_name;
-    phase_rule_impl->phase_rule.ops->set_name = axis2_phase_rule_set_name;
-    phase_rule_impl->phase_rule.ops->is_phase_first = axis2_phase_rule_is_phase_first;
-    phase_rule_impl->phase_rule.ops->set_phase_first = axis2_phase_rule_set_phase_first;
-    phase_rule_impl->phase_rule.ops->is_phase_last = axis2_phase_rule_is_phase_last;
-    phase_rule_impl->phase_rule.ops->set_phase_last = axis2_phase_rule_set_phase_last;
-    phase_rule_impl->phase_rule.ops->free = axis2_phase_rule_free;
-    phase_rule_impl->phase_rule.ops->clone = axis2_phase_rule_clone;
+    phase_rule_impl->phase_rule.ops->get_before = 
+        axis2_phase_rule_get_before;
+        
+    phase_rule_impl->phase_rule.ops->set_before = 
+        axis2_phase_rule_set_before;
+        
+    phase_rule_impl->phase_rule.ops->get_after = 
+        axis2_phase_rule_get_after;
+        
+    phase_rule_impl->phase_rule.ops->set_after = 
+        axis2_phase_rule_set_after;
+        
+    phase_rule_impl->phase_rule.ops->get_name = 
+        axis2_phase_rule_get_name;
+        
+    phase_rule_impl->phase_rule.ops->set_name = 
+        axis2_phase_rule_set_name;
+        
+    phase_rule_impl->phase_rule.ops->is_phase_first = 
+        axis2_phase_rule_is_phase_first;
+        
+    phase_rule_impl->phase_rule.ops->set_phase_first = 
+        axis2_phase_rule_set_phase_first;
+        
+    phase_rule_impl->phase_rule.ops->is_phase_last = 
+        axis2_phase_rule_is_phase_last;
+        
+    phase_rule_impl->phase_rule.ops->set_phase_last = 
+        axis2_phase_rule_set_phase_last;
+        
+    phase_rule_impl->phase_rule.ops->free = 
+        axis2_phase_rule_free;
+        
+    phase_rule_impl->phase_rule.ops->clone = 
+        axis2_phase_rule_clone;
 
     return &(phase_rule_impl->phase_rule);
 }
 
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_before (struct axis2_phase_rule *phase_rule, 
-                                       axis2_env_t **env)
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_before (struct axis2_phase_rule *phase_rule, 
+                             axis2_env_t **env)
+                             
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(phase_rule)->before;
 }
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_before (struct axis2_phase_rule *phase_rule, 
-                                       axis2_env_t **env, axis2_char_t *before)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_before (struct axis2_phase_rule *phase_rule, 
+                             axis2_env_t **env, 
+                             axis2_char_t *before)
 {
     axis2_phase_rule_impl_t *phase_rule_impl = NULL;
     
@@ -152,15 +214,18 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_after (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env)
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_after (struct axis2_phase_rule * phase_rule, 
+                            axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(phase_rule)->after;
 }
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_after (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_char_t *after)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_after (struct axis2_phase_rule * phase_rule, 
+                            axis2_env_t **env, 
+                            axis2_char_t *after)
 {
     axis2_phase_rule_impl_t *phase_rule_impl = NULL;
     
@@ -187,15 +252,18 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_char_t* AXIS2_CALL axis2_phase_rule_get_name (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env)
+axis2_char_t* AXIS2_CALL 
+axis2_phase_rule_get_name (struct axis2_phase_rule * phase_rule, 
+                           axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(phase_rule)->name;
 }
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_name (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, const axis2_char_t *name)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_name (struct axis2_phase_rule * phase_rule, 
+                           axis2_env_t **env, 
+                           const axis2_char_t *name)
 {
     axis2_phase_rule_impl_t *phase_rule_impl = NULL;
     
@@ -223,30 +291,36 @@
 
 }
 
-axis2_bool_t AXIS2_CALL axis2_phase_rule_is_phase_first (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env)
+axis2_bool_t AXIS2_CALL 
+axis2_phase_rule_is_phase_first (struct axis2_phase_rule * phase_rule, 
+                                 axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(phase_rule)->phase_first;
 }
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_phase_first (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_bool_t phase_first)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_phase_first (struct axis2_phase_rule * phase_rule, 
+                                  axis2_env_t **env, 
+                                  axis2_bool_t phase_first)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(phase_rule)->phase_first = phase_first;
     return AXIS2_SUCCESS;
 }
 
-axis2_bool_t AXIS2_CALL axis2_phase_rule_is_phase_last (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env)
+axis2_bool_t AXIS2_CALL 
+axis2_phase_rule_is_phase_last (struct axis2_phase_rule * phase_rule, 
+                                axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(phase_rule)->phase_last;
 }
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_set_phase_last (struct axis2_phase_rule * phase_rule, 
-                                       axis2_env_t **env, axis2_bool_t phase_last)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_set_phase_last (struct axis2_phase_rule * phase_rule, 
+                                 axis2_env_t **env, 
+                                 axis2_bool_t phase_last)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(phase_rule)->phase_last = phase_last;
@@ -254,8 +328,9 @@
 }
 
 
-axis2_status_t AXIS2_CALL axis2_phase_rule_free (struct axis2_phase_rule *phase_rule, 
-                                   axis2_env_t **env)
+axis2_status_t AXIS2_CALL 
+axis2_phase_rule_free (struct axis2_phase_rule *phase_rule, 
+                       axis2_env_t **env)
 {
     axis2_phase_rule_impl_t *phase_rule_impl = NULL;
     
@@ -293,8 +368,9 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_phase_rule_t*  AXIS2_CALL axis2_phase_rule_clone (struct axis2_phase_rule *phase_rule, 
-                                   axis2_env_t **env)
+axis2_phase_rule_t*  AXIS2_CALL 
+axis2_phase_rule_clone (struct axis2_phase_rule *phase_rule, 
+                        axis2_env_t **env)
 {
     axis2_phase_rule_t *phase_rule_new = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -302,10 +378,21 @@
     phase_rule_new = axis2_phase_rule_create(env, NULL);
     if (!phase_rule_new)
         return NULL;
-    AXIS2_PHASE_RULE_SET_BEFORE(phase_rule_new, env, AXIS2_PHASE_RULE_GET_BEFORE(phase_rule, env));
-    AXIS2_PHASE_RULE_SET_AFTER(phase_rule_new, env, AXIS2_PHASE_RULE_GET_AFTER(phase_rule, env));
-    AXIS2_PHASE_RULE_SET_NAME(phase_rule_new, env, AXIS2_PHASE_RULE_GET_NAME(phase_rule, env));
-    AXIS2_PHASE_RULE_SET_PHASE_FIRST(phase_rule_new, env, AXIS2_PHASE_RULE_IS_PHASE_FIRST(phase_rule, env) );
-    AXIS2_PHASE_RULE_SET_PHASE_LAST(phase_rule_new, env, AXIS2_PHASE_RULE_IS_PHASE_LAST(phase_rule, env) );
+        
+    AXIS2_PHASE_RULE_SET_BEFORE(phase_rule_new, env, 
+        AXIS2_PHASE_RULE_GET_BEFORE(phase_rule, env));
+        
+    AXIS2_PHASE_RULE_SET_AFTER(phase_rule_new, env, 
+        AXIS2_PHASE_RULE_GET_AFTER(phase_rule, env));
+        
+    AXIS2_PHASE_RULE_SET_NAME(phase_rule_new, env, 
+        AXIS2_PHASE_RULE_GET_NAME(phase_rule, env));
+        
+    AXIS2_PHASE_RULE_SET_PHASE_FIRST(phase_rule_new, env, 
+        AXIS2_PHASE_RULE_IS_PHASE_FIRST(phase_rule, env) );
+        
+    AXIS2_PHASE_RULE_SET_PHASE_LAST(phase_rule_new, env, 
+        AXIS2_PHASE_RULE_IS_PHASE_LAST(phase_rule, env) );
+        
     return phase_rule_new;
 }