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 11:47:23 UTC

svn commit: r524012 - in /webservices/axis2/trunk/c: axiom/src/parser/guththila/ axiom/test/om/ axiom/test/soap/ guththila/samples/ guththila/src/ guththila/tests/ samples/client/dynamic_client/ samples/client/echo/ test/core/addr/ test/core/clientapi/...

Author: pini
Date: Fri Mar 30 02:47:21 2007
New Revision: 524012

URL: http://svn.apache.org/viewvc?view=rev&rev=524012
Log:
Fixing jira issue 292

Modified:
    webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
    webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
    webservices/axis2/trunk/c/axiom/test/om/test_om.c
    webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
    webservices/axis2/trunk/c/guththila/samples/guththila_main.c
    webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c
    webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c
    webservices/axis2/trunk/c/guththila/tests/test.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
    webservices/axis2/trunk/c/samples/client/echo/echo.c
    webservices/axis2/trunk/c/test/core/addr/test_addr.c
    webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
    webservices/axis2/trunk/c/test/core/context/test_context.c
    webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
    webservices/axis2/trunk/c/test/core/description/test_description.c
    webservices/axis2/trunk/c/test/core/engine/test_engine.c
    webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
    webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
    webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
    webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
    webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
    webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
    webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
    webservices/axis2/trunk/c/util/test/util/test_log.c
    webservices/axis2/trunk/c/util/test/util/test_thread.c
    webservices/axis2/trunk/c/util/test/util/test_util.c
    webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c

Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c Fri Mar 30 02:47:21 2007
@@ -345,7 +345,7 @@
     int type)
 {
     guththila_xml_reader_wrapper_impl_t *guththila_impl = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     guththila_t *guththila = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -359,7 +359,7 @@
         return NULL;
     }
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
 
     /*-------difference of two create function is here--------*/
     guththila_impl->reader =

