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 da...@apache.org on 2006/01/09 05:58:18 UTC
svn commit: r367200 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/
Author: damitha
Date: Sun Jan 8 20:57:52 2006
New Revision: 367200
URL: http://svn.apache.org/viewcvs?rev=367200&view=rev
Log:
Deployment folder is complete(source is building)
No test is done yet
Modified:
webservices/axis2/trunk/c/include/axis2_arch_file_data.h
webservices/axis2/trunk/c/include/axis2_arch_reader.h
webservices/axis2/trunk/c/include/axis2_desc_builder.h
webservices/axis2/trunk/c/include/axis2_dir_handler.h
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_module_builder.h
webservices/axis2/trunk/c/include/axis2_svc_builder.h
webservices/axis2/trunk/c/include/axis2_svc_grp_builder.h
webservices/axis2/trunk/c/include/axis2_ws_info_list.h
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.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/deployment/svc_grp_builder.c
Modified: webservices/axis2/trunk/c/include/axis2_arch_file_data.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_arch_file_data.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/include/axis2_arch_file_data.h Sun Jan 8 20:57:52 2006
@@ -129,6 +129,13 @@
/**
* Creates arch file data struct
+ * @return pointer to newly created arch file data
+ */
+AXIS2_DECLARE(axis2_arch_file_data_t *)
+axis2_arch_file_data_create(axis2_env_t **env);
+
+/**
+ * Creates arch file data struct
* @param repos_path
* @return pointer to newly created arch file data
*/
Modified: webservices/axis2/trunk/c/include/axis2_arch_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_arch_reader.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/include/axis2_arch_reader.h Sun Jan 8 20:57:52 2006
@@ -31,10 +31,11 @@
#include <axis2_conf.h>
#include <axis2_deployment.h>
#include <axis2_arch_file_data.h>
-/*#include <axis2_dep_engine.h>*/
+#include <axis2_dep_engine.h>
#include <axis2_file_handler.h>
#include <axis2_om_element.h>
#include <axis2_desc_builder.h>
+#include <axis2_svc_grp_builder.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/include/axis2_desc_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_desc_builder.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_desc_builder.h Sun Jan 8 20:57:52 2006
@@ -29,7 +29,7 @@
#include <axis2_allocator.h>
#include <axis2_deployment.h>
-/* #include <axis2_dep_engine.h> */
+#include <axis2_dep_engine.h>
#include <axis2_flow.h>
#include <axis2_om_stax_builder.h>
#include <axis2_om_document.h>
Modified: webservices/axis2/trunk/c/include/axis2_dir_handler.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_dir_handler.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_dir_handler.h Sun Jan 8 20:57:52 2006
@@ -56,7 +56,8 @@
} axis2_file_t;
-#define AXIS2_DIR_HANDLER_LIST_DIR(env, pathname) axis2_list_dir(env, pathname)
+#define AXIS2_DIR_HANDLER_LIST_DIR(env, pathname) \
+ (axis2_dir_handler_list_dir(env, pathname))
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Sun Jan 8 20:57:52 2006
@@ -363,7 +363,8 @@
AXIS2_ERROR_INVALID_SVC,
AXIS2_ERROR_INVALID_MODULE,
AXIS2_ERROR_MODULE_CREATION_FAILED,
- AXIS2_ERROR_SOAP_ENVELOPE_MUST_HAVE_BODY_ELEMENT
+ AXIS2_ERROR_SOAP_ENVELOPE_MUST_HAVE_BODY_ELEMENT,
+ AXIS2_ERROR_INVALID_MODULE_CONF
};
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_module_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_module_builder.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_builder.h Sun Jan 8 20:57:52 2006
@@ -29,7 +29,7 @@
#include <axis2_allocator.h>
#include <axis2_qname.h>
#include <axis2_module_desc.h>
-/* #include <axis2_dep_engine.h> */
+#include <axis2_dep_engine.h>
#include <axis2_desc_builder.h>
#ifdef __cplusplus
@@ -88,7 +88,7 @@
* @return pointer to newly created module builder
*/
AXIS2_DECLARE(axis2_module_builder_t *)
-axis2_svc_builder_create_with_file_and_dep_engine_module (axis2_env_t **env,
+axis2_module_builder_create_with_file_and_dep_engine_module (axis2_env_t **env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_module_desc_t *module);
Modified: webservices/axis2/trunk/c/include/axis2_svc_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_builder.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_builder.h Sun Jan 8 20:57:52 2006
@@ -67,14 +67,14 @@
axis2_env_t **env,
axis2_om_node_t *svc_node);
- /*
+
axis2_status_t (AXIS2_CALL *
process_svc_module_conf) (axis2_svc_builder_t *svc_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *module_confs,
axis2_param_container_t *parent,
axis2_svc_t *svc);
- */
+
/**
* To get the list og modules that is requird to be engage globally
Modified: webservices/axis2/trunk/c/include/axis2_svc_grp_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_grp_builder.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp_builder.h Sun Jan 8 20:57:52 2006
@@ -90,6 +90,17 @@
AXIS2_DECLARE(axis2_svc_grp_builder_t *)
axis2_svc_grp_builder_create (axis2_env_t **env);
+/**
+ * Creates svc_grp builder struct
+ * @param svc
+ * @param dep_engine
+ * @return pointer to newly created service group builder
+ */
+AXIS2_DECLARE(axis2_svc_grp_builder_t *)
+axis2_svc_grp_builder_create_with_svc_and_dep_engine (axis2_env_t **env,
+ axis2_om_node_t *svc,
+ axis2_dep_engine_t *dep_engine);
+
/*************************** Function macros **********************************/
#define AXIS2_SVC_GRP_BUILDER_FREE(svc_grp_builder, env) \
Modified: webservices/axis2/trunk/c/include/axis2_ws_info_list.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_ws_info_list.h?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/include/axis2_ws_info_list.h Sun Jan 8 20:57:52 2006
@@ -34,6 +34,7 @@
#include <axis2_dir_handler.h>
#include <axis2_ws_info.h>
#include <axis2_arch_file_data.h>
+#include <axis2_dep_engine.h>
#ifdef __cplusplus
extern "C"
@@ -41,6 +42,7 @@
#endif
struct axis2_ws_info;
+struct dep_engine;
typedef struct axis2_ws_info_list axis2_ws_info_list_t;
typedef struct axis2_ws_info_list_ops axis2_ws_info_list_ops_t;
@@ -158,9 +160,8 @@
* @return pointer to newly created ws info list
*/
AXIS2_DECLARE(axis2_ws_info_list_t *)
-axis2_ws_info_list_create_with_repos_name (
- axis2_env_t **env,
- axis2_char_t *repos_path);
+axis2_ws_info_list_create_with_dep_engine (axis2_env_t **env,
+ struct axis2_dep_engine *dep_engine);
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Sun Jan 8 20:57:52 2006
@@ -17,6 +17,8 @@
#include <axis2_arch_reader.h>
#include <string.h>
#include <axis2_class_loader.h>
+#include <axis2_svc_builder.h>
+#include <axis2_module_builder.h>
/**
* @brief
@@ -358,9 +360,11 @@
if(0 == AXIS2_STRCMP(AXIS2_SVC_ELEMENT, root_element_name))
{
axis2_svc_t *svc = NULL;
- struct axis2_arch_file_data *file_data = NULL;
axis2_char_t *name = NULL;
axis2_char_t *short_file_name = NULL;
+ axis2_svc_builder_t *svc_builder = NULL;
+ axis2_arch_file_data_t *file_data = NULL;
+ axis2_array_list_t *dep_svcs = NULL;
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
name = AXIS2_ARCH_FILE_DATA_GET_NAME(file_data, env);
@@ -382,16 +386,26 @@
}
}
AXIS2_SVC_SET_PARENT(svc, env, svc_grp);
- /*axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader());
- ServiceBuilder serviceBuilder = new ServiceBuilder(engine,axisService);
- serviceBuilder.populateService(services);
- engine.getCurrentFileItem().getDeploybleServices().add(axisService);
- */
+ /*axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader());*/
+
+ svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
+ dep_engine, svc);
+ status = AXIS2_SVC_BUILDER_POPULATE_SVC(svc_builder, env, svcs);
+ if(AXIS2_SUCCESS != status)
+ {
+ return AXIS2_FAILURE;
+ }
+ file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
+
+ dep_svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(file_data, env);
+ AXIS2_ARRAY_LIST_ADD(dep_svcs, env, svc);
}
else if(0 == AXIS2_STRCMP(AXIS2_SVC_GRP_ELEMENT, root_element_name))
{
- /*ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services,engine);
- groupBuilder.populateServiceGroup(axisServiceGroup);*/
+ axis2_svc_grp_builder_t *grp_builder = NULL;
+ grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
+ svcs, dep_engine);
+ AXIS2_SVC_GRP_BUILDER_POPULATE_SVC_GRP(grp_builder, env, svc_grp);
}
return status;
}
@@ -420,10 +434,16 @@
status = axis2_file_handler_access(file_name, AXIS2_F_OK);
if(AXIS2_SUCCESS == status)
{
- /*
- ModuleBuilder builder = new ModuleBuilder(in, engine, module);
- builder.populateModule();
- */
+ axis2_module_builder_t *module_builder = NULL;
+
+ module_builder =
+ axis2_module_builder_create_with_file_and_dep_engine_module(env,
+ file_name, dep_engine, module);
+ status = AXIS2_MODULE_BUILDER_POPULATE_MODULE(module_builder, env);
+ if(AXIS2_FAILURE == status)
+ {
+ return AXIS2_FAILURE;
+ }
}
else
{
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=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Sun Jan 8 20:57:52 2006
@@ -1334,7 +1334,7 @@
svc_name = axis2_dep_engine_get_axis_svc_name(dep_engine, env,
file_name);
- /* todo fix me deepal */
+ /* todo */
/* axisConfig.removeService(new QName(serviceName)); */
/*log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
wsInfo.getFilename()));*/
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Sun Jan 8 20:57:52 2006
@@ -83,9 +83,9 @@
return &(module_builder_impl->module_builder);
}
-/*
+
axis2_module_builder_t * AXIS2_CALL
-axis2_svc_builder_create_with_file_and_dep_engine_module (axis2_env_t **env,
+axis2_module_builder_create_with_file_and_dep_engine_module (axis2_env_t **env,
axis2_char_t *file_name,
axis2_dep_engine_t *dep_engine,
axis2_module_desc_t *module)
@@ -111,7 +111,7 @@
builder_impl->module= module;
return &(builder_impl->module_builder);
}
-*/
+
/***************************Function implementation****************************/
axis2_status_t AXIS2_CALL
@@ -379,12 +379,12 @@
if(NULL == mep_url)
{
/* assuming in-out mep */
- /* op_descrip = new InOnlyAxisOperation(); */
+ /* TODO op_descrip = new InOnlyAxisOperation(); */
op_desc = axis2_op_create(env);
}
else
{
- /* op_descrip = AxisOperationFactory.getOperetionDescription(mepURL); */
+ /* TODO op_descrip = AxisOperationFactory.getOperetionDescription(mepURL); */
op_desc = axis2_op_create(env);
}
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=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Sun Jan 8 20:57:52 2006
@@ -15,6 +15,8 @@
*/
#include <axis2_repos_listener.h>
+#include <axis2_ws_info_list.h>
+#include <axis2_dir_handler.h>
/**
* @brief DLL Description struct impl
@@ -141,7 +143,7 @@
* @param folderName path to parent directory that the listener should listent
* @param deploy_engine refearnce to engine registry inorder to inform the updates
*/
-/*
+
axis2_repos_listener_t *AXIS2_CALL
axis2_repos_listener_create_with_folder_name_and_dep_engine(axis2_env_t **env,
axis2_char_t *folder_name,
@@ -151,29 +153,28 @@
AXIS2_ENV_CHECK(env, NULL);
- listener_impl = axis2_repos_listener_create(env);
+ listener_impl = (axis2_repos_listener_impl_t *) axis2_repos_listener_create(env);
if(NULL == listener_impl)
{
return NULL;
}
- listener_impl->folder_name = AXIS2_STRDUP((*env)->allocator,
- folder_name);
+ listener_impl->folder_name = AXIS2_STRDUP(folder_name, env);
if(!listener_impl->folder_name)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- listener_impl->ws_info_list = axis2_ws_info_list_create_with_dep_engine(
+ listener_impl->info_list = axis2_ws_info_list_create_with_dep_engine(
env, dep_engine);
- if(!listener_impl->ws_info_list)
+ if(!listener_impl->info_list)
{
return NULL;
}
axis2_repos_listener_init(&(listener_impl->repos_listener), env);
return &(listener_impl->repos_listener);
}
-*/
+
/******************************************************************************/
axis2_status_t AXIS2_CALL
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=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Sun Jan 8 20:57:52 2006
@@ -50,14 +50,14 @@
axis2_env_t **env,
axis2_om_children_qname_iterator_t *op_itr);
-/*
+
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
axis2_env_t **env,
axis2_om_children_qname_iterator_t *module_confs,
axis2_param_container_t *parent,
axis2_svc_t *svc);
-*/
+
/**
* To get the list og modules that is requird to be engage globally
@@ -285,14 +285,17 @@
return AXIS2_FAILURE;
}
svc_name = AXIS2_XML_WRITER_GET_XML(xml_writer, env);
- AXIS2_WSDL_SVC_SET_NAME(builder_impl->svc->wsdl_svc, env, svc_name);
+ AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env,
+ svc_name);
AXIS2_OM_OUTPUT_FREE(om_output, env);
}
else
{
axis2_char_t *svc_name = NULL;
+
svc_name = AXIS2_OM_ELEMENT_GET_TEXT(desc_element, env, desc_node);
- AXIS2_WSDL_SVC_SET_NAME(builder_impl->svc->wsdl_svc, env, svc_name);
+ AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env,
+ svc_name);
}
}
@@ -377,7 +380,7 @@
operation_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
qopst, svc_node);
- ops = process_ops(svc_builder, env, operation_itr);
+ ops = axis2_svc_builder_process_ops(svc_builder, env, operation_itr);
size = AXIS2_ARRAY_LIST_SIZE(ops, env);
for(i = 0; i < size; i++)
{
@@ -582,7 +585,7 @@
return ops;
}
-/*
+
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
axis2_env_t **env,
@@ -612,7 +615,7 @@
}
return AXIS2_SUCCESS;
}
-*/
+
axis2_status_t AXIS2_CALL
axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?rev=367200&r1=367199&r2=367200&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Sun Jan 8 20:57:52 2006
@@ -89,7 +89,7 @@
return &(svc_grp_builder_impl->svc_grp_builder);
}
-/*
+
axis2_svc_grp_builder_t * AXIS2_CALL
axis2_svc_grp_builder_create_with_svc_and_dep_engine (axis2_env_t **env,
axis2_om_node_t *svc,
@@ -109,7 +109,7 @@
return &(grp_builder_impl->svc_grp_builder);
}
-*/
+
/***************************Function implementation****************************/
axis2_status_t AXIS2_CALL