You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/02/02 08:26:52 UTC
svn commit: r374291 [1/2] - in /webservices/axis2/trunk/c: ./ deploy/
modules/core/deployment/ modules/core/description/ modules/core/engine/
modules/core/phaseresolver/ modules/wsdl/ samples/client/echo/
samples/client/math/ samples/server/ samples/se...
Author: damitha
Date: Wed Feb 1 23:26:20 2006
New Revision: 374291
URL: http://svn.apache.org/viewcvs?rev=374291&view=rev
Log:
make install will install sample libs in correct places.
made some local methods static.
Added:
webservices/axis2/trunk/c/samples/server/axis2.xml
Removed:
webservices/axis2/trunk/c/deploy/
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/description/flow.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/conf.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/modules/wsdl/wsdl_binding.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c
webservices/axis2/trunk/c/samples/client/echo/Makefile.am
webservices/axis2/trunk/c/samples/client/math/Makefile.am
webservices/axis2/trunk/c/samples/server/echo/Makefile.am
webservices/axis2/trunk/c/samples/server/math/Makefile.am
Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build.sh?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Wed Feb 1 23:26:20 2006
@@ -4,5 +4,6 @@
./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-samples=yes
make
make install
-cp -f ${AXIS2C_HOME}/lib/libecho.so ${AXIS2C_HOME}/services/echo
-cp -f ${AXIS2C_HOME}/lib/libmath.so ${AXIS2C_HOME}/services/math
+cp -f samples/server/echo/services.xml ${AXIS2C_HOME}/services/echo
+cp -f samples/server/math/services.xml ${AXIS2C_HOME}/services/math
+cp -f samples/server/axis2.xml ${AXIS2C_HOME}
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed Feb 1 23:26:20 2006
@@ -48,24 +48,24 @@
axis2_env_t **env,
axis2_om_children_qname_iterator_t *module_refs);
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_node_t *disp_order);
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *phase_orders);
-axis2_array_list_t *
+static axis2_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_node_t *phase_orders);
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *trs_senders);
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_transport_recvs(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *trs_recvs);
@@ -331,7 +331,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_node_t *disp_order_node)
@@ -412,7 +412,7 @@
}
/*
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_axis_storage(OMElement storageElement) throws DeploymentException {
AxisStorage axisStorage;
if(storageElement !=null){
@@ -485,7 +485,7 @@
* To process all the phase orders which are defined in axis2.xml
* @param phase_orders
*/
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *phase_orders)
@@ -545,7 +545,7 @@
}
-axis2_array_list_t *
+static axis2_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_node_t *phase_orders_node)
@@ -601,7 +601,7 @@
return phase_list;
}
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *trs_senders)
@@ -758,7 +758,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_transport_recvs(axis2_conf_builder_t *conf_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *trs_recvs)
@@ -923,7 +923,7 @@
* @param oservers
*/
/*
-axis2_status_t
+static axis2_status_t
axis2_conf_builder_process_observers(Iterator oservers) throws DeploymentException {
while (oservers.hasNext()) {
OMElement observerelement = (OMElement) oservers.next();
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Feb 1 23:26:20 2006
@@ -86,12 +86,12 @@
axis2_env_t **env,
axis2_qname_t *module_qname);
-struct axis2_module_desc *AXIS2_CALL
+axis2_module_desc_t *AXIS2_CALL
axis2_dep_engine_get_module(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_qname_t *module_name);
-struct axis2_arch_file_data *AXIS2_CALL
+axis2_arch_file_data_t *AXIS2_CALL
axis2_dep_engine_get_current_file_item(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
@@ -127,7 +127,7 @@
/**
* To set hotDeployment and hot update
*/
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_set_dep_features(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
@@ -140,7 +140,7 @@
axis2_env_t **env,
axis2_char_t *client_home);
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_check_client_home(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_char_t *client_home);
@@ -149,24 +149,24 @@
* This methode used to check the modules referd by server.xml
* are exist , or they have deployed
*/
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_engage_modules(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
/**
* This method is to check wether some one has change the system pre defined phases for all the
- * flows if some one has done so will throw a DeploymentException
+ * flows if some one has done so will set an error code
*
*/
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_validate_system_predefined_phases(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
-axis2_conf_t *
+static axis2_conf_t *
axis2_dep_engine_create_conf(axis2_dep_engine_t *dep_engine,
axis2_env_t **env);
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_new_svc(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_svc_grp_t *svc_metadata);
@@ -176,19 +176,18 @@
* and it will also load the service handlers
*
* @param axisService
- * @throws org.apache.axis2.AxisFault
*/
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_load_svc_props(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_svc_t *svc);
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_load_module_dll(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_module_desc_t *module_desc);
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_flow_handlers(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_flow_t *flow);
@@ -200,7 +199,7 @@
axis2_char_t *dll_name);
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_new_module(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_module_desc_t *module_metadata);
@@ -224,7 +223,7 @@
* @param fileName
* @return String
*/
-axis2_char_t *
+static axis2_char_t *
axis2_dep_engine_get_axis_svc_name(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_char_t *file_name);
@@ -244,7 +243,6 @@
* @param serviceInputStream
* @param classLoader
* @return
- * @throws DeploymentException
*/
axis2_svc_t *AXIS2_CALL
axis2_dep_engine_build_svc(axis2_dep_engine_t *dep_engine,
@@ -257,7 +255,6 @@
*
* @param modulearchive
* @return
- * @throws DeploymentException
*/
axis2_module_desc_t *AXIS2_CALL
@@ -622,7 +619,7 @@
/**
* To set hotDeployment and hot update
*/
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_set_dep_features(axis2_dep_engine_t *dep_engine,
axis2_env_t **env)
{
@@ -830,7 +827,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_check_client_home(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_char_t *client_home)
@@ -871,11 +868,7 @@
return AXIS2_SUCCESS;
}
-/**
- * This methode used to check the modules referd by server.xml
- * are exist , or they have deployed
- */
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_engage_modules(axis2_dep_engine_t *dep_engine,
axis2_env_t **env)
{
@@ -908,12 +901,7 @@
return AXIS2_SUCCESS;
}
-/**
- * This method is to check wether some one has change the system pre defined phases for all the
- * flows if some one has done so will throw a DeploymentException
- *
- */
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_validate_system_predefined_phases(axis2_dep_engine_t *dep_engine,
axis2_env_t **env)
{
@@ -953,7 +941,7 @@
return AXIS2_SUCCESS;
}
-axis2_conf_t *
+static axis2_conf_t *
axis2_dep_engine_create_conf(axis2_dep_engine_t *dep_engine,
axis2_env_t **env)
{
@@ -962,7 +950,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_new_svc(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_svc_grp_t *svc_metadata)
@@ -1096,14 +1084,7 @@
return AXIS2_CONF_ADD_SVC_GRP(engine_impl->conf, env, svc_metadata);
}
-/**
- * This method is used to fill the axis service , it dose loading service class and also the provider class
- * and it will also load the service handlers
- *
- * @param axisService
- * @throws org.apache.axis2.AxisFault
- */
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_load_svc_props(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_svc_t *svc)
@@ -1146,7 +1127,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_load_module_dll(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_module_desc_t *module_desc)
@@ -1176,7 +1157,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_flow_handlers(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_flow_t *flow)
@@ -1239,7 +1220,7 @@
}
-axis2_status_t
+static axis2_status_t
axis2_dep_engine_add_new_module(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_module_desc_t *module_metadata)
@@ -1429,14 +1410,7 @@
return AXIS2_INTF_TO_IMPL(dep_engine)->hot_update;
}
-/**
- * This method is used to retrive service name form the arechive file name
- * if the archive file name is service1.aar , then axis service name would be service1
- *
- * @param fileName
- * @return String
- */
-axis2_char_t *
+static axis2_char_t *
axis2_dep_engine_get_axis_svc_name(axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_char_t *file_name)
@@ -1481,7 +1455,6 @@
* @param serviceInputStream
* @param classLoader
* @return
- * @throws DeploymentException
*/
axis2_svc_t *AXIS2_CALL
axis2_dep_engine_build_svc(axis2_dep_engine_t *dep_engine,
@@ -1515,7 +1488,6 @@
*
* @param modulearchive
* @return
- * @throws DeploymentException
*/
axis2_module_desc_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Wed Feb 1 23:26:20 2006
@@ -78,7 +78,7 @@
* This method is to search a given folder for jar files
* and added them to a list wich is in the WSInfolist class
*/
-axis2_status_t
+static axis2_status_t
axis2_repos_listener_search(axis2_repos_listener_t *listener,
axis2_env_t **env,
axis2_char_t *folder_name,
@@ -298,7 +298,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t
+static axis2_status_t
axis2_repos_listener_search(axis2_repos_listener_t *listener,
axis2_env_t **env,
axis2_char_t *folder_name,
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed Feb 1 23:26:20 2006
@@ -46,7 +46,7 @@
axis2_env_t **env,
axis2_om_node_t *svc_node);
-axis2_array_list_t *
+static axis2_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *op_itr);
@@ -512,7 +512,7 @@
return status;
}
-axis2_array_list_t *
+static axis2_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *op_itr)
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/flow.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Wed Feb 1 23:26:20 2006
@@ -41,6 +41,7 @@
axis2_flow_add_handler (axis2_flow_t *flow,
axis2_env_t **env,
axis2_handler_desc_t *handler);
+
axis2_handler_desc_t * AXIS2_CALL
axis2_flow_get_handler (axis2_flow_t *flow,
axis2_env_t **env,
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Wed Feb 1 23:26:20 2006
@@ -26,13 +26,13 @@
struct axis2_svc_impl
{
axis2_svc_t svc;
- struct axis2_svc_grp *parent;
+ axis2_svc_grp_t *parent;
axis2_hash_t *wasaction_opeartionmap;
axis2_char_t *axis_svc_name;
/** to keep the time that last update time of the service */
long last_update;
axis2_char_t *filename;
- /* struct axis2_wsdl_svc *service_impl; */
+ /* axis2_wsdl_svc_t *service_impl; */
/** to store module ref at deploy time parsing */
axis2_array_list_t *module_list;
@@ -47,13 +47,13 @@
axis2_status_t AXIS2_CALL
axis2_svc_add_op (axis2_svc_t *svc, axis2_env_t **env
- , struct axis2_op *op);
+ , axis2_op_t *op);
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_with_qname (axis2_svc_t *svc, axis2_env_t **env,
axis2_qname_t *op_name);
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_with_name (axis2_svc_t *svc, axis2_env_t **env,
const axis2_char_t* op_name);
@@ -98,28 +98,28 @@
axis2_status_t AXIS2_CALL
axis2_svc_set_svc_interface(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_wsdl_interface *svc_interface);
+ axis2_wsdl_interface_t *svc_interface);
-struct axis2_wsdl_interface * AXIS2_CALL
+axis2_wsdl_interface_t * AXIS2_CALL
axis2_svc_get_svc_interface(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_engage_module(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_module_desc * moduleref,
- struct axis2_conf * axis2_config);
+ axis2_module_desc_t * moduleref,
+ axis2_conf_t * axis2_config);
axis2_status_t AXIS2_CALL
axis2_svc_add_module_ops(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_module_desc * module,
- struct axis2_conf * axis2_config);
+ axis2_module_desc_t * module,
+ axis2_conf_t * axis2_config);
axis2_status_t AXIS2_CALL
axis2_svc_add_to_engaged_module_list(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_module_desc *module_name);
+ axis2_module_desc_t *module_name);
axis2_array_list_t * AXIS2_CALL
axis2_svc_get_engaged_modules(axis2_svc_t *svc,
@@ -149,49 +149,49 @@
axis2_svc_get_style(axis2_svc_t *svc,
axis2_env_t **env);
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_inflow(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_set_inflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *inflow);
+ axis2_flow_t *inflow);
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_outflow(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_set_outflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *outflow);
+ axis2_flow_t *outflow);
-struct axis2_flow *AXIS2_CALL
+axis2_flow_t *AXIS2_CALL
axis2_svc_get_fault_inflow(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_set_fault_inflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *fault_flow);
+ axis2_flow_t *fault_flow);
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_fault_outflow(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_set_fault_outflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *fault_flow);
+ axis2_flow_t *fault_flow);
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_by_soap_action(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action);
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_by_soap_action_and_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action,
@@ -235,9 +235,9 @@
axis2_status_t AXIS2_CALL
axis2_svc_set_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_wsdl_endpoint * endpoint);
+ axis2_wsdl_endpoint_t * endpoint);
-struct axis2_wsdl_endpoint * AXIS2_CALL
+axis2_wsdl_endpoint_t * AXIS2_CALL
axis2_svc_get_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
axis2_qname_t * qname);
@@ -250,7 +250,7 @@
axis2_svc_add_mapping(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t * mapping_key ,
- struct axis2_op * axis2_opt);
+ axis2_op_t * axis2_opt);
axis2_status_t AXIS2_CALL
axis2_svc_add_module_ref(axis2_svc_t *svc,
@@ -268,8 +268,8 @@
{
axis2_svc_impl_t *svc_impl = NULL;
axis2_array_list_t *array_list_l = NULL;
- struct axis2_param_container *param_container_l = NULL;
- struct axis2_wsdl_interface *wsdl_interface_l = NULL;
+ axis2_param_container_t *param_container_l = NULL;
+ axis2_wsdl_interface_t *wsdl_interface_l = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
@@ -609,7 +609,7 @@
return status;
}
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_with_qname (axis2_svc_t *svc,
axis2_env_t **env,
axis2_qname_t *op_name)
@@ -627,12 +627,12 @@
/*TODO commented until AXIS2_WSDL_INTERFACE_GET_ALL_OPS is implemented
all_ops = AXIS2_WSDL_INTERFACE_GET_ALL_OPS(
axis2_svc_get_svc_interface(svc, env), env);
- op_l = (struct axis2_op) (axis2_hash_get (all_ops,
+ op_l = (axis2_op_t) (axis2_hash_get (all_ops,
op_str, AXIS2_HASH_KEY_STRING));
*/
if(NULL == op_l )
{
- op_l = (struct axis2_op *) (axis2_hash_get (
+ op_l = (axis2_op_t *) (axis2_hash_get (
svc_impl->wasaction_opeartionmap, op_str, AXIS2_HASH_KEY_STRING));
}
@@ -761,7 +761,7 @@
axis2_svc_get_params (axis2_svc_t *svc,
axis2_env_t **env)
{
- struct axis2_param_container *param_container_l = NULL;
+ axis2_param_container_t *param_container_l = NULL;
AXIS2_ENV_CHECK(env, NULL);
param_container_l = (axis2_param_container_t *)
@@ -778,8 +778,8 @@
{
axis2_bool_t locked = AXIS2_FALSE;
axis2_param_t *param_l = NULL;
- struct axis2_conf *conf_l = NULL;
- struct axis2_svc_grp *parent = NULL;
+ axis2_conf_t *conf_l = NULL;
+ axis2_svc_grp_t *parent = NULL;
axis2_bool_t ret = AXIS2_FALSE;
AXIS2_FUNC_PARAM_CHECK(svc, env, AXIS2_FALSE);
@@ -820,7 +820,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_set_svc_interface(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_wsdl_interface *svc_interface)
+ axis2_wsdl_interface_t *svc_interface)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, svc_interface, AXIS2_FAILURE);
@@ -828,7 +828,7 @@
return AXIS2_WSDL_SVC_SET_SVC_INTERFACE(svc->wsdl_svc, env, svc_interface);
}
-struct axis2_wsdl_interface *AXIS2_CALL
+axis2_wsdl_interface_t *AXIS2_CALL
axis2_svc_get_svc_interface(axis2_svc_t *svc,
axis2_env_t **env)
{
@@ -839,10 +839,10 @@
axis2_status_t AXIS2_CALL
axis2_svc_engage_module(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_module_desc * moduleref,
- struct axis2_conf * axis2_config)
+ axis2_module_desc_t * moduleref,
+ axis2_conf_t * axis2_config)
{
- struct axis2_module_desc * modu = NULL;
+ axis2_module_desc_t * modu = NULL;
axis2_array_list_t *collection_module = NULL;
axis2_phase_resolver_t *phase_resolver = NULL;
int i = 0;
@@ -995,10 +995,10 @@
axis2_status_t AXIS2_CALL
axis2_svc_add_to_engaged_module_list(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_module_desc *module_name)
+ axis2_module_desc_t *module_name)
{
axis2_array_list_t *collection_module = NULL;
- struct axis2_module_desc * module_desc = NULL;
+ axis2_module_desc_t * module_desc = NULL;
int i = 0;
int size = 0;
@@ -1020,7 +1020,7 @@
}
for(i = 0; i < size; i++)
{
- module_desc = (struct axis2_module_desc *) AXIS2_ARRAY_LIST_GET(
+ module_desc = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
collection_module, env, i);
if(AXIS2_QNAME_EQUALS(AXIS2_MODULE_DESC_GET_NAME(module_desc, env), env,
AXIS2_MODULE_DESC_GET_NAME(module_name, env)))
@@ -1119,19 +1119,19 @@
svc->wsdl_svc->wsdl_component, env, AXIS2_STYLE_KEY);
}
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_inflow(axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
- return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
+ return (axis2_flow_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_INFLOW_KEY);
}
axis2_status_t AXIS2_CALL
axis2_svc_set_inflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *inflow)
+ axis2_flow_t *inflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, inflow, AXIS2_FAILURE);
@@ -1140,19 +1140,19 @@
wsdl_component, env, AXIS2_INFLOW_KEY, inflow);
}
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_outflow(axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
- return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
+ return (axis2_flow_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_OUTFLOW_KEY);
}
axis2_status_t AXIS2_CALL
axis2_svc_set_outflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *outflow)
+ axis2_flow_t *outflow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, outflow, AXIS2_FAILURE);
@@ -1161,20 +1161,20 @@
wsdl_component, env, AXIS2_OUTFLOW_KEY, outflow);
}
-struct axis2_flow *AXIS2_CALL
+axis2_flow_t *AXIS2_CALL
axis2_svc_get_fault_inflow(axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
- return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
+ return (axis2_flow_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
}
axis2_status_t AXIS2_CALL
axis2_svc_set_fault_inflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *fault_flow)
+ axis2_flow_t *fault_flow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_flow, AXIS2_FAILURE);
@@ -1182,20 +1182,20 @@
wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY, fault_flow);
}
-struct axis2_flow * AXIS2_CALL
+axis2_flow_t * AXIS2_CALL
axis2_svc_get_fault_outflow(axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
- return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
+ return (axis2_flow_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
}
axis2_status_t AXIS2_CALL
axis2_svc_set_fault_outflow(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_flow *fault_flow)
+ axis2_flow_t *fault_flow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_flow, AXIS2_FAILURE);
@@ -1204,7 +1204,7 @@
wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY, fault_flow);
}
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_by_soap_action(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action)
@@ -1242,7 +1242,7 @@
return NULL;
}
-struct axis2_op * AXIS2_CALL
+axis2_op_t * AXIS2_CALL
axis2_svc_get_op_by_soap_action_and_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
axis2_char_t *soap_action,
@@ -1252,9 +1252,9 @@
axis2_hash_t *binding_ops = NULL;
int count = 0;
axis2_hash_index_t *index_i = NULL;
- struct axis2_wsdl_binding_op *binding_op = NULL;
- struct axis2_wsdl_soap_op *element = NULL;
- struct axis2_op *op = NULL;
+ axis2_wsdl_binding_op_t *binding_op = NULL;
+ axis2_wsdl_soap_op_t *element = NULL;
+ axis2_op_t *op = NULL;
axis2_linked_list_t *extensiblity_elements = NULL;
axis2_qname_t *type_1 = NULL;
axis2_wsdl_binding_t *wsdl_binding = NULL;
@@ -1279,7 +1279,7 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_hash_this (index_i, &k, NULL, NULL);
- binding_op = (struct axis2_wsdl_binding_op *) k;
+ binding_op = (axis2_wsdl_binding_op_t *) k;
extensiblity_elements = AXIS2_WSDL_COMPONENT_GET_EXTENSIBILITY_ELEMENTS(
binding_op->extensible_component->wsdl_component, env);
@@ -1293,7 +1293,7 @@
{
axis2_qname_t *type_2 = NULL;
- element = (struct axis2_wsdl_soap_op *) AXIS2_LINKED_LIST_GET(
+ element = (axis2_wsdl_soap_op_t *) AXIS2_LINKED_LIST_GET(
extensiblity_elements, env, j);
type_2 = AXIS2_WSDL_EXTENSIBLE_ELEMENT_GET_TYPE(element->
@@ -1303,7 +1303,7 @@
if(0 == AXIS2_STRCMP(AXIS2_WSDL_SOAP_OP_GET_SOAP_ACTION(
element, env), soap_action))
{
- op = (struct axis2_op *)
+ op = (axis2_op_t *)
AXIS2_WSDL_BINDING_OP_GET_OP(binding_op,
env);
count++;
@@ -1423,7 +1423,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_set_endpoint(axis2_svc_t *svc,
axis2_env_t **env,
- struct axis2_wsdl_endpoint * endpoint)
+ axis2_wsdl_endpoint_t * endpoint)
{
return AXIS2_WSDL_SVC_SET_ENDPOINT(svc->wsdl_svc, env, endpoint);
}
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Wed Feb 1 23:26:20 2006
@@ -28,7 +28,7 @@
/** to store service Group modules name */
axis2_array_list_t *modules;
/** to store module ref at deploy time parsing */
- struct axis2_conf *parent;
+ axis2_conf_t *parent;
axis2_array_list_t *module_list;
@@ -56,7 +56,7 @@
axis2_env_t **env,
axis2_svc_t *svc);
-struct axis2_svc * AXIS2_CALL
+axis2_svc_t * AXIS2_CALL
axis2_svc_grp_get_svc (axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
axis2_qname_t* svc_name);
@@ -95,14 +95,14 @@
axis2_env_t **env,
axis2_qname_t *module_qname);
-struct axis2_conf * AXIS2_CALL
+axis2_conf_t * AXIS2_CALL
axis2_svc_grp_get_parent(axis2_svc_grp_t *svc_grp,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_grp_set_parent(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
- struct axis2_conf *parent);
+ axis2_conf_t *parent);
axis2_status_t AXIS2_CALL
axis2_svc_grp_engage_module_to_grp(axis2_svc_grp_t *svc_grp,
@@ -113,14 +113,14 @@
axis2_svc_grp_get_svc_grp_modules(axis2_svc_grp_t *svc_grp,
axis2_env_t **env);
-struct axis2_conf *AXIS2_CALL
+axis2_conf_t *AXIS2_CALL
axis2_svc_grp_get_axis_desc(axis2_svc_grp_t *svc_grp,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_svc_grp_set_axis_desc(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
- struct axis2_conf *axis2_desc);
+ axis2_conf_t *axis2_desc);
axis2_status_t AXIS2_CALL
axis2_svc_grp_add_moduleref(axis2_svc_grp_t *svc_grp,
@@ -131,10 +131,10 @@
axis2_svc_grp_get_modules(axis2_svc_grp_t *svc_grp,
axis2_env_t **env);
-struct axis2_svc_grp_ctx *AXIS2_CALL
+axis2_svc_grp_ctx_t *AXIS2_CALL
axis2_svc_grp_get_svc_grp_ctx(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
- struct axis2_conf_ctx *parent);
+ axis2_conf_ctx_t *parent);
/***************************** End of function headers ************************/
@@ -228,7 +228,7 @@
axis2_svc_grp_t * AXIS2_CALL
axis2_svc_grp_create_with_conf (axis2_env_t **env,
- struct axis2_conf *conf)
+ axis2_conf_t *conf)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
@@ -280,9 +280,9 @@
for (hi = axis2_hash_first (svc_grp_impl->svcs, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_svc *svc = NULL;
+ axis2_svc_t *svc = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- svc = (struct axis2_svc *) val;
+ svc = (axis2_svc_t *) val;
if (svc)
AXIS2_SVC_FREE (svc, env);
@@ -306,10 +306,10 @@
int i = 0;
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(svc_grp_impl->module_list, env); i++)
{
- struct axis2_module_desc *module_desc = NULL;
+ axis2_module_desc_t *module_desc = NULL;
module_desc = AXIS2_ARRAY_LIST_GET(svc_grp_impl->module_list, env, i);
- module_desc = (struct axis2_module_desc *) val;
+ module_desc = (axis2_module_desc_t *) val;
if (module_desc)
AXIS2_MODULE_DESC_FREE (module_desc, env);
@@ -377,7 +377,7 @@
axis2_svc_t *svc)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
- struct axis2_phase_resolver *handler_resolver = NULL;
+ axis2_phase_resolver_t *handler_resolver = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_qname_t *svc_qname = NULL;
@@ -441,7 +441,7 @@
return status;
}
-struct axis2_svc *AXIS2_CALL
+axis2_svc_t *AXIS2_CALL
axis2_svc_grp_get_svc(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
axis2_qname_t *name)
@@ -452,7 +452,7 @@
AXIS2_PARAM_CHECK((*env)->error, name, NULL);
svc_grp_impl = AXIS2_INTF_TO_IMPL(svc_grp);
- return (struct axis2_svc *) axis2_hash_get(svc_grp_impl->svcs, name,
+ return (axis2_svc_t *) axis2_hash_get(svc_grp_impl->svcs, name,
sizeof(axis2_qname_t));
}
@@ -469,7 +469,7 @@
axis2_env_t **env,
axis2_qname_t* svc_name)
{
- struct axis2_svc *svc = NULL;
+ axis2_svc_t *svc = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, svc_name, AXIS2_FAILURE);
@@ -538,7 +538,7 @@
axis2_char_t *param_name)
{
axis2_bool_t locked = AXIS2_FALSE;
- struct axis2_conf *parent = NULL;
+ axis2_conf_t *parent = NULL;
axis2_param_t *param = NULL;
axis2_bool_t ret = AXIS2_FALSE;
@@ -579,7 +579,7 @@
module_qname);
}
-struct axis2_conf * AXIS2_CALL
+axis2_conf_t * AXIS2_CALL
axis2_svc_grp_get_parent(axis2_svc_grp_t *svc_grp,
axis2_env_t **env)
{
@@ -591,7 +591,7 @@
axis2_status_t AXIS2_CALL
axis2_svc_grp_set_parent(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
- struct axis2_conf *parent)
+ axis2_conf_t *parent)
{
axis2_svc_grp_impl_t *svc_grp_impl = NULL;
@@ -617,10 +617,10 @@
axis2_char_t *modu_local = NULL;
axis2_char_t *module_name_local = NULL;
axis2_hash_t *svc = NULL;
- struct axis2_phase_resolver *phase_resolver = NULL;
- struct axis2_module_desc *module = NULL;
+ axis2_phase_resolver_t *phase_resolver = NULL;
+ axis2_module_desc_t *module = NULL;
- struct axis2_svc *axis_svc = NULL;
+ axis2_svc_t *axis_svc = NULL;
int size = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -663,7 +663,7 @@
void *v = NULL;
/* engage in per each service */
axis2_hash_this (index, NULL, NULL, &v);
- axis_svc = (struct axis2_svc *) v;
+ axis_svc = (axis2_svc_t *) v;
status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC(phase_resolver,
env, axis_svc, module);
if(AXIS2_FAILURE == status)
@@ -690,7 +690,7 @@
return AXIS2_INTF_TO_IMPL(svc_grp)->modules;
}
-struct axis2_conf *AXIS2_CALL
+axis2_conf_t *AXIS2_CALL
axis2_svc_grp_get_axis_desc(axis2_svc_grp_t *svc_grp,
axis2_env_t **env)
{
@@ -747,12 +747,12 @@
return AXIS2_INTF_TO_IMPL(svc_grp)->module_list;
}
-struct axis2_svc_grp_ctx *AXIS2_CALL
+axis2_svc_grp_ctx_t *AXIS2_CALL
axis2_svc_grp_get_svc_grp_ctx(axis2_svc_grp_t *svc_grp,
axis2_env_t **env,
- struct axis2_conf_ctx *parent)
+ axis2_conf_ctx_t *parent)
{
- struct axis2_svc_grp_ctx *svc_grp_ctx = NULL;
+ axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, parent, NULL);
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Wed Feb 1 23:26:20 2006
@@ -29,13 +29,13 @@
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
*/
- struct axis2_flow *inflow;
+ axis2_flow_t *inflow;
/**
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
*/
- struct axis2_flow *faultflow;
+ axis2_flow_t *faultflow;
/**
* Field name
@@ -49,10 +49,10 @@
axis2_transport_receiver_t *recv;
/** to store handler in inFlow */
- struct axis2_phase *in_phase;
+ axis2_phase_t *in_phase;
/** to store handler Fault in inFlow */
- struct axis2_phase *faultphase;
+ axis2_phase_t *faultphase;
} axis2_transport_in_desc_impl_t;
@@ -67,58 +67,58 @@
axis2_env_t **env);
axis2_qname_t *AXIS2_CALL
-axis2_transport_in_desc_get_qname(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_get_qname(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_qname(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_qname(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
axis2_qname_t *qname);
-struct axis2_flow *AXIS2_CALL
-axis2_transport_in_desc_get_inflow(struct axis2_transport_in_desc *transport_in,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_in_desc_get_inflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_inflow(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_inflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_flow *inflow);
+ axis2_flow_t *inflow);
-struct axis2_flow *AXIS2_CALL
-axis2_transport_in_desc_get_faultflow(struct axis2_transport_in_desc *transport_in,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_in_desc_get_faultflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_faultflow(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_faultflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_flow *faultflow);
+ axis2_flow_t *faultflow);
axis2_transport_receiver_t * AXIS2_CALL
-axis2_transport_in_desc_get_recv(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_get_recv(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_recv(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_recv(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
axis2_transport_receiver_t *recv);
-struct axis2_phase * AXIS2_CALL
-axis2_transport_in_desc_get_in_phase(struct axis2_transport_in_desc *transport_in,
+axis2_phase_t * AXIS2_CALL
+axis2_transport_in_desc_get_in_phase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_in_phase(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_in_phase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_phase *in_phase);
+ axis2_phase_t *in_phase);
-struct axis2_phase *AXIS2_CALL
-axis2_transport_in_desc_get_faultphase(struct axis2_transport_in_desc *transport_in,
+axis2_phase_t *AXIS2_CALL
+axis2_transport_in_desc_get_faultphase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_faultphase(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_faultphase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_phase *faultphase);
+ axis2_phase_t *faultphase);
/************************** End of function prototypes ************************/
@@ -261,7 +261,7 @@
}
axis2_qname_t *AXIS2_CALL
-axis2_transport_in_desc_get_qname(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_get_qname(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
@@ -269,7 +269,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_qname(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_qname(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
axis2_qname_t *qname)
{
@@ -289,8 +289,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_flow *AXIS2_CALL
-axis2_transport_in_desc_get_inflow(struct axis2_transport_in_desc *transport_in,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_in_desc_get_inflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
@@ -298,9 +298,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_inflow(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_inflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_flow *inflow)
+ axis2_flow_t *inflow)
{
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
@@ -316,17 +316,17 @@
return AXIS2_SUCCESS;
}
-struct axis2_flow *AXIS2_CALL
-axis2_transport_in_desc_get_faultflow(struct axis2_transport_in_desc *transport_in,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_in_desc_get_faultflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
return AXIS2_INTF_TO_IMPL(transport_in)->faultflow;
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_faultflow(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_faultflow(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_flow *faultflow)
+ axis2_flow_t *faultflow)
{
axis2_transport_in_desc_impl_t *transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
@@ -343,7 +343,7 @@
}
axis2_transport_receiver_t * AXIS2_CALL
-axis2_transport_in_desc_get_recv(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_get_recv(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
@@ -351,7 +351,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_recv(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_recv(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
axis2_transport_receiver_t *recv)
{
@@ -364,8 +364,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_phase * AXIS2_CALL
-axis2_transport_in_desc_get_in_phase(struct axis2_transport_in_desc *transport_in,
+axis2_phase_t * AXIS2_CALL
+axis2_transport_in_desc_get_in_phase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
@@ -374,9 +374,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_in_phase(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_in_phase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_phase *in_phase)
+ axis2_phase_t *in_phase)
{
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
@@ -393,8 +393,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_phase *AXIS2_CALL
-axis2_transport_in_desc_get_faultphase(struct axis2_transport_in_desc *transport_in,
+axis2_phase_t *AXIS2_CALL
+axis2_transport_in_desc_get_faultphase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
@@ -403,9 +403,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_faultphase(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_set_faultphase(axis2_transport_in_desc_t *transport_in,
axis2_env_t **env,
- struct axis2_phase *faultphase)
+ axis2_phase_t *faultphase)
{
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Wed Feb 1 23:26:20 2006
@@ -29,13 +29,13 @@
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
*/
- struct axis2_flow *outflow;
+ axis2_flow_t *outflow;
/**
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
*/
- struct axis2_flow *faultflow;
+ axis2_flow_t *faultflow;
/**
* Field name
@@ -46,13 +46,13 @@
/**
* This will have a shallow copy and will not be freed by the descructor
*/
- struct axis2_transport_sender *sender;
+ axis2_transport_sender_t *sender;
/** to store handler in inFlow */
- struct axis2_phase *out_phase;
+ axis2_phase_t *out_phase;
/** to store handler Fault in inFlow */
- struct axis2_phase *faultphase;
+ axis2_phase_t *faultphase;
} axis2_transport_out_desc_impl_t;
@@ -67,58 +67,58 @@
axis2_env_t **env);
axis2_qname_t *AXIS2_CALL
-axis2_transport_out_desc_get_qname(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_get_qname(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_qname(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_qname(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
axis2_qname_t *qname);
-struct axis2_flow *AXIS2_CALL
-axis2_transport_out_desc_get_outflow(struct axis2_transport_out_desc *transport_out,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_out_desc_get_outflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_outflow(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_outflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_flow *outflow);
+ axis2_flow_t *outflow);
-struct axis2_flow *AXIS2_CALL
-axis2_transport_out_desc_get_faultflow(struct axis2_transport_out_desc *transport_out,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_out_desc_get_faultflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultflow(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_faultflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_flow *faultflow);
+ axis2_flow_t *faultflow);
-struct axis2_transport_sender * AXIS2_CALL
-axis2_transport_out_desc_get_sender(struct axis2_transport_out_desc *transport_out,
+axis2_transport_sender_t * AXIS2_CALL
+axis2_transport_out_desc_get_sender(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_sender(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_sender(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_transport_sender *sender);
+ axis2_transport_sender_t *sender);
-struct axis2_phase * AXIS2_CALL
-axis2_transport_out_desc_get_out_phase(struct axis2_transport_out_desc *transport_out,
+axis2_phase_t * AXIS2_CALL
+axis2_transport_out_desc_get_out_phase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_out_phase(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_out_phase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_phase *out_phase);
+ axis2_phase_t *out_phase);
-struct axis2_phase *AXIS2_CALL
-axis2_transport_out_desc_get_faultphase(struct axis2_transport_out_desc *transport_out,
+axis2_phase_t *AXIS2_CALL
+axis2_transport_out_desc_get_faultphase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultphase(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_faultphase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_phase *faultphase);
+ axis2_phase_t *faultphase);
/************************** End of function prototypes ************************/
@@ -260,7 +260,7 @@
}
axis2_qname_t *AXIS2_CALL
-axis2_transport_out_desc_get_qname(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_get_qname(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
@@ -268,7 +268,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_qname(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_qname(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
axis2_qname_t *qname)
{
@@ -285,8 +285,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_flow *AXIS2_CALL
-axis2_transport_out_desc_get_outflow(struct axis2_transport_out_desc *transport_out,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_out_desc_get_outflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
@@ -294,9 +294,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_outflow(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_outflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_flow *outflow)
+ axis2_flow_t *outflow)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
@@ -312,17 +312,17 @@
return AXIS2_SUCCESS;
}
-struct axis2_flow *AXIS2_CALL
-axis2_transport_out_desc_get_faultflow(struct axis2_transport_out_desc *transport_out,
+axis2_flow_t *AXIS2_CALL
+axis2_transport_out_desc_get_faultflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
return AXIS2_INTF_TO_IMPL(transport_out)->faultflow;
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultflow(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_faultflow(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_flow *faultflow)
+ axis2_flow_t *faultflow)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
@@ -338,8 +338,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_transport_sender * AXIS2_CALL
-axis2_transport_out_desc_get_sender(struct axis2_transport_out_desc *transport_out,
+axis2_transport_sender_t * AXIS2_CALL
+axis2_transport_out_desc_get_sender(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
@@ -347,9 +347,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_sender(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_sender(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_transport_sender *sender)
+ axis2_transport_sender_t *sender)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
@@ -361,8 +361,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_phase * AXIS2_CALL
-axis2_transport_out_desc_get_out_phase(struct axis2_transport_out_desc *transport_out,
+axis2_phase_t * AXIS2_CALL
+axis2_transport_out_desc_get_out_phase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
@@ -371,9 +371,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_out_phase(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_out_phase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_phase *out_phase)
+ axis2_phase_t *out_phase)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
@@ -390,8 +390,8 @@
return AXIS2_SUCCESS;
}
-struct axis2_phase *AXIS2_CALL
-axis2_transport_out_desc_get_faultphase(struct axis2_transport_out_desc *transport_out,
+axis2_phase_t *AXIS2_CALL
+axis2_transport_out_desc_get_faultphase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
@@ -400,9 +400,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_faultphase(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_set_faultphase(axis2_transport_out_desc_t *transport_out,
axis2_env_t **env,
- struct axis2_phase *faultphase)
+ axis2_phase_t *faultphase)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed Feb 1 23:26:20 2006
@@ -47,7 +47,7 @@
axis2_array_list_t *out_faultphases;
axis2_array_list_t *in_phases_upto_and_including_post_dispatch;
- struct axis2_phases_info *phases_info;
+ axis2_phases_info_t *phases_info;
axis2_hash_t *all_svcs;
axis2_hash_t *msg_recvs;
axis2_hash_t *faulty_svcs;
@@ -67,9 +67,9 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc_grp (axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_svc_grp *svc_grp);
+ axis2_svc_grp_t *svc_grp);
-struct axis2_svc_grp * AXIS2_CALL
+axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *svc_grp_name);
@@ -81,9 +81,9 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_svc (axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_svc *svc);
+ axis2_svc_t *svc);
-struct axis2_svc * AXIS2_CALL
+axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t* svc_name);
@@ -121,12 +121,12 @@
* @param svc_name
* @return svc name and grp name
*/
-axis2_status_t
+static axis2_status_t
split_svc_name(axis2_env_t **env,
axis2_char_t *svc_name,
axis2_char_t **svc_name_st);
-struct axis2_transport_in_desc * AXIS2_CALL
+axis2_transport_in_desc_t * AXIS2_CALL
axis2_conf_get_transport_in(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname);
@@ -134,9 +134,9 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_in(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_transport_in_desc *transport);
+ axis2_transport_in_desc_t *transport);
-struct axis2_transport_out_desc * AXIS2_CALL
+axis2_transport_out_desc_t * AXIS2_CALL
axis2_conf_get_transport_out(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname);
@@ -144,7 +144,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_out(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_transport_out_desc *transport);
+ axis2_transport_out_desc_t *transport);
axis2_hash_t * AXIS2_CALL
axis2_conf_get_transports_in(axis2_conf_t *conf,
@@ -154,7 +154,7 @@
axis2_conf_get_transports_out(axis2_conf_t *conf,
axis2_env_t **env);
-struct axis2_module_desc *AXIS2_CALL
+axis2_module_desc_t *AXIS2_CALL
axis2_conf_get_module(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname);
@@ -198,21 +198,21 @@
axis2_env_t **env,
axis2_qname_t *module_name);
-struct axis2_phases_info *AXIS2_CALL
+axis2_phases_info_t *AXIS2_CALL
axis2_conf_get_phases_info(axis2_conf_t *conf,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_conf_set_phases_info(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_phases_info *phases_info);
+ axis2_phases_info_t *phases_info);
axis2_status_t AXIS2_CALL
axis2_conf_add_msg_recv(axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *key,
- struct axis2_msg_recv *msg_recv);
+ axis2_msg_recv_t *msg_recv);
-struct axis2_msg_recv *AXIS2_CALL
+axis2_msg_recv_t *AXIS2_CALL
axis2_conf_get_msg_recv(axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *key);
@@ -256,7 +256,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_module(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_module_desc *module);
+ axis2_module_desc_t *module);
axis2_status_t AXIS2_CALL
axis2_conf_set_default_dispatchers(axis2_conf_t *conf,
@@ -299,7 +299,7 @@
config_impl->modules = NULL;
config_impl->engaged_modules = NULL;
config_impl->in_phases_upto_and_including_post_dispatch = NULL;
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
config_impl->out_phases = NULL;
config_impl->in_faultphases = NULL;
config_impl->out_faultphases = NULL;
@@ -605,9 +605,9 @@
for (hi = axis2_hash_first (config_impl->svc_grps, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_svc_grp *svc_grp = NULL;
+ axis2_svc_grp_t *svc_grp = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- svc_grp = (struct axis2_svc_grp *) val;
+ svc_grp = (axis2_svc_grp_t *) val;
if (svc_grp)
AXIS2_SVC_GRP_FREE (svc_grp, env);
@@ -626,9 +626,9 @@
for (hi = axis2_hash_first (config_impl->transports_in, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_transport_in_desc *transport_in = NULL;
+ axis2_transport_in_desc_t *transport_in = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- transport_in = (struct axis2_transport_in_desc *) val;
+ transport_in = (axis2_transport_in_desc_t *) val;
if (transport_in)
AXIS2_TRANSPORT_IN_DESC_FREE (transport_in, env);
@@ -647,9 +647,9 @@
for (hi = axis2_hash_first (config_impl->transports_out, env); hi;
hi = axis2_hash_next ( env, hi))
{
- struct axis2_transport_out_desc *transport_out = NULL;
+ axis2_transport_out_desc_t *transport_out = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- transport_out = (struct axis2_transport_out_desc *) val;
+ transport_out = (axis2_transport_out_desc_t *) val;
if (transport_out)
AXIS2_TRANSPORT_IN_DESC_FREE (transport_out, env);
@@ -679,10 +679,10 @@
int i = 0;
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(config_impl->out_phases, env); i++)
{
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
phase = AXIS2_ARRAY_LIST_GET(config_impl->out_phases, env, i);
- phase = (struct axis2_phase *) val;
+ phase = (axis2_phase_t *) val;
if (phase)
AXIS2_PHASE_FREE (phase, env);
@@ -700,10 +700,10 @@
int i = 0;
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(config_impl->in_faultphases, env); i++)
{
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
phase = AXIS2_ARRAY_LIST_GET(config_impl->in_faultphases, env, i);
- phase = (struct axis2_phase *) val;
+ phase = (axis2_phase_t *) val;
if (phase)
AXIS2_PHASE_FREE (phase, env);
@@ -721,10 +721,10 @@
int i = 0;
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(config_impl->out_faultphases, env); i++)
{
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
phase = AXIS2_ARRAY_LIST_GET(config_impl->out_faultphases, env, i);
- phase = (struct axis2_phase *) val;
+ phase = (axis2_phase_t *) val;
if (phase)
AXIS2_PHASE_FREE (phase, env);
@@ -743,11 +743,11 @@
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(config_impl->
in_phases_upto_and_including_post_dispatch, env); i++)
{
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
phase = AXIS2_ARRAY_LIST_GET(config_impl->
in_phases_upto_and_including_post_dispatch, env, i);
- phase = (struct axis2_phase *) val;
+ phase = (axis2_phase_t *) val;
if (phase)
AXIS2_PHASE_FREE (phase, env);
@@ -849,7 +849,7 @@
axis2_svc_t *desc = NULL;
axis2_hash_this (index_i, NULL, NULL, &value);
- desc = (struct axis2_svc *) value;
+ desc = (axis2_svc_t *) value;
svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(desc, env), env);
axis2_hash_set(config_impl->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
desc);
@@ -883,7 +883,7 @@
return AXIS2_SUCCESS;
}
-struct axis2_svc_grp * AXIS2_CALL
+axis2_svc_grp_t * AXIS2_CALL
axis2_conf_get_svc_grp (axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *svc_grp_name)
@@ -899,7 +899,7 @@
AXIS2_FAILURE);
return NULL;
}
- return (struct axis2_svc_grp *) (axis2_hash_get (config_impl->svc_grps,
+ return (axis2_svc_grp_t *) (axis2_hash_get (config_impl->svc_grps,
svc_grp_name, AXIS2_HASH_KEY_STRING));
}
@@ -916,7 +916,7 @@
axis2_env_t **env,
axis2_svc_t *svc)
{
- struct axis2_svc_grp *svc_grp = NULL;
+ axis2_svc_grp_t *svc_grp = NULL;
axis2_qname_t *svc_grp_qname = NULL;
axis2_char_t *svc_grp_name = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -965,7 +965,7 @@
return status;
}
-struct axis2_svc * AXIS2_CALL
+axis2_svc_t * AXIS2_CALL
axis2_conf_get_svc (axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t* svc_name)
@@ -1051,7 +1051,7 @@
axis2_env_t **env,
axis2_char_t *param_name)
{
- struct axis2_param *param = NULL;
+ axis2_param_t *param = NULL;
AXIS2_FUNC_PARAM_CHECK(conf, env, AXIS2_FALSE);
AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FALSE);
@@ -1060,7 +1060,7 @@
return (NULL != param && AXIS2_PARAM_IS_LOCKED(param, env));
}
-struct axis2_transport_in_desc * AXIS2_CALL
+axis2_transport_in_desc_t * AXIS2_CALL
axis2_conf_get_transport_in(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname)
@@ -1071,7 +1071,7 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
- return (struct axis2_transport_in_desc *) axis2_hash_get(config_impl->
+ return (axis2_transport_in_desc_t *) axis2_hash_get(config_impl->
transports_in, AXIS2_QNAME_TO_STRING(qname, env), AXIS2_HASH_KEY_STRING);
}
@@ -1084,7 +1084,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_in(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_transport_in_desc *transport)
+ axis2_transport_in_desc_t *transport)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_qname_t *qname = NULL;
@@ -1112,7 +1112,7 @@
}
-struct axis2_transport_out_desc * AXIS2_CALL
+axis2_transport_out_desc_t * AXIS2_CALL
axis2_conf_get_transport_out(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname)
@@ -1123,7 +1123,7 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
- return (struct axis2_transport_out_desc *) axis2_hash_get(config_impl->
+ return (axis2_transport_out_desc_t *) axis2_hash_get(config_impl->
transports_out, AXIS2_QNAME_TO_STRING(qname, env), AXIS2_HASH_KEY_STRING);
}
@@ -1136,7 +1136,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_transport_out(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_transport_out_desc *transport)
+ axis2_transport_out_desc_t *transport)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_qname_t *qname = NULL;
@@ -1177,7 +1177,7 @@
* @param name
* @return ModuleDescription
*/
-struct axis2_module_desc *AXIS2_CALL
+axis2_module_desc_t *AXIS2_CALL
axis2_conf_get_module(axis2_conf_t *conf,
axis2_env_t **env,
axis2_qname_t *qname)
@@ -1185,7 +1185,7 @@
AXIS2_FUNC_PARAM_CHECK(conf, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
- return (struct axis2_module_desc *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
+ return (axis2_module_desc_t *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
conf)->modules, qname, sizeof(axis2_qname_t));
}
@@ -1251,7 +1251,7 @@
return AXIS2_INTF_TO_IMPL(conf)->transports_out;
}
-/*axis2_status_t
+/*static axis2_status_t
split_svc_name (axis2_env_t **env,
axis2_char_t *svc_name,
axis2_char_t **svc_name_st)
@@ -1305,9 +1305,9 @@
axis2_hash_index_t *index_j = NULL;
void *value = NULL;
void *value2 = NULL;
- struct axis2_svc_grp *axis_svc_grp = NULL;
+ axis2_svc_grp_t *axis_svc_grp = NULL;
axis2_hash_t *svcs = NULL;
- struct axis2_svc *svc =NULL;
+ axis2_svc_t *svc =NULL;
axis2_char_t *svc_name = NULL;
AXIS2_FUNC_PARAM_CHECK(conf, env, NULL);
@@ -1318,13 +1318,13 @@
while(NULL != index_i)
{
axis2_hash_this(index_i, NULL, NULL, &value);
- axis_svc_grp = (struct axis2_svc_grp *) value;
+ axis_svc_grp = (axis2_svc_grp_t *) value;
svcs = AXIS2_SVC_GRP_GET_SVCS(axis_svc_grp, env);
index_j = axis2_hash_first(svcs, env);
while(NULL != index_j)
{
axis2_hash_this(index_j, NULL, NULL, &value2);
- svc = (struct axis2_svc *) value2;
+ svc = (axis2_svc_t *) value2;
svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(svc, env), env);
axis2_hash_set(config_impl->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
@@ -1349,7 +1349,7 @@
engaged_modules, env, module_name);
}
-struct axis2_phases_info *AXIS2_CALL
+axis2_phases_info_t *AXIS2_CALL
axis2_conf_get_phases_info(axis2_conf_t *conf,
axis2_env_t **env)
{
@@ -1382,7 +1382,7 @@
axis2_conf_add_msg_recv(axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *key,
- struct axis2_msg_recv *msg_recv)
+ axis2_msg_recv_t *msg_recv)
{
axis2_conf_impl_t *config_impl = NULL;
@@ -1402,14 +1402,14 @@
return AXIS2_SUCCESS;
}
-struct axis2_msg_recv *AXIS2_CALL
+axis2_msg_recv_t *AXIS2_CALL
axis2_conf_get_msg_recv(axis2_conf_t *conf,
axis2_env_t **env,
axis2_char_t *key)
{
AXIS2_FUNC_PARAM_CHECK(conf, env, NULL);
- return (struct axis2_msg_recv *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
+ return (axis2_msg_recv_t *) axis2_hash_get(AXIS2_INTF_TO_IMPL(
conf)->msg_recvs, key, AXIS2_HASH_KEY_STRING);
}
@@ -1507,7 +1507,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_add_module(axis2_conf_t *conf,
axis2_env_t **env,
- struct axis2_module_desc *module)
+ axis2_module_desc_t *module)
{
axis2_conf_impl_t *config_impl = NULL;
axis2_qname_t *module_qname = NULL;
@@ -1705,7 +1705,7 @@
axis2_module_desc_t *module_desc = NULL;
axis2_bool_t is_new_module = AXIS2_FAILURE;
axis2_bool_t to_be_engaged = AXIS2_TRUE;
- struct axis2_dep_engine *dep_engine = NULL;
+ axis2_dep_engine_t *dep_engine = NULL;
AXIS2_FUNC_PARAM_CHECK(conf, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, module_ref, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?rev=374291&r1=374290&r2=374291&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Wed Feb 1 23:26:20 2006
@@ -45,9 +45,9 @@
axis2_status_t AXIS2_CALL
axis2_phase_holder_add_handler(axis2_phase_holder_t *phase_holder,
axis2_env_t **env,
- struct axis2_handler_desc *handler);
+ axis2_handler_desc_t *handler);
-struct axis2_phase * AXIS2_CALL
+axis2_phase_t * AXIS2_CALL
axis2_phase_holder_get_phase(axis2_phase_holder_t *phase_holder,
axis2_env_t **env,
axis2_char_t *phase_name);
@@ -55,7 +55,7 @@
axis2_status_t AXIS2_CALL
axis2_phase_holder_build_transport_handler_chain(axis2_phase_holder_t *phase_holder,
axis2_env_t **env,
- struct axis2_phase *phase,
+ axis2_phase_t *phase,
axis2_array_list_t *handlers);
/************************** End of function prototypes ************************/
@@ -228,7 +228,7 @@
* @param phaseName
* @return
*/
-struct axis2_phase * AXIS2_CALL
+axis2_phase_t * AXIS2_CALL
axis2_phase_holder_get_phase(axis2_phase_holder_t *phase_holder,
axis2_env_t **env,
axis2_char_t *phase_name)
@@ -236,7 +236,7 @@
int size = 0;
int i = 0;
axis2_phase_holder_impl_t *phase_holder_impl = NULL;
- struct axis2_phase *phase = NULL;
+ axis2_phase_t *phase = NULL;
AXIS2_FUNC_PARAM_CHECK(phase_holder, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, phase_name, NULL);
@@ -270,14 +270,14 @@
axis2_status_t AXIS2_CALL
axis2_phase_holder_build_transport_handler_chain(axis2_phase_holder_t *phase_holder,
axis2_env_t **env,
- struct axis2_phase *phase,
+ axis2_phase_t *phase,
axis2_array_list_t *handlers)
{
- struct axis2_handler *handler = NULL;
+ axis2_handler_t *handler = NULL;
int size = 0;
int status = AXIS2_FAILURE;
int i = 0;
- struct axis2_handler_desc *handler_desc = NULL;
+ axis2_handler_desc_t *handler_desc = NULL;
AXIS2_FUNC_PARAM_CHECK(phase_holder, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, phase, AXIS2_FAILURE);
@@ -287,7 +287,7 @@
for (i = 0; i < size; i++)
{
- handler_desc = (struct axis2_handler_desc *) AXIS2_ARRAY_LIST_GET(
+ handler_desc = (axis2_handler_desc_t *) AXIS2_ARRAY_LIST_GET(
handlers, env, i);
/* Write the handler loading logic here */
/*handlerClass =