Modified: webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c Fri Mar 30 02:47:21 2007
@@ -219,7 +219,7 @@
 {
     guththila_xml_writer_wrapper_impl_t *writer_impl;
 
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     AXIS2_ENV_CHECK(env, NULL);
 
     writer_impl = (guththila_xml_writer_wrapper_impl_t *)AXIS2_MALLOC(env->allocator,
@@ -231,7 +231,7 @@
         return NULL;
     }
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     writer_impl->parser = guththila_create((axis2_env_t *)env, NULL);
 
     if (!(writer_impl->parser))

Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Fri Mar 30 02:47:21 2007
@@ -33,7 +33,7 @@
    for both functions
 */
 
-axis2_allocator_t *allocator = NULL;
+axutil_allocator_t *allocator = NULL;
 axis2_env_t *environment = NULL;
 axis2_stream_t *stream = NULL;
 axis2_error_t *error = NULL;
@@ -305,7 +305,7 @@
     const char *file_name = "../../resources/xml/om/test.xml";
     if (argc > 1)
         file_name = argv[1];
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     axis_log = axis2_log_create(allocator, NULL, NULL);
     error = axis2_error_create(allocator);
 

Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Fri Mar 30 02:47:21 2007
@@ -398,7 +398,7 @@
 int main(int argc, char *argv[])
 {
     axis2_env_t *env = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
     const axis2_char_t *uri = AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
@@ -412,7 +412,7 @@
         else if (axis2_strcmp(argv[2], "1") == 0)
             uri = AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
     }
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     log = axis2_log_create(allocator, NULL, "test_soap.log");
     log->level = AXIS2_LOG_LEVEL_DEBUG;
     error = axis2_error_create(allocator);

Modified: webservices/axis2/trunk/c/guththila/samples/guththila_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_main.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_main.c Fri Mar 30 02:47:21 2007
@@ -22,12 +22,12 @@
 main(int argc, char *argv[])
 {
     int c;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     guththila_reader_t *red;
     axis2_env_t *environment;
     guththila_t *parser;
     char *xml_buffer;
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     xml_buffer = "<?xml version = \"1.0\"?><test a=\"din\">addddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd123</test>";
     environment =
         axis2_env_create(allocator);

Modified: webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_writer_main.c Fri Mar 30 02:47:21 2007
@@ -25,12 +25,12 @@
 int main(int argc, char *argv[])
 {
     char *t;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_env_t *env ;
     guththila_t *parser ;
 	char *xml = NULL;
 	FILE *file = NULL;
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
     parser = guththila_create(env, NULL);
 	guththila_create_xml_stream_writer_for_memory(env, parser);

Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c Fri Mar 30 02:47:21 2007
@@ -21,7 +21,7 @@
 #include <guththila.h>
 int main()
 {
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axis2_env_t *env = axis2_env_create(allocator);
     guththila_t *parser = guththila_create(env, NULL);
     guththila_create_xml_stream_writer(env, parser, "w.xml");
@@ -43,7 +43,7 @@
     guththila_write_end_document(env, parser);
     guththila_xml_writer_free(env, parser);
     guththila_free(env, parser);
-    axis2_allocator_free(allocator);
+    axutil_allocator_free(allocator);
     axis2_env_free(env);
     return 0;
 }

Modified: webservices/axis2/trunk/c/guththila/tests/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/tests/test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/guththila/tests/test.c (original)
+++ webservices/axis2/trunk/c/guththila/tests/test.c Fri Mar 30 02:47:21 2007
@@ -7,7 +7,7 @@
 void
 setup (void)
 {
-allocator = axis2_allocator_init(NULL);
+allocator = axutil_allocator_init(NULL);
 env = axis2_env_create(allocator);
 }
 

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Fri Mar 30 02:47:21 2007
@@ -48,11 +48,11 @@
     axis2_env_t *env = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     axis2_char_t *wsdl_uri_str = NULL;
 
     /* set up the envioronment with allocator and log*/
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     error = axis2_error_create(allocator);
     log = axis2_log_create(allocator, NULL, "addr_echo.log");
     env = axis2_env_create_with_error_log(allocator, error, log);

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Fri Mar 30 02:47:21 2007
@@ -32,10 +32,10 @@
     axis2_env_t *env = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
 
     /* set up the envioronment with allocator and log*/
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     error = axis2_error_create(allocator);
     log = axis2_log_create(allocator, NULL, "addr_echo.log");
     env = axis2_env_create_with_error_log(allocator, error, log);

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Fri Mar 30 02:47:21 2007
@@ -37,7 +37,7 @@
     axiom_node_t *ret_node = NULL;
     axiom_node_t *payload2 = NULL;
     axiom_node_t *ret_node2 = NULL;
-    /*axis2_allocator_t *allocator = NULL;*/
+    /*axutil_allocator_t *allocator = NULL;*/
 
     /* Set up the environment */
     env = axis2_env_create_all("echo.log", AXIS2_LOG_LEVEL_TRACE);

Modified: webservices/axis2/trunk/c/test/core/addr/test_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/addr/test_addr.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/test_addr.c (original)
+++ webservices/axis2/trunk/c/test/core/addr/test_addr.c Fri Mar 30 02:47:21 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_msg_info_headers.h>
 #include <axis2_env.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_endpoint_ref.h>
 #include <stdio.h>
 
@@ -30,7 +30,7 @@
     axis2_endpoint_ref_t *axis2_endpoint_ref = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_msg_info_headers_t *axis2_msg_info_headers = NULL;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     const axis2_char_t *action = "test action";
     const axis2_char_t *get_action = NULL;

Modified: webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Fri Mar 30 02:47:21 2007
@@ -18,7 +18,7 @@
 #include <axis2_const.h>
 #include <axis2_env.h>
 #include <axis2_engine.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_svc_client.h>
 #include <axis2_options.h>
 #include <platforms/axis2_platform_auto_sense.h>
@@ -38,7 +38,7 @@
     const axis2_char_t *address = NULL;
     axis2_endpoint_ref_t* endpoint_ref = NULL;
 
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
     axiom_element_t *result_ele = NULL;
     const axis2_char_t* echo_text = "echo_text";

Modified: webservices/axis2/trunk/c/test/core/context/test_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/test_context.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/test_context.c (original)
+++ webservices/axis2/trunk/c/test/core/context/test_context.c Fri Mar 30 02:47:21 2007
@@ -18,7 +18,7 @@
 #include <axis2_conf_ctx.h>
 #include <axis2_svc_grp.h>
 #include <axis2_const.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_env.h>
 #include <stdio.h>
 
@@ -44,7 +44,7 @@
     struct axis2_hash_t *svc_grp_ctx_map = NULL;
 
     axis2_status_t status = AXIS2_FAILURE;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
 
     conf = axis2_conf_create(env);

Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Fri Mar 30 02:47:21 2007
@@ -23,7 +23,7 @@
 #include <axis2_op.h>
 #include <axis2_dep_engine.h>
 #include <axis2_env.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_class_loader.h>
 #include <axis2_error_default.h>
 #include <axis2_log_default.h>
@@ -327,11 +327,11 @@
 
 int main()
 {
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     axis2_error_t *error = NULL;
     axis2_log_t *log = NULL;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     error = axis2_error_create(allocator);
     log = axis2_log_create(allocator, NULL, "test_deployment.log");
     env = axis2_env_create_with_error_log(allocator, error, log);

Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Fri Mar 30 02:47:21 2007
@@ -21,7 +21,7 @@
 #include <axis2_module_desc.h>
 #include <axis2_phases_info.h>
 #include <axis2_env.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 
 struct axis2_module_desc *create_module_desc(const axis2_env_t *env);
 
@@ -36,7 +36,7 @@
     printf("testing axis2_op_engage_module\n");
     printf("******************************************\n");
 
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axis2_env_t *env = axis2_env_create(allocator);
     axis2_op_t *op = axis2_op_create(env);
 
@@ -70,7 +70,7 @@
     printf("testing axis2_svc_add_module_ops\n");
     printf("******************************************\n");
 
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     qname = axis2_qname_create(env, "name1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
@@ -105,7 +105,7 @@
     printf("testing axis2_svc_engage_module\n");
     printf("******************************************\n");
 
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     qname = axis2_qname_create(env, "name1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
@@ -141,7 +141,7 @@
     printf("testing axis2_svc_get_op\n");
     printf("******************************************\n");
 
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     qname = axis2_qname_create(env, "op1", NULL, NULL);
     op = axis2_op_create_with_qname(env, qname);

Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Fri Mar 30 02:47:21 2007
@@ -25,7 +25,7 @@
 int   axis2_test_engine_send()
 {
     axis2_status_t status = AXIS2_FAILURE;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     struct axis2_conf *conf = NULL;
     conf = axis2_conf_create(env);
@@ -82,7 +82,7 @@
 int   axis2_test_engine_receive()
 {
     axis2_status_t status = AXIS2_FAILURE;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     axis2_conf_t *conf = NULL;
     conf = axis2_conf_create(env);

Modified: webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c Fri Mar 30 02:47:21 2007
@@ -31,7 +31,7 @@
 
 axis2_env_t *test_init()
 {
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axis2_error_t *error = axis2_error_create(allocator);
     axis2_env_t *env = axis2_env_create_with_error(allocator, error);
     return env;

Modified: webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c (original)
+++ webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c Fri Mar 30 02:47:21 2007
@@ -25,7 +25,7 @@
 #include <axis2_wsdl4c_message.h>
 #include <axis2_array_list.h>
 #include <axis2_env.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <stdio.h>
 
 extern const void *
@@ -56,7 +56,7 @@
 int
 main(int argc, char *argv[])
 {
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axis2_env_t *env = axis2_env_create(allocator);
     if (argc <= 1)
     {

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Fri Mar 30 02:47:21 2007
@@ -42,9 +42,9 @@
 int main(int argc, char **argv )
 {
     axis2_env_t *env = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     if ( argc == 4 )

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c Fri Mar 30 02:47:21 2007
@@ -44,7 +44,7 @@
 void test_engine_config_loader(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     w2c_cmdline_option_parser_t* parser = NULL;
     axis2_hash_index_t *hi;
     axis2_hash_t* hash = NULL;
@@ -56,7 +56,7 @@
     axis2_char_t* value;
     w2c_engine_configuration_t* conf = NULL;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
     input_size = 4;
 

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c Fri Mar 30 02:47:21 2007
@@ -37,7 +37,7 @@
 void test_writer(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t* testing_lang = NULL;
     w2c_writer_t* writer = NULL;
     w2c_config_property_loader_t* loader = NULL;
@@ -53,7 +53,7 @@
 
     int input_size = 0;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     axis2c_home = getenv("AXIS2C_HOME");

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c Fri Mar 30 02:47:21 2007
@@ -66,7 +66,7 @@
 void test_cmdline_option(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     w2c_cmdline_option_parser_t *parser = NULL;
     w2c_cmdline_option_t *option = NULL;
     axis2_hash_index_t *hi;
@@ -77,7 +77,7 @@
     axis2_char_t actual[128];
     axis2_char_t *expected;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     input_size = 9;
@@ -134,7 +134,7 @@
 void test_config_property_loader(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     w2c_config_property_loader_t *loader = NULL;
     axis2_char_t *actual = NULL;
     axis2_char_t *expected = NULL;
@@ -146,7 +146,7 @@
     axis2_char_t file_path[512];
     axis2_char_t *key = NULL;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
 
@@ -205,11 +205,11 @@
 void test_messages(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t *key;
     axis2_char_t *actual = NULL;
     axis2_char_t *expected = NULL;
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     key = axis2_strdup(env, "wsdl2code.arg1");

Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c Fri Mar 30 02:47:21 2007
@@ -28,13 +28,13 @@
 void test_typemapper(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t *actual;
     axis2_char_t *expected;
     w2c_typemapper_t *typemapper;
     axis2_qname_t *qname;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     expected = "axiom_node_t*";
@@ -52,12 +52,12 @@
 void test_namespace_to_package_name(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t *input;
     axis2_char_t *actual;
     axis2_char_t *expected;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     input = (char*)axis2_strdup(env, "http://ws.apache.org/axis2/c/w2c");
@@ -80,7 +80,7 @@
 void test_template_parse(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t *xml_stream;
     axis2_char_t *xslt_filename;
     axis2_char_t *out_filename;
@@ -88,7 +88,7 @@
     axis2_char_t *cmp_out_content = NULL;
     int len = 0;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     xml_stream = read_file("../../resources/xml/atoms.xml");

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/tcpmon.c Fri Mar 30 02:47:21 2007
@@ -36,7 +36,7 @@
 int main(int argc, char** argv)
 {
 		axis2_env_t* env = NULL;
-		axis2_allocator_t* allocator = NULL;
+		axutil_allocator_t* allocator = NULL;
 		axis2_error_t *error = NULL;
 		axis2_log_t *log = NULL;
 		axis2_thread_pool_t *thread_pool = NULL;
@@ -48,7 +48,7 @@
         int format_bit = 0;
 		int ii = 1;
 
-		allocator = axis2_allocator_init(NULL);
+		allocator = axutil_allocator_init(NULL);
 
 		error = axis2_error_create(allocator);
 		log = axis2_log_create(allocator, NULL, "axis2_tcpmon.log");
@@ -139,7 +139,7 @@
 		TCPMON_SESSION_STOP(session, env);
 		TCPMON_SESSION_FREE(session, env);
 		AXIS2_FREE(env-> allocator, target_host);
-		axis2_allocator_free(allocator);
+		axutil_allocator_free(allocator);
 		axis2_env_free(env);
 		return 0;
 }

Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/tcpmon_test.c Fri Mar 30 02:47:21 2007
@@ -26,12 +26,12 @@
 void test_format_xml(CuTest *tc)
 {
     axis2_env_t *env;
-    axis2_allocator_t *allocator;
+    axutil_allocator_t *allocator;
     axis2_char_t* input;
     axis2_char_t* actual;
     axis2_char_t* expected;
 
-    allocator = axis2_allocator_init(NULL);
+    allocator = axutil_allocator_init(NULL);
     env = axis2_env_create(allocator);
 
     input = (char*)axis2_strdup(env, "<input>check for one step</input>");

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c Fri Mar 30 02:47:21 2007
@@ -22,7 +22,7 @@
 static axis2_status_t thread_mutex_cleanup(void *data)
 {
     axis2_thread_mutex_t *lock = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     if (!data)
         return AXIS2_FAILURE;
 
@@ -45,7 +45,7 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL axis2_thread_mutex_create(axis2_allocator_t *allocator,
+AXIS2_EXTERN axis2_thread_mutex_t * AXIS2_CALL axis2_thread_mutex_create(axutil_allocator_t *allocator,
         unsigned int flags)
 {
     axis2_thread_mutex_t *mutex = NULL;
@@ -138,4 +138,4 @@
 axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex)
 {
     return thread_mutex_cleanup((void*)mutex);
-}
\ No newline at end of file
+}

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c Fri Mar 30 02:47:21 2007
@@ -21,7 +21,7 @@
 DWORD tls_axis2_thread = 0;
 
 AXIS2_EXTERN axis2_threadattr_t* AXIS2_CALL
-axis2_threadattr_create(axis2_allocator_t *allocator)
+axis2_threadattr_create(axutil_allocator_t *allocator)
 {
     axis2_threadattr_t *new = NULL;
 
@@ -79,7 +79,7 @@
 }
 
 AXIS2_EXTERN axis2_thread_t* AXIS2_CALL
-axis2_thread_create(axis2_allocator_t *allocator, axis2_threadattr_t *attr,
+axis2_thread_create(axutil_allocator_t *allocator, axis2_threadattr_t *attr,
         axis2_thread_start_t func, void *data)
 {
     HANDLE           handle;
@@ -120,7 +120,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_thread_exit(axis2_thread_t *thd, axis2_allocator_t *allocator)
+axis2_thread_exit(axis2_thread_t *thd, axutil_allocator_t *allocator)
 {
     if (thd)
     {
@@ -204,7 +204,7 @@
 }
 
 AXIS2_EXTERN axis2_thread_once_t * AXIS2_CALL
-axis2_thread_once_init(axis2_allocator_t *allocator)
+axis2_thread_once_init(axutil_allocator_t *allocator)
 {
     axis2_thread_once_t *control = NULL;
     control = AXIS2_MALLOC(allocator, sizeof(*control));

Modified: webservices/axis2/trunk/c/util/test/util/test_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.c Fri Mar 30 02:47:21 2007
@@ -19,12 +19,12 @@
 #include <axis2_error_default.h>
 #include <axis2_log.h>
 #include <axis2_log_default.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <test_log.h>
 #include <string.h>
 const axis2_env_t *create_env_with_error_log()
 {
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     if (!allocator)
     {
         printf("allocator is NULL\n");

Modified: webservices/axis2/trunk/c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.c Fri Mar 30 02:47:21 2007
@@ -21,7 +21,7 @@
 #include <axis2_error_default.h>
 #include <axis2_log.h>
 #include <axis2_log_default.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_utils.h>
 #include "test_thread.h"
 #include <unistd.h>
@@ -47,7 +47,7 @@
 
 void thread_init(const axis2_env_t *env)
 {
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
 
     allocator = env->allocator;
 
@@ -83,7 +83,7 @@
 void test_axis2_thread_create(const axis2_env_t *env)
 {
     axis2_status_t rv = AXIS2_FAILURE;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     int *i = NULL, *j = NULL;
 
     allocator = env->allocator;
@@ -126,7 +126,7 @@
 void test_axis2_thread_detach(const axis2_env_t *env)
 {
     axis2_threadattr_t *attr = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     axis2_status_t rv = AXIS2_FAILURE;
 
     allocator = env->allocator;
@@ -178,7 +178,7 @@
 void test_axis2_thread_detach2(const axis2_env_t *env)
 {
     axis2_threadattr_t *attr = NULL;
-    axis2_allocator_t *allocator = NULL;
+    axutil_allocator_t *allocator = NULL;
     axis2_status_t rv = AXIS2_FAILURE;
 
     allocator = env->allocator;
@@ -257,7 +257,7 @@
     axis2_error_t *error = NULL;
     axis2_log_t *log22 = NULL;
     const axis2_env_t *env = NULL;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     if (!allocator)
     {
         printf("allocator is NULL\n");

Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 02:47:21 2007
@@ -38,7 +38,7 @@
 
 const axis2_env_t *test_init()
 {
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axis2_error_t *error = axis2_error_create(allocator);
     const axis2_env_t *env = axis2_env_create_with_error(allocator, error);
     return env;
@@ -112,7 +112,7 @@
     int i, isize;
     axis2_file_t *file = NULL;
     axis2_char_t *filename = NULL;
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axis2_error_t *error = axis2_error_create(allocator);
     const axis2_env_t *env = axis2_env_create_with_error(allocator, error);
 
@@ -217,7 +217,7 @@
 {
     char msg[10];
     printf("start of test_log_write\n\n");
-    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     if (!allocator)
     {
         printf("allocator is NULL\n");
@@ -264,9 +264,9 @@
     test_uuid_gen(env);
     run_test_log();
     test_axis2_dir_handler_list_service_or_module_dirs();
-    axis2_allocator_t *allocator = env->allocator;
+    axutil_allocator_t *allocator = env->allocator;
 /*    axis2_env_free(env);*/
-    axis2_allocator_free(allocator);
+    axutil_allocator_free(allocator);
     run_test_string(env);
     return 0;
 }

Modified: webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c Fri Mar 30 02:47:21 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=524012&r1=524011&r2=524012
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Fri Mar 30 02:47:21 2007
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <axis2_string_util.h>
-#include <axis2_allocator.h>
+#include <axutil_allocator.h>
 #include <limits.h>
 #include <axis2_string.h>
 #include <axiom_util.h>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org