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 ma...@apache.org on 2007/05/25 08:09:17 UTC
svn commit: r541560 [1/3] - in /webservices/axis2/scratch/c/neethi/axis2c:
./ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/ ides/vc/axis2c/ ides/vc/axis2c/axis2_mod_addr/
ides/vc/axis2c/mod_savan/ include/ n...
Author: manjula
Date: Thu May 24 23:09:08 2007
New Revision: 541560
URL: http://svn.apache.org/viewvc?view=rev&rev=541560
Log:
Committing the latest changes and merges.
Added:
webservices/axis2/scratch/c/neethi/axis2c/xdocs/lists_issues.html
- copied unchanged from r538415, webservices/axis2/trunk/c/xdocs/lists_issues.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/versioning.html
- copied unchanged from r538415, webservices/axis2/trunk/c/xdocs/versioning.html
Removed:
webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/mod_savan/
webservices/axis2/scratch/c/neethi/axis2c/xdocs/list.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/version.html
Modified:
webservices/axis2/scratch/c/neethi/axis2c/ (props changed)
webservices/axis2/scratch/c/neethi/axis2c/INSTALL
webservices/axis2/scratch/c/neethi/axis2c/Makefile.am
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/data_handler.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/mime_body_part.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_element.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_text.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap11_builder_helper.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap_envelope.c
webservices/axis2/scratch/c/neethi/axis2c/axiom/test/Makefile.am
webservices/axis2/scratch/c/neethi/axis2c/bindist.sh
webservices/axis2/scratch/c/neethi/axis2c/configure.ac
webservices/axis2/scratch/c/neethi/axis2c/dist.sh
webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj
webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2c.sln
webservices/axis2/scratch/c/neethi/axis2c/include/axis2_const.h
webservices/axis2/scratch/c/neethi/axis2c/include/axis2_http_worker.h
webservices/axis2/scratch/c/neethi/axis2c/include/axis2_op_ctx.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/policy.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/reference.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/secpolicy_builder.c
webservices/axis2/scratch/c/neethi/axis2c/samples/build.sh
webservices/axis2/scratch/c/neethi/axis2c/samples/client/echo/echo.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/client/google/google.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/client/math/math.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/client/mtom/mtom.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/client/notify/notify.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/client/yahoo/yahoo.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/configure.ac
webservices/axis2/scratch/c/neethi/axis2c/samples/server/Calculator/calc_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/axis2.xml
webservices/axis2/scratch/c/neethi/axis2c/samples/server/echo/echo.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/math/math_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/add_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/div_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/mul_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/sub_skeleton.c
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_addr.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_dual.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_soap11.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking_dual.mk
webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_rest.mk
webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/op_client.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/options.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/context/op_ctx.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/conf_builder.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/dep_engine.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/desc_builder.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/module_builder.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/repos_listener.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/ws_info_list.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/description/op.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/ctx_handler.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/engine.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/soap_action_disp.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/phaseresolver/phase_resolver.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_response_writer.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_simple_request.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_worker.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/simple_http_svr_conn.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_receiver.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_sender.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_transport_sender.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_stream.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_stream.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/util/http_transport_utils.c
webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/addr_in_handler.c
webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/mod_addr.c
webservices/axis2/scratch/c/neethi/axis2c/test/core/clientapi/test_clientapi.c
webservices/axis2/scratch/c/neethi/axis2c/test/core/transport/http/test_http_transport.c
webservices/axis2/scratch/c/neethi/axis2c/tools/tcpmon/src/tcpmon.c
webservices/axis2/scratch/c/neethi/axis2c/util/include/axutil_error.h
webservices/axis2/scratch/c/neethi/axis2c/util/src/error.c
webservices/axis2/scratch/c/neethi/axis2c/util/src/platforms/windows/thread_mutex_windows.c
webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_log.c
webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_thread.c
webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_util.c
webservices/axis2/scratch/c/neethi/axis2c/xdocs/archived_news.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/coding_conventions.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/architecture_notes.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/axis2c_manual.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/index.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/installationguide.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/om_tutorial.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/download.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/index.html
webservices/axis2/scratch/c/neethi/axis2c/xdocs/navigation.xml
Propchange: webservices/axis2/scratch/c/neethi/axis2c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 24 23:09:08 2007
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-532180
+/webservices/axis2/trunk/c:1-539277
Modified: webservices/axis2/scratch/c/neethi/axis2c/INSTALL
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/INSTALL?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/INSTALL (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/INSTALL Thu May 24 23:09:08 2007
@@ -95,6 +95,14 @@
NOTE: If you don't provide the --prefix configure option, it will by default
be installed into "/usr/local/axis2c" directory.
+ You could run make check to test if everything is working fine. However, note
+ that the test/core/clientapi/test_clientapi program would fail unless
+ AXIS2C_HOME points to the installed location. (It's looking for Axis2/C
+ repository) This means you really should run "make && make install",
+ then set AXIS2C_HOME=/path/to/install, and then "make check".
+ That's a little different than the usual "make && make check && make install"
+ process.
+
You may need to try Axis2/C with guththila xml parser. You can do it by giving
"--enable-guththila=yes" as a configure option.
@@ -108,8 +116,8 @@
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/axis2c/lib/
cd samples
- ./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include
- --with-axiom=${AXIS2C_HOME}/include
+ ./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.0
+ --with-axiom=${AXIS2C_HOME}/include/axis2-1.0
make
sudo make install
@@ -336,12 +344,12 @@
5.1.1 On the Linux Platform
Provide the Apache2 include file location as a configure option
- ./configure --with-apache2="<apache2 directory>" [other configure options]
+ ./configure --with-apache2="<apache2 httpd include files location>" [other configure options]
NOTE: Some apache2 distributions install APR (Apache Portable Run-time)
include files in a separate location which is required to build mod_axis2.
In that case use:
- ./configure --with-apache2="<apache2 directory>"
+ ./configure --with-apache2="<apache2 directornclude files location>>"
--with-apr="<apr include files location>" [other configure options]
Then build the source tree
Modified: webservices/axis2/scratch/c/neethi/axis2c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/Makefile.am?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/Makefile.am Thu May 24 23:09:08 2007
@@ -13,7 +13,7 @@
logs_DATA=
docs_DATA=docs/*
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh docs guththila tools AUTHORS NOTICE
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh xdocs guththila tools AUTHORS NOTICE
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/data_handler.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/data_handler.c Thu May 24 23:09:08 2007
@@ -121,7 +121,6 @@
axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler,
const axutil_env_t *env)
{
- /*@TODO implement the following*/
return (axis2_byte_t *)"";
}
@@ -189,9 +188,8 @@
count = fread(read_stream, 1, read_stream_size, f);
if (ferror(f) != 0)
{
- /*TODO : need to set the correct error code */
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
if (byte_stream)
{
AXIS2_FREE(env->allocator, byte_stream);
@@ -309,7 +307,6 @@
if (ferror(f) != 0)
{
- /*TODO : need to set the correct error code */
return AXIS2_FAILURE;
}
fflush(f);
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/mime_body_part.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/attachments/mime_body_part.c Thu May 24 23:09:08 2007
@@ -172,10 +172,9 @@
header_str_size = axutil_strlen(header_str);
}
- /* TODO encoding needs to be done, we only support binary as of now,
- Java supports "base64", "uuencode", "x-uuencode", "x-uue",
- "quoted-printable"
- */
+ /* TODO: We only support binary as of now,
+ Axis2/Java supports "base64", "uuencode", "x-uuencode", "x-uue",
+ "quoted-printable" */
if (mime_body_part->data_handler)
{
status = axiom_data_handler_read_from(mime_body_part->data_handler, env,
@@ -201,7 +200,6 @@
}
return AXIS2_FAILURE;
}
- /*TODO char2byte header_str */
if (header_str)
{
memcpy(byte_stream, header_str, header_str_size);
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_element.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_element.c Thu May 24 23:09:08 2007
@@ -807,8 +807,7 @@
ns = om_element->ns;
}
else
- { /* TODO need to change get_namespace and get_qname methods so
- that default namespace is handled properly */
+ {
ns = axiom_element_get_default_namespace(
om_element, env, ele_node);
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_stax_builder.c Thu May 24 23:09:08 2007
@@ -146,12 +146,23 @@
attr_name = axiom_xml_reader_get_attribute_name_by_number(
om_builder->parser, env, i);
- attr_name_str = axutil_string_create_assume_ownership(env, &attr_name);
-
+#ifdef WIN32
+ attr_name_str = axutil_string_create(env, attr_name);
+ axiom_xml_reader_xml_free(om_builder->parser, env, attr_name);
+#else
+ attr_name_str = axutil_string_create_assume_ownership(env, &attr_name);
+#endif
+
attr_value = axiom_xml_reader_get_attribute_value_by_number(
om_builder->parser, env, i);
- attr_value_str = axutil_string_create_assume_ownership(env, &attr_value);
+
+#ifdef WIN32
+ attr_value_str = axutil_string_create(env, attr_value);
+ axiom_xml_reader_xml_free(om_builder->parser, env, attr_value);
+#else
+ attr_value_str = axutil_string_create_assume_ownership(env, &attr_value);
+#endif
if (attr_name)
{
@@ -213,7 +224,14 @@
return NULL;
}
- temp_value_str = axutil_string_create_assume_ownership(env, &temp_value);
+
+#ifdef WIN32
+ temp_value_str = axutil_string_create(env, temp_value);
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_value);
+#else
+ temp_value_str = axutil_string_create_assume_ownership(env, &temp_value);
+#endif
+
if (axiom_node_is_complete(om_builder->lastnode, env))
{
@@ -311,10 +329,17 @@
temp_ns_uri = axiom_xml_reader_get_namespace_uri_by_number(
om_builder->parser, env , i);
- temp_ns_prefix_str = axutil_string_create_assume_ownership(env, &temp_ns_prefix);
-
+#ifdef WIN32
+ temp_ns_prefix_str = axutil_string_create(env, temp_ns_prefix);
+#else
+ temp_ns_prefix_str = axutil_string_create_assume_ownership(env, &temp_ns_prefix);
+#endif
+
+#ifdef WIN32
+ temp_ns_uri_str = axutil_string_create(env, temp_ns_uri);
+#else
temp_ns_uri_str = axutil_string_create_assume_ownership(env, &temp_ns_uri);
-
+#endif
if (!temp_ns_prefix || axutil_strcmp(temp_ns_prefix, "xmlns") == 0)
{
/** default namespace case */
@@ -357,6 +382,10 @@
}
axutil_string_free(temp_ns_uri_str, env);
axutil_string_free(temp_ns_prefix_str, env);
+#ifdef WIN32
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_uri);
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_prefix);
+#endif
if (!om_ns)
{
/* something went wrong */
@@ -414,7 +443,12 @@
return NULL;
}
+#ifdef WIN32
+ temp_localname_str = axutil_string_create(env, temp_localname);
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_localname);
+#else
temp_localname_str = axutil_string_create_assume_ownership(env, &temp_localname);
+#endif
om_builder->element_level++;
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_text.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/om/om_text.c Thu May 24 23:09:08 2007
@@ -501,7 +501,7 @@
if (data_handler_stream)
{
encoded_len = axutil_base64_encode_len(data_handler_stream_size);
- encoded_str = AXIS2_MALLOC(env->allocator, encoded_len);
+ encoded_str = AXIS2_MALLOC(env->allocator, encoded_len + 2);
if (encoded_str)
{
encoded_len = axutil_base64_encode(encoded_str,
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Thu May 24 23:09:08 2007
@@ -467,10 +467,7 @@
if (AXIS2_INTF_TO_IMPL(parser)->reader)
{
xmlTextReaderClose(AXIS2_INTF_TO_IMPL(parser)->reader);
-#if defined( WIN32 )
-#else
xmlFreeTextReader(AXIS2_INTF_TO_IMPL(parser)->reader);
-#endif
}
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(parser));
return;
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap11_builder_helper.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap11_builder_helper.c Thu May 24 23:09:08 2007
@@ -218,7 +218,6 @@
if (!fault_text_node)
return AXIS2_FAILURE;
- /* TODO process namespace data */
axiom_stax_builder_set_lastnode(builder_helper->om_builder, env, fault_text_node);
status = axiom_soap11_builder_helper_process_text(builder_helper, env);
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap_envelope.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/src/soap/soap_envelope.c Thu May 24 23:09:08 2007
@@ -248,7 +248,6 @@
axiom_namespace_t *ns = NULL;
AXIS2_ENV_CHECK(env, NULL);
- /* TODO : cache SOAP header and soap_envelope instead of looking them up?*/
if (!soap_envelope->header)
return NULL;
@@ -554,7 +553,7 @@
ns_uri = AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
}
else
- { /** TODO set error */
+ {
return AXIS2_FAILURE;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/axiom/test/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/axiom/test/Makefile.am?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/axiom/test/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/axiom/test/Makefile.am Thu May 24 23:09:08 2007
@@ -1,3 +1,3 @@
TESTS =
SUBDIRS = om soap
-
+EXTRA_DIST = resources
Modified: webservices/axis2/scratch/c/neethi/axis2c/bindist.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/bindist.sh?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/bindist.sh (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/bindist.sh Thu May 24 23:09:08 2007
@@ -38,6 +38,7 @@
doxygen doxygenconf
cd ../..
cp -r xdocs/api/html target/docs/api/
+cp xdocs/docs/mod_log/module.xml target/docs/docs/mod_log
cp -r target/docs ${AXIS2C_HOME}
cd ${AXIS2C_HOME}
Modified: webservices/axis2/scratch/c/neethi/axis2c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/configure.ac?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/configure.ac (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/configure.ac Thu May 24 23:09:08 2007
@@ -106,7 +106,8 @@
#AC_CHECK_FUNCS([memmove])
AC_MSG_CHECKING(whether to build libxml2 xml parser library)
-AC_ARG_ENABLE(libxml2, [ --enable-libxml2 build libxml2 xml parser library wrapper. default=yes],
+AC_ARG_ENABLE(libxml2, [ --enable-libxml2
+ build Libxml2 XML parser library wrapper (default=yes)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -128,7 +129,8 @@
GUTHTHILA_LIBS=""
AC_MSG_CHECKING(whether to build guththila xml parser library)
-AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=no],
+AC_ARG_ENABLE(guththila, [ --enable-guththila
+ build Guththila XML parser library wrapper (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -150,7 +152,11 @@
AC_MSG_CHECKING(whether to use apache2 as server transport)
AC_ARG_WITH(apache2,
-[ --with-apache2[=PATH] use apache2 as server transport.],
+[ --with-apache2[=PATH] Find the Apache2 HTTP Web server header files in 'PATH'.
+ If this option is given, the Apache2 httpd module would be built.
+ 'PATH' should point to Apache2 httpd include files location.
+ If you omit the '=PATH' part completely, the configure script will search
+ '/usr/include/apache2' for Apache2 headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -175,7 +181,13 @@
AC_MSG_CHECKING(whether to use apr. Note that if you build with apache2 you might need to do this.)
AC_ARG_WITH(apr,
-[ --with-apr[=PATH] use apr.],
+[ --with-apr[=PATH] Find the APR header files in 'PATH'.
+ Some Apache2 distributions, specially development versions, install APR
+ (Apache Portable Run-time) include files in a separate location.
+ In that case, to build Apache2 httpd module, this option is also required.
+ 'PATH' should point to APR include files location.
+ If you omit the '=PATH' part completely, the configure script will search
+ '/usr/include/apr-0' for APR headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -197,7 +209,8 @@
)
AC_MSG_CHECKING(whether to build tests)
-AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=yes],
+AC_ARG_ENABLE(tests, [ --enable-tests
+ build tests (default=yes)],
[ case "${enableval}" in
yes)
AC_MSG_RESULT(yes)
@@ -215,7 +228,8 @@
AC_MSG_CHECKING(whether to enable trace)
-AC_ARG_ENABLE(trace, [ --enable-trace enable trace. default=no],
+AC_ARG_ENABLE(trace, [ --enable-trace
+ enable logging trace messages, useful when debugging (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -231,7 +245,8 @@
)
AC_MSG_CHECKING(whether to enable multi threading)
-AC_ARG_ENABLE(multi-thread, [ --enable-multi-thread enable multi thread. default=yes],
+AC_ARG_ENABLE(multi-thread, [ --enable-multi-thread
+ enable multi threading (default=yes)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -247,7 +262,8 @@
)
AC_MSG_CHECKING(whether to use openssl)
-AC_ARG_ENABLE(openssl, [ --enable-openssl enable ssl. default=no],
+AC_ARG_ENABLE(openssl, [ --enable-openssl
+ enable OpenSSL support in client transport (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -265,7 +281,8 @@
)
AC_MSG_CHECKING(whether to use libcurl)
-AC_ARG_ENABLE(libcurl, [ --enable-libcurl enable libcurl. default=no],
+AC_ARG_ENABLE(libcurl, [ --enable-libcurl
+ enable libcurl based client transport (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -281,26 +298,6 @@
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
)
-
-
-AC_MSG_CHECKING(whether to build dynamic invocation client library)
-AC_ARG_ENABLE(diclient, [ --enable-diclient build diclient library wrapper. default=no],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- DICLIENT_DIR=""
- ;;
- *)
- AC_MSG_RESULT(yes)
- DICLIENT_DIR="diclient"
-
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- DICLIENT_DIR="diclient"
-)
-
-
APACHE2INC=$apache2inc
APRINC=$aprinc
Modified: webservices/axis2/scratch/c/neethi/axis2c/dist.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/dist.sh?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/dist.sh (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/dist.sh Thu May 24 23:09:08 2007
@@ -6,6 +6,7 @@
doxygen doxygenconf
cd ../..
cp -r xdocs/api/html target/docs/api/
+cp xdocs/docs/mod_log/module.xml target/docs/docs/mod_log
cp -r target/docs axis2c-src-1.0.0
cd samples
make dist
Modified: webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj Thu May 24 23:09:08 2007
@@ -94,7 +94,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy .\..\..\..\..\modules\mod_addr\module.xml .\..\deploy\modules\addressing"
+ CommandLine="copy .\..\..\..\..\src\modules\mod_addr\module.xml .\..\deploy\modules\addressing"
/>
</Configuration>
<Configuration
Modified: webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2c.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2c.sln?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/ides/vc/axis2c/axis2c.sln Thu May 24 23:09:08 2007
@@ -55,8 +55,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axutil", "axutil\axutil.vcproj", "{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_savan", "mod_savan\mod_savan.vcproj", "{C781F3DE-8F38-4778-A50F-003D04336A10}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52AB54B9-4457-4E03-B892-75CC56F22B32}"
ProjectSection(SolutionItems) = preProject
..\..\..\build\win32\makefile = ..\..\..\build\win32\makefile
@@ -110,10 +108,6 @@
{3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Debug|Win32.Build.0 = Debug|Win32
{3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Release|Win32.ActiveCfg = Release|Win32
{3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Release|Win32.Build.0 = Release|Win32
- {C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.ActiveCfg = Debug|Win32
- {C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.Build.0 = Debug|Win32
- {C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.ActiveCfg = Release|Win32
- {C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.Build.0 = Release|Win32
{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Debug|Win32.ActiveCfg = Debug|Win32
{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Debug|Win32.Build.0 = Debug|Win32
{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Release|Win32.ActiveCfg = Release|Win32
Modified: webservices/axis2/scratch/c/neethi/axis2c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/include/axis2_const.h?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/include/axis2_const.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/include/axis2_const.h Thu May 24 23:09:08 2007
@@ -317,6 +317,8 @@
#define AXIS2_ATTACHMENT_TEMP_DIR "attachmentDIR"
#define AXIS2_CACHE_ATTACHMENTS "cacheAttachments"
#define AXIS2_FILE_SIZE_THRESHOLD "sizeThreshold"
+/* op_ctx persistance */
+#define AXIS2_PERSIST_OP_CTX "persistOperationContext"
/******************************************************************************/
Modified: webservices/axis2/scratch/c/neethi/axis2c/include/axis2_http_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/include/axis2_http_worker.h?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/include/axis2_http_worker.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/include/axis2_http_worker.h Thu May 24 23:09:08 2007
@@ -86,18 +86,16 @@
axis2_http_worker_create (const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-/** Process the request. */
-#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\
+/*#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\
simple_request) axis2_http_worker_process_request(\
http_worker, env, svr_conn, simple_request)
-/** Sets the server port. */
#define AXIS2_HTTP_WORKER_SET_SVR_PORT(http_worker, env, port) \
axis2_http_worker_set_svr_port(http_worker, env, port)
-/** Frees the http worker. */
#define AXIS2_HTTP_WORKER_FREE(http_worker, env) \
axis2_http_worker_free(http_worker, env)
+*/
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/scratch/c/neethi/axis2c/include/axis2_op_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/include/axis2_op_ctx.h?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/include/axis2_op_ctx.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/include/axis2_op_ctx.h Thu May 24 23:09:08 2007
@@ -229,6 +229,39 @@
axis2_op_ctx_get_response_written(const axis2_op_ctx_t *op_ctx,
const axutil_env_t *env);
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_op_ctx_destroy_mutex(
+ struct axis2_op_ctx *op_ctx,
+ const axutil_env_t *env);
+
+ /**
+ * Checks whether op_ctx is in use. This is necessary when destroying the
+ * thread mutex at the http_worker to check whether the operation context
+ * is still in use
+ * @param msg_ctx message context
+ * @param env pointer to environment struct
+ * @return AXIS2_TRUE if still in use, else AXIS2_FALSE
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_op_ctx_is_in_use(
+ const axis2_op_ctx_t *op_ctx,
+ const axutil_env_t *env);
+
+ /**
+ * Set operation context's is_in_use attribute. This is necessary when
+ * destroying the thread mutex at the http_worker to check whether the
+ * operation context is still in use
+ * @param msg_ctx message context
+ * @param env pointer to environment struct
+ * @return AXIS2_TRUE if still in use, else AXIS2_FALSE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_op_ctx_set_in_use(
+ struct axis2_op_ctx *op_ctx,
+ const axutil_env_t *env,
+ axis2_bool_t is_in_use);
+
+
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/all.c Thu May 24 23:09:08 2007
@@ -159,7 +159,7 @@
all_ele = axiom_element_create(env, parent, NEETHI_ALL, policy_ns, &all_node);
if (!all_node)
{
- printf("Exactlyone serialization failed\n");
+ /*printf("Exactlyone serialization failed\n");*/
return AXIS2_FAILURE;
}
components = neethi_policy_get_policy_components(neethi_all, env);
@@ -177,7 +177,7 @@
status = neethi_operator_serialize(operator, env, all_node);
if(status != AXIS2_SUCCESS)
{
- printf("Operator Serializing failed\n");
+ /*printf("Operator Serializing failed\n");*/
return status;
}
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/assertion.c Thu May 24 23:09:08 2007
@@ -254,7 +254,7 @@
if (!node)
{
- printf("Assertion serialization failed\n");
+ /*printf("Assertion serialization failed\n");*/
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c Thu May 24 23:09:08 2007
@@ -358,19 +358,19 @@
case OPERATOR_TYPE_POLICY:
neethi_policy = (neethi_policy_t *)value;
neethi_policy_add_operator(neethi_policy,env,component);
- printf("neethi_policy\n");
+ /*printf("neethi_policy\n");*/
break;
case OPERATOR_TYPE_ALL:
all = (neethi_all_t *)value;
neethi_all_add_operator(all,env,component);
- printf("all\n");
+ /*printf("all\n");*/
break;
case OPERATOR_TYPE_EXACTLYONE:
exactlyone = (neethi_exactlyone_t *)value;
neethi_exactlyone_add_operator(exactlyone,env,component);
- printf("exactlyone\n");
+ /*printf("exactlyone\n");*/
break;
case OPERATOR_TYPE_UNKNOWN:
@@ -380,7 +380,7 @@
case OPERATOR_TYPE_ASSERTION:
assertion = (neethi_assertion_t *)value;
neethi_assertion_add_operator(assertion, env, component);
- printf("assertion\n");
+ /*printf("assertion\n");*/
break;
case OPERATOR_TYPE_REFERENCE:
@@ -404,7 +404,7 @@
if(axutil_array_list_size(list,env)>1)
{
- printf("Error with Normalized neethi_policy\n");
+ /*printf("Error with Normalized neethi_policy\n");*/
return;
}
op = (neethi_operator_t *)axutil_array_list_get(list,env,0);
@@ -414,13 +414,13 @@
void *value = neethi_operator_get_value(op,env);
if(value)
{
- printf("Check is ok\n");
+ /*printf("Check is ok\n");*/
return;
}
}
else
{
- printf("Not properly normalized\n");
+ /*printf("Not properly normalized\n");*/
return;
}
}
@@ -497,7 +497,7 @@
if(!exactlyone1 || !exactlyone2)
{
- printf("Merged fail Input wrong \n");
+ /*printf("Merged fail Input wrong \n");*/
return NULL;
}
exactlyone = get_cross_product(exactlyone1,exactlyone2,env);
@@ -664,7 +664,7 @@
/*Assertion normalization part comes here*/
if(deep)
{
- printf("We still not handling deep normalization of assertions");
+ /*printf("We still not handling deep normalization of assertions");*/
return NULL;
}
else
@@ -714,13 +714,13 @@
uri = neethi_reference_get_uri(policy_ref, env);
if(!uri)
{
- printf("NO policy Reference\n");
+ /*printf("NO policy Reference\n");*/
return NULL;
}
policy = neethi_registry_lookup(registry, env, uri);
if(!policy)
{
- printf("Cannot get policy from uri\n");
+ /*printf("Cannot get policy from uri\n");*/
return NULL;
}
neethi_operator_set_value(child_component, env, policy, OPERATOR_TYPE_POLICY);
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/policy.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/policy.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/policy.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/policy.c Thu May 24 23:09:08 2007
@@ -173,12 +173,12 @@
op = (neethi_operator_t *)axutil_array_list_get(list,env,0);
if(!op)
{
- printf("Error in normalized neethi_policy\n");
+ /*printf("Error in normalized neethi_policy\n");*/
return NULL;
}
if(neethi_operator_get_type(op,env) != OPERATOR_TYPE_EXACTLYONE)
{
- printf("Error in normalized neethi_policy\n");
+ /*printf("Error in normalized neethi_policy\n");*/
return NULL;
}
exactlyone = (neethi_exactlyone_t *)neethi_operator_get_value(op,env);
@@ -276,7 +276,7 @@
policy_ele = axiom_element_create(env, parent, NEETHI_POLICY, policy_ns, &policy_node);
if (!policy_ele)
{
- printf("Policy element serialization failed.\n");
+ /*printf("Policy element serialization failed.\n");*/
return NULL;
}
@@ -295,7 +295,7 @@
status = neethi_operator_serialize(operator, env, policy_node);
if(status != AXIS2_SUCCESS)
{
- printf("Operator Serializing failed\n");
+ /*printf("Operator Serializing failed\n");*/
return NULL;
}
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/reference.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/reference.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/reference.c Thu May 24 23:09:08 2007
@@ -105,7 +105,7 @@
ref_ele = axiom_element_create(env, parent, NEETHI_REFERENCE, policy_ns, &ref_node);
if (!ref_node)
{
- printf("Reference serialization failed\n");
+ /*printf("Reference serialization failed\n");*/
return AXIS2_FAILURE;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/secpolicy_builder.c Thu May 24 23:09:08 2007
@@ -54,7 +54,7 @@
if(secpolicy_process_alternatives(env, all, secpolicy)==AXIS2_FAILURE)
{
- printf("Cannot create secpolicy\n");
+ /*printf("Cannot create secpolicy\n");*/
return NULL;
}
return secpolicy;
@@ -94,7 +94,7 @@
transport_binding = (rp_transport_binding_t *)neethi_assertion_get_value(assertion, env);
if(!transport_binding)
{
- printf("Transport Binding not set\n");
+ /*printf("Transport Binding not set\n");*/
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
@@ -109,7 +109,7 @@
asymmetric_binding = (rp_asymmetric_binding_t *)neethi_assertion_get_value(assertion, env);
if(!asymmetric_binding)
{
- printf("Asymmetric Binding not set\n");
+ /*printf("Asymmetric Binding not set\n");*/
return AXIS2_FAILURE;
}
binding = rp_property_create(env);
@@ -143,7 +143,7 @@
wss10 = (rp_wss10_t *)neethi_assertion_get_value(assertion, env);
if(!wss10)
{
- printf("WSS not set\n");
+ /*printf("WSS not set\n");*/
return AXIS2_FAILURE;
}
wss = rp_property_create(env);
@@ -174,7 +174,7 @@
rampart_config = (rp_rampart_config_t *)neethi_assertion_get_value(assertion, env);
if(!rampart_config)
{
- printf("Rampart_config not set\n");
+ /*printf("Rampart_config not set\n");*/
return AXIS2_FAILURE;
}
rp_secpolicy_set_rampart_config(secpolicy, env, rampart_config);
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/build.sh?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/build.sh (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/build.sh Thu May 24 23:09:08 2007
@@ -2,7 +2,7 @@
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
+./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.0 --with-axiom=${AXIS2C_HOME}/include/axis2-1.0
make
make install
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/echo/echo.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/echo/echo.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/echo/echo.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/echo/echo.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo echo.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/google/google.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/google/google.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/google/google.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/google/google.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo *.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:google.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/math/math.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/math/math.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/math/math.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/math/math.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo *.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:math.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/mtom/mtom.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/mtom/mtom.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/mtom/mtom.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/mtom/mtom.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo *.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:mtom.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/notify/notify.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/notify/notify.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/notify/notify.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/notify/notify.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo *.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:notify.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/client/yahoo/yahoo.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/client/yahoo/yahoo.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/client/yahoo/yahoo.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/client/yahoo/yahoo.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" *.C /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C /I.\..\..\..\include /c
@link.exe /nologo *.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:yahoo.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/configure.ac?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/configure.ac (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/configure.ac Thu May 24 23:09:08 2007
@@ -81,7 +81,10 @@
AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] use axiom.],
+[ --with-axiom[=PATH] Find the AXIOM header files in 'PATH'.
+ 'PATH' should point to AXIOM include files location.
+ If you omit the '=PATH' part completely, the configure script will search
+ '$(AXIS2C_HOME)/include/axis2-1.0' for AXIOM headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -93,7 +96,7 @@
axiominc="-I$withval"
dnl else find the axiom include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include"
+ axiominc="-I$(AXIS2C_HOME)/include/axis2-1.0"
else
AC_MSG_ERROR(could not find axiom. stop)
fi
@@ -104,7 +107,10 @@
AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
+[ --with-axis2_util[=PATH] Find the Axis2 util header files in 'PATH'.
+ 'PATH' should point to Axis2 util include files location.
+ If you omit the '=PATH' part completely, the configure script will search
+ '$(AXIS2C_HOME)/include/axis2-1.0' for Axis2 util headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -116,7 +122,7 @@
axis2_utilinc="-I$withval"
dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include"
+ axis2_utilinc="-I$(AXIS2C_HOME)/include/axis2-1.0"
else
AC_MSG_ERROR(could not find axis2_util. stop)
fi
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/Calculator/calc_skeleton.c Thu May 24 23:09:08 2007
@@ -122,7 +122,7 @@
printf("Calculator service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
@@ -134,10 +134,6 @@
const axutil_env_t *env)
{
*inst = axis2_calc_create(env);
- /*if( *inst)
- {
- status = *inst->init();
- }*/
if (!(*inst))
{
return AXIS2_FAILURE;
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/axis2.xml?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/axis2.xml (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/axis2.xml Thu May 24 23:09:08 2007
@@ -2,17 +2,12 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">false</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
+ <!-- Uncomment following to enable MTOM support -->
<!--parameter name="enableMTOM" locked="false">true</parameter-->
- <!-- Uncomment this to enable REST support -->
<parameter name="enableREST" locked="false">true</parameter>
-
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
-
- <parameter name="seralizeLocation" locked="false">.</parameter>
+ <!-- Uncomment following to persist op_ctx, useful with RM -->
+ <!--parameter name="persistOperationContext" locked="false">true</parameter-->
<!--if you want to extract the service archive file and work with that please uncomment this-->
<!--else , it wont extract archive file or does not take into consideration if someone drop-->
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/echo/echo.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/echo/echo.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/echo/echo.c Thu May 24 23:09:08 2007
@@ -42,7 +42,7 @@
return NULL;
}
- text_parent_node = axiom_node_get_first_child(node, env);
+ text_parent_node = axiom_node_get_first_element(node, env);
if (!text_parent_node) /* 'text' node */
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/math/math_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/math/math_skeleton.c Thu May 24 23:09:08 2007
@@ -122,7 +122,7 @@
printf("Math service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
@@ -134,10 +134,6 @@
const axutil_env_t *env)
{
*inst = math_create(env);
- /*if( *inst)
- {
- status = *inst->init();
- }*/
if (!(*inst))
{
return AXIS2_FAILURE;
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/add_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/add_skeleton.c Thu May 24 23:09:08 2007
@@ -113,7 +113,7 @@
printf("Math service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/div_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/div_skeleton.c Thu May 24 23:09:08 2007
@@ -113,7 +113,7 @@
printf("Math service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/mul_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/mul_skeleton.c Thu May 24 23:09:08 2007
@@ -113,7 +113,7 @@
printf("Math service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/sub_skeleton.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/server/sg_math/sub_skeleton.c Thu May 24 23:09:08 2007
@@ -112,7 +112,7 @@
printf("Math service ERROR: invalid OM parameters in request\n");
- /** TODO: return a SOAP fault here */
+ /** Note: return a SOAP fault here */
return node;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_blocking.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_blocking.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_blocking.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_blocking.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_addr.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_addr.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_addr.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_addr.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_blocking_addr.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_blocking_addr.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_blocking_addr.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_blocking_addr.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_dual.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_dual.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_dual.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_dual.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_blocking_dual.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_blocking_dual.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_blocking_dual.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_blocking_dual.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_soap11.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_soap11.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_soap11.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_blocking_soap11.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_blocking_soap11.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_blocking_soap11.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_blocking_soap11.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_blocking_soap11.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_non_blocking.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_non_blocking.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_non_blocking.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_non_blocking.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking_dual.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking_dual.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking_dual.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_non_blocking_dual.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_non_blocking_dual.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_non_blocking_dual.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_non_blocking_dual.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_non_blocking_dual.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_rest.mk
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_rest.mk?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_rest.mk (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/samples/user_guide/clients/echo_rest.mk Thu May 24 23:09:08 2007
@@ -1,5 +1,5 @@
echo:
- @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" echo_rest.C echo_util.c /I.\..\..\..\include /c
+ @cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" echo_rest.C echo_util.c /I.\..\..\..\include /c
@link.exe /nologo echo_rest.obj echo_util.obj /LIBPATH:.\..\..\..\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib /OUT:echo_rest.exe
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/op_client.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/op_client.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/op_client.c Thu May 24 23:09:08 2007
@@ -305,7 +305,6 @@
if(op_client->completed)
{
- /**TODO:error completed*/
return AXIS2_FAILURE;
}
@@ -316,7 +315,6 @@
if(!msg_ctx)
{
- /*TODO:error msg ctx is null*/
return AXIS2_FAILURE;
}
@@ -407,7 +405,6 @@
AXIS2_CALLBACK_RECV_ADD_CALLBACK(op_client->callback_recv, env,
axis2_msg_ctx_get_msg_id(msg_ctx, env),
op_client->callback);
- /* TODO: set up reply to */
axis2_msg_ctx_set_op_ctx(msg_ctx, env, axis2_op_find_op_ctx(op, env,
msg_ctx, op_client->svc_ctx));
axis2_msg_ctx_set_svc_ctx(msg_ctx, env, op_client->svc_ctx);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/options.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/options.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/options.c Thu May 24 23:09:08 2007
@@ -553,7 +553,6 @@
if (!(options->transport_out))
{
- /*TODO:error*/
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -603,10 +602,8 @@
{
if (sender_transport != receiver_transport)
{
- /*TODO:error*/
return AXIS2_FAILURE;
}
- /*TODO: check the transport is either HTTP or TCP*/
}
else
{
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/clientapi/svc_client.c Thu May 24 23:09:08 2007
@@ -156,9 +156,6 @@
wsdl_path = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
svc_client->options = axis2_options_create(env);
- /* TODO: this method should be moved out of core implementation
- svc_client->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri,
- wsdl_svc_qname, endpoint_name, wsdl_path, svc_client->options); */
if (svc_client->svc)
{
axutil_hash_index_t *i = NULL;
@@ -886,7 +883,6 @@
if (!op)
{
- /*TODO:error - svc does not have the operation*/
return NULL;
}
@@ -939,8 +935,6 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- /*TODO:implement-issue - there's not get_own_endpoint_ref in svc_ctx*/
-
return NULL;
}
@@ -950,8 +944,6 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- /*TODO:implement-issue - there's not get_target_endpoint_ref in svc_ctx*/
-
return NULL;
}
@@ -961,8 +953,6 @@
axis2_endpoint_ref_t *target_endpoint_ref)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- /*TODO:implement-issue - there's not set_my_epr in svc_ctx*/
return AXIS2_FAILURE;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/context/op_ctx.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/context/op_ctx.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/context/op_ctx.c Thu May 24 23:09:08 2007
@@ -49,6 +49,7 @@
/* mutex to synchronize the read/write operations */
axutil_thread_mutex_t *mutex;
axis2_bool_t response_written;
+ axis2_bool_t is_in_use;
};
AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
@@ -73,6 +74,7 @@
op_ctx->op = NULL;
op_ctx->op_mep = 0;
op_ctx->is_complete = AXIS2_FALSE;
+ op_ctx->is_in_use = AXIS2_FALSE;
op_ctx->op_ctx_map = NULL;
op_ctx->op_qname = NULL;
op_ctx->svc_qname = NULL;
@@ -155,6 +157,19 @@
return;
}
+AXIS2_EXTERN void AXIS2_CALL
+axis2_op_ctx_destroy_mutex(
+ struct axis2_op_ctx *op_ctx,
+ const axutil_env_t *env)
+{
+
+ if (op_ctx->mutex)
+ {
+ axutil_thread_mutex_destroy(op_ctx->mutex);
+ op_ctx->mutex = NULL;
+ }
+}
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_ctx_init(
struct axis2_op_ctx *op_ctx,
@@ -228,7 +243,6 @@
if (out_msg_ctx && in_msg_ctx)
{
- /*TODO:error - completed*/
axutil_thread_mutex_unlock(op_ctx->mutex);
return AXIS2_FAILURE;
}
@@ -279,6 +293,24 @@
axis2_bool_t is_complete)
{
op_ctx->is_complete = is_complete;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+axis2_op_ctx_is_in_use(
+ const axis2_op_ctx_t *op_ctx,
+ const axutil_env_t *env)
+{
+ return op_ctx->is_in_use;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_op_ctx_set_in_use(
+ struct axis2_op_ctx *op_ctx,
+ const axutil_env_t *env,
+ axis2_bool_t is_in_use)
+{
+ op_ctx->is_in_use = is_in_use;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/conf_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/conf_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/conf_builder.c Thu May 24 23:09:08 2007
@@ -208,7 +208,7 @@
{
axis2_conf_builder_process_disp_order(conf_builder, env, disp_order_node);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "found the custom disptaching \
- order and continue with that order");
+order and continue with that order");
}
else
{
@@ -218,7 +218,7 @@
return AXIS2_FAILURE;
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "no custom dispatching order \
- found continue with default dispatcing order");
+found continue with default dispatching order");
}
/* Process Module refs */
@@ -267,7 +267,6 @@
return AXIS2_FAILURE;
}
}
- /* TODO processing Axis Storages */
param = axutil_param_container_get_param(
axis2_conf_get_param_container(conf_builder->conf, env),
@@ -402,8 +401,6 @@
dll_name =
axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
- /* TODO
- * set full dll path here instead of dll lib name only */
axutil_dll_desc_set_name(dll_desc, env, dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
impl_info_param = axutil_param_create(env, class_name, NULL);
@@ -423,8 +420,7 @@
handler_desc = axis2_handler_get_handler_desc(handler, env);
axis2_handler_desc_add_param(handler_desc, env, impl_info_param);
- /*disptachClas.getHandlerDesc().setParent(axisConfiguration); */
- axis2_phase_add_handler_at(disp_phase, env, count, handler);
+ axis2_phase_add_handler_at(disp_phase, env, count, handler);
count ++;
qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
env);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/dep_engine.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/dep_engine.c Thu May 24 23:09:08 2007
@@ -612,15 +612,7 @@
{
return NULL;
}
- /*
- * TODO
- if (hot_deployment)
- {
- start_search();
- }
- else
- {
- */
+
if (dep_engine->repos_listener)
{
axis2_repos_listener_free(dep_engine->repos_listener, env);
@@ -852,7 +844,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
in_phases = axis2_phases_info_get_in_phases(dep_engine->phases_info, env);
- /* TODO condition checking should be otherway since null value can occur */
if (in_phases)
{
phase0 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 0);
@@ -1049,7 +1040,7 @@
temp_path = axutil_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
dll_path = axutil_stracat(env, temp_path, dll_name);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "axis2_dep_engine_load_module_dll; dll path is : %s", dll_path);
+ "axis2_dep_engine_load_module_dll: DLL path is : %s", dll_path);
status = axutil_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
@@ -1127,7 +1118,6 @@
dll_name =
axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
- /* TODO set fill dll path here instead of dll lib name only */
axutil_dll_desc_set_name(dll_desc, env, dll_name);
axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axutil_class_loader_init(env);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/desc_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/desc_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/desc_builder.c Thu May 24 23:09:08 2007
@@ -689,15 +689,6 @@
axiom_children_qname_iterator_next(params, env);
param_element = axiom_node_get_data_element(param_node, env);
param = axutil_param_create(env, NULL, NULL);
- /* TODO Setting param_element. Do not set element like following.
- * break it and set
- */
- /*status = AXIS2_PARAM_SET_ELEMENT(param, env, param_node);
- if(AXIS2_SUCCESS != status)
- {
- axutil_param_free(param, env);
- return status;
- }*/
/* Setting paramter name */
att_qname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/module_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/module_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/module_builder.c Thu May 24 23:09:08 2007
@@ -403,9 +403,6 @@
}
else
{
- /* TODO
- * We don't have a operation constructor taking mepURL as argument.
- * do we need this? */
op_desc = axis2_op_create_from_module(env);
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/repos_listener.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/repos_listener.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/repos_listener.c Thu May 24 23:09:08 2007
@@ -195,7 +195,6 @@
* there are no services to load
*/
axis2_repos_listener_check_svcs(repos_listener, env);
- /* TODO uncomment this when hot update done */
return axis2_repos_listener_update(repos_listener, env);
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c Thu May 24 23:09:08 2007
@@ -219,11 +219,6 @@
}
/* process service description */
- /* TODO this code is changed in new version of axis2. Until that logic
- * is incorporated I comment out this part and add my own logic to set svc
- * name
- */
- /* -------------------------service description-------------------- */
qdesc = axutil_qname_create(env, AXIS2_DESCRIPTION, NULL, NULL);
desc_element = axiom_element_get_first_child_with_qname(svc_element, env,
qdesc, svc_node, &desc_node);
@@ -261,9 +256,6 @@
axis2_svc_set_svc_wsdl_path(svc_builder->svc, env, wsdl_path);
}
-
- /* --------------------services description end -------------------- */
- /* my logic to get set service name */
qattname = axutil_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
name_attr = axiom_element_get_attribute(svc_element, env, qattname);
svc_name = axiom_attribute_get_value(name_attr, env);
@@ -297,7 +289,7 @@
svc_folder_path = axutil_file_get_path(svc_folder, env);
dll_path = axutil_strcat(env, svc_folder_path, AXIS2_PATH_SEP_STR,
svc_dll_name, NULL);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "DLL path is : %s", dll_path);
status = axutil_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
@@ -316,7 +308,6 @@
axutil_dll_desc_free(dll_desc, env);
return status;
}
- /* end of my logic */
/* processing service wide modules which required to engage globally */
qmodulest = axutil_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_refs = axiom_element_get_children_with_qname(svc_element, env,
@@ -492,6 +483,10 @@
op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
axutil_qname_free(qmep, env);
qmep = NULL;
+ op_name = axiom_attribute_get_value(op_name_att, env);
+ qopname = axutil_qname_create(env, op_name, NULL, NULL);
+ op_desc = axis2_op_create(env);
+
if (op_mep_att)
{
mep_url = axiom_attribute_get_value(op_mep_att, env);
@@ -501,6 +496,8 @@
}
}
+ axis2_op_set_qname(op_desc, env, qopname);
+
desc = axis2_op_get_base(op_desc, env);
policy_include = axis2_desc_get_policy_include(desc, env);
@@ -673,8 +670,11 @@
if (itr)
{
- axis2_process_policy_elements(env, AXIS2_SERVICE_POLICY, itr,
+ /*axis2_process_policy_elements(env, AXIS2_SERVICE_POLICY, itr,
+ policy_include);*/
+ axis2_process_policy_elements(env, AXIS2_MESSAGE_POLICY, itr,
policy_include);
+
}
/* processing <wsp:PolicyReference> .. </..> elements */
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/ws_info_list.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/ws_info_list.c Thu May 24 23:09:08 2007
@@ -393,14 +393,6 @@
{
return AXIS2_FAILURE;
}
- /* TODO uncomment when hot deployment supported */
- /*
- if(AXIS2_TRUE == axis2_dep_engine_is_hot_update(ws_info_list->deployer,
- env))
- {
- axis2_dep_engine_undeploy(ws_info_list->deployer, env);
- }
- */
return axis2_dep_engine_do_deploy(ws_info_list->deployer, env);
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/description/op.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/description/op.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/description/op.c Thu May 24 23:09:08 2007
@@ -984,11 +984,11 @@
{
return AXIS2_FAILURE;
}
- status = axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);
+ /*status = axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);
if (AXIS2_FAILURE == status)
{
return AXIS2_FAILURE;
- }
+ }*/
status = axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
if (AXIS2_FAILURE == status)
{
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/ctx_handler.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/ctx_handler.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/ctx_handler.c Thu May 24 23:09:08 2007
@@ -145,24 +145,46 @@
else if (op) /* 2. if no op_ctx, create new op_ctx */
{
axis2_conf_ctx_t *conf_ctx = NULL;
- axutil_allocator_switch_to_global_pool(env->allocator);
+ axis2_bool_t use_pools = AXIS2_FALSE;
+ axutil_param_t *param = axis2_msg_ctx_get_parameter(msg_ctx, env,
+ AXIS2_PERSIST_OP_CTX);
+
+ use_pools = (param && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
+ axutil_param_get_value(param, env)));
+ if (use_pools)
+ {
+ axutil_allocator_switch_to_global_pool(env->allocator);
+ }
op_ctx = axis2_op_ctx_create(env, op, NULL);
if (!op_ctx)
{
return AXIS2_FAILURE;
}
- axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
+ axis2_msg_ctx_set_op_ctx(msg_ctx, env, op_ctx);
axis2_op_register_op_ctx(op, env, msg_ctx, op_ctx);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if (conf_ctx)
{
+ if (!use_pools)
+ {
+ axutil_allocator_switch_to_global_pool(env->allocator);
+ }
+
svc_grp_ctx = axis2_conf_ctx_fill_ctxs(conf_ctx, env, msg_ctx);
- }
- axutil_allocator_switch_to_local_pool(env->allocator);
+ if (!use_pools)
+ {
+ axutil_allocator_switch_to_local_pool(env->allocator);
+ }
+ }
+
+ if (use_pools)
+ {
+ axutil_allocator_switch_to_local_pool(env->allocator);
+ }
}
if (!svc_grp_ctx && (axis2_msg_ctx_get_server_side(msg_ctx, env)))
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/engine.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/engine.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/engine.c Thu May 24 23:09:08 2007
@@ -532,16 +532,7 @@
axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP12);
}
- if (envelope)
- {
- /*axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env); */
- /* if (body) */
- /*{ */
- /* axiom_soap_fault_t *fault = AXIOM_SOAP_BODY_GET_FAULT(body, env); */
- /* TODO: fault processing method */
- /*} */
- }
- else
+ if (!envelope)
{
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org