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 2007/08/14 10:51:32 UTC
svn commit: r565666 - in /webservices/axis2/trunk/c/src/core:
deployment/arch_reader.c deployment/axis2_arch_reader.h
deployment/dep_engine.c engine/conf.c
Author: damitha
Date: Tue Aug 14 01:51:30 2007
New Revision: 565666
URL: http://svn.apache.org/viewvc?view=rev&rev=565666
Log:
Fixed AXIS2C-667
Modified:
webservices/axis2/trunk/c/src/core/deployment/arch_reader.c
webservices/axis2/trunk/c/src/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
webservices/axis2/trunk/c/src/core/engine/conf.c
Modified: webservices/axis2/trunk/c/src/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/arch_reader.c?view=diff&rev=565666&r1=565665&r2=565666
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/arch_reader.c Tue Aug 14 01:51:30 2007
@@ -65,7 +65,7 @@
}
AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
-axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_create_svc(
const axutil_env_t *env,
struct axis2_arch_file_data *file)
{
@@ -226,7 +226,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_read_module_arch(
const axutil_env_t *env,
axis2_char_t *file_name,
axis2_dep_engine_t *dep_engine,
@@ -272,7 +272,7 @@
}
AXIS2_EXTERN axutil_file_t *AXIS2_CALL
-axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_create_module_arch(
const axutil_env_t *env,
axis2_char_t *module_name)
{
Modified: webservices/axis2/trunk/c/src/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/axis2_arch_reader.h?view=diff&rev=565666&r1=565665&r2=565666
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/src/core/deployment/axis2_arch_reader.h Tue Aug 14 01:51:30 2007
@@ -64,12 +64,11 @@
* To create a ServiceDescrption <code>AxisService</code> using given wsdl.
* If the service.wsdl is there in the arcive file AxisService will be creted
* using that, else default AxisService will be created
- * @param arch_reader pointer to arch reader
* @param env pointer to environment struct
* @param file pointer to file
*/
AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
- axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
+ axis2_arch_reader_create_svc(
const axutil_env_t *env,
struct axis2_arch_file_data *file);
@@ -105,24 +104,22 @@
struct axis2_svc_grp *svc_grp);
/**
- * @param arch_reader pointer to arch reader
* @param env pointer to environment struct
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
+ axis2_arch_reader_read_module_arch(
const axutil_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
axis2_module_desc_t *module);
/**
- * @param arch_reader pointer to arch reader
* @param env pointer to environment struct
* @param module_name pointer to module name
*/
AXIS2_EXTERN axutil_file_t *AXIS2_CALL
- axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
+ axis2_arch_reader_create_module_arch(
const axutil_env_t *env,
axis2_char_t *module_name);
Modified: webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/dep_engine.c?view=diff&rev=565666&r1=565665&r2=565666
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/dep_engine.c Tue Aug 14 01:51:30 2007
@@ -1258,8 +1258,7 @@
file_name = axis2_arch_file_data_get_name(dep_engine->
curr_file, env);
status = axis2_arch_reader_read_module_arch(
- dep_engine->arch_reader, env, file_name, dep_engine,
- meta_data);
+ env, file_name, dep_engine, meta_data);
if (AXIS2_SUCCESS != status)
{
axis2_arch_reader_free(arch_reader, env);
@@ -1437,7 +1436,7 @@
module_desc = axis2_module_desc_create(env);
arch_reader = axis2_arch_reader_create(env);
file_name = axutil_file_get_name(module_archive, env);
- status = axis2_arch_reader_read_module_arch(arch_reader, env, file_name,
+ status = axis2_arch_reader_read_module_arch(env, file_name,
dep_engine, module_desc);
axis2_arch_reader_free(arch_reader, env);
if (AXIS2_SUCCESS != status)
Modified: webservices/axis2/trunk/c/src/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/conf.c?view=diff&rev=565666&r1=565665&r2=565666
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/conf.c Tue Aug 14 01:51:30 2007
@@ -1389,7 +1389,7 @@
}
file_name = axutil_qname_get_localpart(module_ref, env);
file = (axutil_file_t *) axis2_arch_reader_create_module_arch(
- arch_reader, env, file_name) ;
+ env, file_name) ;
repos_path = axis2_conf_get_repo(conf, env);
temp_path1 = axutil_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
temp_path2 = axutil_stracat(env, temp_path1, AXIS2_MODULE_FOLDER);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org