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 pi...@apache.org on 2007/03/30 20:06:23 UTC
svn commit: r524211 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ util/include/ util/src/ xml_schema/src/
Author: pini
Date: Fri Mar 30 11:06:22 2007
New Revision: 524211
URL: http://svn.apache.org/viewvc?view=rev&rev=524211
Log:
Fixing jira issue 292
Added:
webservices/axis2/trunk/c/util/include/axutil_file_handler.h
- copied, changed from r524179, webservices/axis2/trunk/c/util/include/axis2_file_handler.h
Removed:
webservices/axis2/trunk/c/util/include/axis2_file_handler.h
Modified:
webservices/axis2/trunk/c/include/axis2_util.h
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/util/src/file_handler.c
webservices/axis2/trunk/c/util/src/log.c
webservices/axis2/trunk/c/util/src/url.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 11:06:22 2007
@@ -26,7 +26,7 @@
#include <axutil_env.h>
#include <axutil_error.h>
#include <axis2_file.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axis2_hash.h>
#include <axis2_linked_list.h>
#include <axis2_log.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Mar 30 11:06:22 2007
@@ -100,7 +100,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- status = axis2_file_handler_access(svcs_xml, AXIS2_F_OK);
+ status = axutil_file_handler_access(svcs_xml, AXIS2_F_OK);
if (AXIS2_SUCCESS == status)
{
struct axis2_arch_file_data *arch_file_data = NULL;
@@ -250,7 +250,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- status = axis2_file_handler_access(module_xml, AXIS2_F_OK);
+ status = axutil_file_handler_access(module_xml, AXIS2_F_OK);
if (AXIS2_SUCCESS == status)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Fri Mar 30 11:06:22 2007
@@ -33,7 +33,7 @@
#include <axis2_deployment.h>
#include <axis2_arch_file_data.h>
#include <axis2_dep_engine.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axiom_element.h>
#include <axis2_desc_builder.h>
#include <axis2_svc_grp_builder.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Fri Mar 30 11:06:22 2007
@@ -36,7 +36,7 @@
#include <axis2_qname.h>
#include <axis2_conf.h>
#include "axis2_deployment.h"
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axutil_dir_handler.h>
#include "axis2_ws_info.h"
#include "axis2_arch_file_data.h"
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 11:06:22 2007
@@ -18,7 +18,7 @@
#include "axis2_dep_engine.h"
#include <axutil_array_list.h>
#include <axis2_deployment.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axutil_dll_desc.h>
#include <axis2_flow.h>
#include <axis2_arch_reader.h>
@@ -227,7 +227,7 @@
return NULL;
}
- status = axis2_file_handler_access(repos_path, AXIS2_F_OK);
+ status = axutil_file_handler_access(repos_path, AXIS2_F_OK);
if (AXIS2_SUCCESS != status)
{
axis2_dep_engine_free(dep_engine, env);
@@ -261,7 +261,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPO_CAN_NOT_BE_NULL, AXIS2_FAILURE);
return NULL;
}
- status = axis2_file_handler_access(dep_engine->conf_name, AXIS2_F_OK);
+ status = axutil_file_handler_access(dep_engine->conf_name, AXIS2_F_OK);
if (AXIS2_SUCCESS != status)
{
axis2_dep_engine_free(dep_engine, env);
@@ -794,7 +794,7 @@
return AXIS2_FAILURE;
}
}
- status = axis2_file_handler_access(dep_engine->conf_name, AXIS2_F_OK);
+ status = axutil_file_handler_access(dep_engine->conf_name, AXIS2_F_OK);
if (AXIS2_SUCCESS != status)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CONFIG_NOT_FOUND,
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Fri Mar 30 11:06:22 2007
@@ -179,7 +179,7 @@
case AXIS2_SVC:
{
/* check whether the file is already deployed */
- /*status = axis2_file_handler_access(file->name, AXIS2_F_OK);
+ /*status = axutil_file_handler_access(file->name, AXIS2_F_OK);
if(AXIS2_SUCCESS != status)
{*/
axis2_ws_info_t *ws_info = NULL;
@@ -212,7 +212,7 @@
case AXIS2_MODULE:
{
/* check whether the file is already deployed */
- /*status = axis2_file_handler_access(file->name, AXIS2_F_OK);
+ /*status = axutil_file_handler_access(file->name, AXIS2_F_OK);
if(AXIS2_SUCCESS != status)
{*/
axis2_ws_info_t *ws_info = NULL;
Copied: webservices/axis2/trunk/c/util/include/axutil_file_handler.h (from r524179, webservices/axis2/trunk/c/util/include/axis2_file_handler.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_file_handler.h?view=diff&rev=524211&p1=webservices/axis2/trunk/c/util/include/axis2_file_handler.h&r1=524179&p2=webservices/axis2/trunk/c/util/include/axutil_file_handler.h&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_file_handler.h Fri Mar 30 11:06:22 2007
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef AXIS2_FILE_HANDLER_H
-#define AXIS2_FILE_HANDLER_H
+#ifndef AXUTIL_FILE_HANDLER_H
+#define AXUTIL_FILE_HANDLER_H
#include <axis2_string.h>
@@ -26,7 +26,7 @@
/**
- * @defgroup axis2_file_handler file handler
+ * @defgroup axutil_file_handler file handler
* @ingroup axis2_util
* @{
*/
@@ -38,7 +38,7 @@
* @return status code
*/
AXIS2_EXTERN void * AXIS2_CALL
-axis2_file_handler_open(const char *file_name,
+axutil_file_handler_open(const char *file_name,
const char *options);
/**
@@ -47,7 +47,7 @@
* @return status code
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_file_handler_close (void *file_ptr);
+axutil_file_handler_close (void *file_ptr);
/**
* determine accessibility of file
@@ -66,7 +66,7 @@
* @return status
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_file_handler_access(const axis2_char_t *path,
+axutil_file_handler_access(const axis2_char_t *path,
int mode);
/** @} */
Modified: webservices/axis2/trunk/c/util/src/file_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_handler.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/file_handler.c Fri Mar 30 11:06:22 2007
@@ -20,10 +20,10 @@
#include <stdio.h>
#include <platforms/axis2_platform_auto_sense.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
void* AXIS2_CALL
-axis2_file_handler_open(const axis2_char_t *file_name,
+axutil_file_handler_open(const axis2_char_t *file_name,
const axis2_char_t *options)
{
@@ -40,14 +40,14 @@
}
axis2_status_t AXIS2_CALL
-axis2_file_handler_close(void *file_ptr)
+axutil_file_handler_close(void *file_ptr)
{
if (!file_ptr) return -1;
return (axis2_status_t) fclose(file_ptr);
}
axis2_status_t AXIS2_CALL
-axis2_file_handler_access(const axis2_char_t *path,
+axutil_file_handler_access(const axis2_char_t *path,
int mode)
{
int i = 0;
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Fri Mar 30 11:06:22 2007
@@ -20,7 +20,7 @@
#include <string.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <axis2_log_default.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axis2_thread.h>
typedef struct axis2_log_impl axis2_log_impl_t;
@@ -76,7 +76,7 @@
{
if (log_impl->stream)
{
- axis2_file_handler_close(log_impl->stream);
+ axutil_file_handler_close(log_impl->stream);
}
}
AXIS2_FREE(allocator, log_impl);
@@ -127,7 +127,7 @@
if ((path_home = AXIS2_GETENV("AXIS2C_HOME")))
{
AXIS2_SNPRINTF(log_dir, 500, "%s%c%s", path_home, AXIS2_PATH_SEP_CHAR, "logs");
- if (AXIS2_SUCCESS == axis2_file_handler_access(log_dir, AXIS2_F_OK))
+ if (AXIS2_SUCCESS == axutil_file_handler_access(log_dir, AXIS2_F_OK))
{
AXIS2_SNPRINTF(log_file_name, 500, "%s%c%s", log_dir, AXIS2_PATH_SEP_CHAR,
tmp_filename);
@@ -152,7 +152,7 @@
axis2_thread_mutex_lock(log_impl->mutex);
- log_impl->stream = axis2_file_handler_open(log_file_name, "a+");
+ log_impl->stream = axutil_file_handler_open(log_file_name, "a+");
axis2_thread_mutex_unlock(log_impl->mutex);
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Fri Mar 30 11:06:22 2007
@@ -18,7 +18,7 @@
#include <axis2_url.h>
#include <axis2_string.h>
#include <axis2_string.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <axis2_network_handler.h>
#include <axis2_types.h>
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?view=diff&rev=524211&r1=524210&r2=524211
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Fri Mar 30 11:06:22 2007
@@ -17,7 +17,7 @@
#include <xml_schema_url_resolver.h>
#include <axis2_url.h>
-#include <axis2_file_handler.h>
+#include <axutil_file_handler.h>
#include <platforms/axis2_platform_auto_sense.h>
/*
@@ -43,7 +43,7 @@
axis2_char_t *abs_path = NULL;
axis2_char_t *ref = NULL;
/*
- if(axis2_file_handler_access(base_uri, AXIS2_F_OK))
+ if(axutil_file_handler_access(base_uri, AXIS2_F_OK))
{
abs_path = AXIS2_GETCWD(base_uri);
uri1 = axis2_uri_parse_string(env, get_file_url(env, bas));
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org