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 ma...@apache.org on 2008/06/11 07:08:42 UTC
svn commit: r666526 [1/3] - in
/webservices/axis2/branches/c/post_1_4_mtom/c: ./ axiom/ axiom/include/
axiom/src/om/ axiom/src/parser/ axiom/src/parser/libxml2/ axiom/src/soap/
axiom/test/om/ axiom/test/soap/ build/win32/ guththila/include/
guththila/s...
Author: manjula
Date: Tue Jun 10 22:08:36 2008
New Revision: 666526
URL: http://svn.apache.org/viewvc?rev=666526&view=rev
Log:
Merging the changes in the trunk to the branch.
Added:
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/
- copied from r666517, webservices/axis2/trunk/c/samples/client/amqp/
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/
- copied from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/echo_blocking.c
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/echo_blocking.c
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/echo_non_blocking.c
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/echo_non_blocking.c
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/echo_util.c
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/echo_util.c
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/amqp/echo/echo_util.h
- copied unchanged from r666517, webservices/axis2/trunk/c/samples/client/amqp/echo/echo_util.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/axis2_amqp_receiver.c
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/axis2_amqp_receiver.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/axis2_amqp_receiver.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/axis2_amqp_receiver.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver.cpp
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver.cpp
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_interface.cpp
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_interface.cpp
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_interface.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_interface.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/axis2_amqp_sender.c
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/axis2_amqp_sender.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/axis2_amqp_sender.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/axis2_amqp_sender.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.cpp
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.cpp
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/axis2_amqp_server/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/axis2_amqp_server/axis2_amqp_server.c
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/axis2_amqp_server.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/server/axis2_amqp_server/axis2_amqp_server.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/axis2_amqp_server.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/util/
- copied from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/util/
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/util/Makefile.am
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/util/axis2_amqp_defines.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_defines.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/util/axis2_amqp_util.c
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/amqp/util/axis2_amqp_util.h
- copied unchanged from r666517, webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.h
Removed:
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/axis2_isapi_plugin.h
Modified:
webservices/axis2/branches/c/post_1_4_mtom/c/ (props changed)
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_soap_const.h
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_xml_reader.h
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_stax_builder.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_text.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_reason.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/om/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/soap/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/bindist.bat
webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/build.bat
webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/configure.in
webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/makefile
webservices/axis2/branches/c/post_1_4_mtom/c/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_attribute.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_buffer.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_namespace.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_reader.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_stack.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_token.h
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_attribute.c
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_namespace.c
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_stack.c
webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_token.c
webservices/axis2/branches/c/post_1_4_mtom/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_callback_recv.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_core_utils.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_http_out_transport_info.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_op_ctx.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_phase_resolver.h
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_svc_client.h
webservices/axis2/branches/c/post_1_4_mtom/c/neethi/include/rp_defines.h
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/echo/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/google/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/math/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/mtom/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/notify/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/client/yahoo/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/codegen/client/calc_xml_inout/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/codegen/client/calculator/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/codegen/client/interop_doc1/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/codegen/client/interop_doc2/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/samples/server/notify/notify.c
webservices/axis2/branches/c/post_1_4_mtom/c/samples/server/notify/notify_skeleton.c
webservices/axis2/branches/c/post_1_4_mtom/c/samples/user_guide/clients/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/samples/user_guide/clients/echo_non_blocking.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/clientapi/callback_recv.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/clientapi/listener_manager.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/clientapi/op_client.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/clientapi/svc_client.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/deployment/conf_builder.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/deployment/desc_builder.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/description/op.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/engine/rest_disp.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/phaseresolver/phase_resolver.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/common/http_header.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/common/http_simple_request.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/sender/http_sender.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/sender/http_transport_sender.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/README
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/axis2_iis_worker.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/axis2_isapi_plugin.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/IIS/mod_axis2.def
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/util/core_utils.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/modules/mod_addr/addr_out_handler.c
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/addr/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/clientapi/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/context/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/deployment/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/description/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/engine/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/core/transport/http/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/itest/whitemesa/round1/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/test/itest/whitemesa/round2/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/tools/md5/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/tools/tcpmon/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/tools/tcpmon/src/tcpmon.c
webservices/axis2/branches/c/post_1_4_mtom/c/util/include/axutil_property.h
webservices/axis2/branches/c/post_1_4_mtom/c/util/src/hash.c
webservices/axis2/branches/c/post_1_4_mtom/c/util/src/platforms/windows/axutil_windows.c
webservices/axis2/branches/c/post_1_4_mtom/c/util/src/url.c
Propchange: webservices/axis2/branches/c/post_1_4_mtom/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 10 22:08:36 2008
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-659112
+/webservices/axis2/trunk/c:1-666519
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/configure.ac?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/configure.ac (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/configure.ac Tue Jun 10 22:08:36 2008
@@ -133,7 +133,7 @@
)
PKG_PROG_PKG_CONFIG(0.15)
-CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
+CFLAGS="$CFLAGS $GUTHTHILA_CFLAGS"
VERSION_NO="4:0:4"
AC_SUBST(VERSION_NO)
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_soap_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_soap_const.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_soap_const.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_soap_const.h Tue Jun 10 22:08:36 2008
@@ -81,7 +81,7 @@
#define AXIOM_SOAP12_SOAP_FAULT_VALUE_VERSION_MISMATCH "VersionMismatch"
-#define AXIOM_SOAP12_SOAP_FAULT_VALUE_MUST_UNDERSTAND "MustUnderstant"
+#define AXIOM_SOAP12_SOAP_FAULT_VALUE_MUST_UNDERSTAND "MustUnderstand"
#define AXIOM_SOAP12_SOAP_FAULT_VALUE_DATA_ENCODING_UKNOWN "DataEncodingUnknown"
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_xml_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_xml_reader.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_xml_reader.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_xml_reader.h Tue Jun 10 22:08:36 2008
@@ -413,14 +413,16 @@
int type);
/**
- * init function initializes the parser
+ * init function initializes the parser. When using libxml2 parser, this function
+ * is needed to initialize libxml2.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_xml_reader_init(
);
/**
- * parser cleanup function
+ * parser cleanup function. This function is used to clean up the globals of libxml2
+ * parser.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_xml_reader_cleanup(
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_stax_builder.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_stax_builder.c Tue Jun 10 22:08:36 2008
@@ -474,12 +474,14 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
+
+ #ifdef AXIS2_LIBXML2_ENABLED
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
+ #else
+ AXIS2_FREE(env->allocator,temp_prefix);
+ #endif
}
-#ifdef AXIS2_LIBXML2_ENABLED
- axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
-#else
- AXIS2_FREE(env->allocator,temp_prefix);
-#endif
+
return status;
}
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_text.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_text.c Tue Jun 10 22:08:36 2008
@@ -92,8 +92,6 @@
om_text->data_handler = NULL;
om_text->mime_type = NULL;
- om_text->ns = NULL;
-
if (value)
{
om_text->value = axutil_string_create(env, value);
@@ -434,6 +432,8 @@
if (om_text->ns)
{
axiom_namespace_serialize(om_text->ns, env, om_output);
+ axiom_namespace_free(om_text->ns, env);
+ om_text->ns = NULL;
}
return AXIS2_SUCCESS;
@@ -604,8 +604,6 @@
om_text->data_handler = NULL;
om_text->mime_type = NULL;
- om_text->ns = NULL;
-
if (value)
{
om_text->value = axutil_string_clone(value, env);
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/Makefile.am?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/Makefile.am (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/Makefile.am Tue Jun 10 22:08:36 2008
@@ -1,4 +1,3 @@
-#SUBDIRS = $(LIBXML2_DIR) $(GUTHTHILA_DIR)
SUBDIRS = $(WRAPPER_DIR)
-EXTRA_DIST=libxml2
+DIST_SUBDIRS=guththila libxml2
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/Makefile.am?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/Makefile.am Tue Jun 10 22:08:36 2008
@@ -1,13 +1,10 @@
-lib_LTLIBRARIES = libaxis2_libxml2.la libaxis2_parser.la
-libaxis2_libxml2_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
- libxml2_writer_wrapper.c
+lib_LTLIBRARIES = libaxis2_parser.la
-libaxis2_libxml2_la_LIBADD = -lxml2
-libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
- libxml2_writer_wrapper.c
+libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c \
+ libxml2_reader_wrapper.c libxml2_writer_wrapper.c
-libaxis2_parser_la_LIBADD = -lxml2
+libaxis2_parser_la_LIBADD = @LIBXML2_LIBS@
libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
libaxis2_libxml2_la_LDFLAGS = -version-info $(VERSION_NO)
@@ -15,5 +12,5 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
- -I ../../../../util/include
-
+ -I ../../../../util/include \
+ @LIBXML2_CFLAGS@
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Tue Jun 10 22:08:36 2008
@@ -460,7 +460,7 @@
if (ret_val == -1)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- " error occured in reading xml stream ");
+ " error occurred in reading xml stream ");
return -1;
}
@@ -489,6 +489,15 @@
}
}
+
+/**
+* If your application crashes here, it may be due to an earlier call to
+* xmlCleanupParser() function. In client API, op_client create function has a call
+* to axiom_xml_reader_init and op_client_free function has a call to axiom_xml_reader_cleanup
+* function. You can avoid the call to axiom_xml_reader_cleanup using
+* axis2_options_set_xml_parser_reset function in client API.
+* refer to jira issue: https://issues.apache.org/jira/browse/AXIS2C-884
+*/
void AXIS2_CALL
axis2_libxml2_reader_wrapper_free(
axiom_xml_reader_t * parser,
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault.c Tue Jun 10 22:08:36 2008
@@ -75,6 +75,7 @@
soap_fault->frole = NULL;
soap_fault->om_ele_node = NULL;
soap_fault->soap_builder = NULL;
+ soap_fault->soap_version = -1;
return soap_fault;
}
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_reason.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_reason.c Tue Jun 10 22:08:36 2008
@@ -58,8 +58,8 @@
fault_reason->om_ele_node = NULL;
fault_reason->fault_texts = NULL;
-
- return fault_reason;
+ fault_reason->soap_version = -1;
+ return fault_reason;
}
AXIS2_EXTERN axiom_soap_fault_reason_t *AXIS2_CALL
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_text.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/soap/soap_fault_text.c Tue Jun 10 22:08:36 2008
@@ -74,8 +74,8 @@
axiom_soap_fault_reason_t * parent)
{
axiom_soap_fault_text_t *fault_text = NULL;
- int soap_version = -1;
axiom_element_t *this_ele = NULL;
+ int soap_version = -1;
axiom_node_t *this_node = NULL;
axiom_namespace_t *parent_ns = NULL;
axiom_node_t *parent_node = NULL;
@@ -104,8 +104,9 @@
axiom_soap_fault_text_free(fault_text, env);
return NULL;
}
- soap_version = axiom_soap_fault_reason_get_soap_version(parent, env);
- if (soap_version == AXIOM_SOAP12)
+
+ soap_version = axiom_soap_fault_reason_get_soap_version(parent, env);
+ if (AXIOM_SOAP12 == soap_version)
{
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
}
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/om/Makefile.am?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/om/Makefile.am (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/om/Makefile.am Tue Jun 10 22:08:36 2008
@@ -7,10 +7,8 @@
test_om_LDADD = ../../../util/src/libaxutil.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
- $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
-
+ $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I ../../../util/include
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/soap/Makefile.am?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/soap/Makefile.am (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/test/soap/Makefile.am Tue Jun 10 22:08:36 2008
@@ -7,10 +7,8 @@
test_soap_LDADD = ../../../util/src/libaxutil.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
- $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
-
+ $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I ../../../util/include
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/bindist.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/bindist.bat?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/bindist.bat (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/bindist.bat Tue Jun 10 22:08:36 2008
@@ -1,3 +1,13 @@
-@call vcvars32.bat
-@nmake /nologo dist
+@if "%VV32CALLED%"=="" goto call_vv32
+:call_nmake
+@nmake /NOLOGO dist
+@goto end
+
+:call_vv32
+@call vcvars32.bat > vc.tmp
+@del vc.tmp
+@set VV32CALLED="YES"
+@goto call_nmake
+
+:end
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/build.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/build.bat?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/build.bat (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/build.bat Tue Jun 10 22:08:36 2008
@@ -1,3 +1,13 @@
+@if "%VV32CALLED%"=="" goto call_vv32
+
+:call_nmake
+@nmake /NOLOGO install
+@goto end
+
+:call_vv32
@call vcvars32.bat > vc.tmp
@del vc.tmp
-@nmake /NOLOGO install
+@set VV32CALLED="YES"
+@goto call_nmake
+
+:end
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/configure.in?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/configure.in (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/configure.in Tue Jun 10 22:08:36 2008
@@ -8,14 +8,14 @@
# build libcurl transport
ENABLE_LIBCURL = 0
#
-# build axis2 with guththila parser
-ENABLE_GUTHTHILA = 1
+# build axis2 with Libxml2 Parser. Axis2/C will be built with embeded guththila # parser by Default.
+ENABLE_LIBXML2=0
#
# build tcp server in addition to http server
WITH_TCP = 0
#
# build with archive based deployment
-WITH_ARCHIVE = 1
+WITH_ARCHIVE = 0
#
#
#############################################################################
@@ -23,7 +23,7 @@
#############################################################################
#
# libxml2 binary location ( axis2c is built with libxml2 )
-LIBXML2_BIN_DIR = E:\libxml2-2.6.27.win32
+LIBXML2_BIN_DIR = E:\libxml2-2.6.30.win32
#
# iconv binary location
ICONV_BIN_DIR = E:\iconv-1.9.2.win32
@@ -64,9 +64,9 @@
CRUNTIME = /MD
#
# Embed Manifest Files
-EMBED_MANIFEST = 0
+EMBED_MANIFEST = 1
#
# debug symbols
# To build with debug symbols use DEBUG = 1
-DEBUG = 1
+DEBUG = 0
#
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/makefile?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/makefile (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/build/win32/makefile Tue Jun 10 22:08:36 2008
@@ -1,40 +1,44 @@
-# THIS IS THE MAKE FILE FOR AXIS2/C
-# This file should reside in the win32 directory of the source directory
-# when executed.
-# nmake [all] - builds dlls, server and samples [ client, server ]
-# nmake clean - cleans everything
-# nmake samples - builds samples
-# nmake install - installs axis2 with server all modules and services
-# nmake dist - creates the distribution, builds all distributable components
-
-# It is possible to run individual targets to build those targets only.
-# eg: nmake axis2_apache_module, will build apache module
-
-
-# The default install directory is ..\deploy with a directory structure as
-# follows.
+#######################################################################################
+## This is the make file for Axis2/C
+#
+# This file should reside in the win32 directory of the source directory when executed.
+# nmake [all] - builds dlls, server and samples [ client, server ]
+# nmake clean - cleans everything
+# nmake samples - builds samples
+# nmake install - installs axis2 with server all modules and services
+# nmake dist - creates the distribution, builds all distributable components
+#
+#
+# It is possible to run individual targets to build those targets only.
+# eg: nmake axis2_apache_module, will build httpd module of Axis2/C
+#
+# The default install directory is ..\deploy with a directory structure as follows.
+#
+# AXIS2_BINDIR
+# |
+# |- bin - server and other executables
+# |- samples - samples
+# |- logs - log file location
+# |- lib - library modules
+# |- services - deployed services
+# |- modules - deployed modules
+# |- include - Axis2/C header files
+# |- tests
+# |- system_tests
+# |- unit tests
#
-# AXIS2_BINDIR
-# |
-# |- bin - server and other executables
-# |- samples - samples
-# |- logs - log file location
-# |- lib - library modules
-# |- services - deployed services will be hear
-# |- modules - deployed modules will be hear
-# |- include - all include files of axis2 will go here
-# |- tests
-# |- system_tests
-# |- unit tests
+#########################################################################################
+
AUTOCONF = configure.in
!include $(AUTOCONF)
-# directory structure of install directory
RELEASE_VER = 1.4.0
-
AXIS2_RELEASE_DIR=axis2c-bin-$(RELEASE_VER)-win32
+# Directory structure
+##################################
+
AXIS2_BINDIR = ..\deploy
AXIS2_SERVICES = $(AXIS2_BINDIR)\services
AXIS2_MODULES = $(AXIS2_BINDIR)\modules
@@ -50,12 +54,14 @@
AXIS2_SOURCE_DIR = ..\..
#directories for intermediate files
+###################################
AXIS2_INTDIR= .\int.msvc
AXIS2_INTDIR_SAMPLES = $(AXIS2_INTDIR)\samples
-#binary distribution dll names
-#core modules
+
+# Binary distribution librarys
+##############################
AXUTIL = axutil
AXIS2_PARSER = axis2_parser
@@ -74,19 +80,11 @@
GUTHTHILA = guththila
AXIS2_MOD_LOG = axis2_mod_log
-PARSER = build
-AXIS2_WITHOUT_SERVER = axis2_core_without_server
-
-!if "$(ENABLE_GUTHTHILA)" == "1"
-PARSER = $(PARSER)_with_guththila
-AXIS2_WITHOUT_SERVER = $(AXIS2_WITHOUT_SERVER)_guththila
-CFLAGS = $(CFLAGS) /D "AXIS2_GUTHTHILA_ENABLED"
-!else
-CFLAGS = $(CFLAGS) /D "AXIS2_LIBXML2_ENABLED"
-!endif
-
# include path
+################
+
APACHE_INCLUDE_PATH = /I$(APACHE_BIN_DIR)\include
+
AXIS2_INCLUDE_PATH = /I$(AXIS2_SOURCE_DIR)\util\include \
/I$(AXIS2_SOURCE_DIR)\util\src\ \
/I$(AXIS2_SOURCE_DIR)\util\src\minizip\ \
@@ -109,24 +107,29 @@
/I$(AXIS2_SOURCE_DIR)\src\core\util \
/I$(AXIS2_SOURCE_DIR)\src\core\transport\http\server\apache2 \
/I$(AXIS2_SOURCE_DIR)\axiom\src\attachments \
- /I$(AXIS2_SOURCE_DIR)\tools\tcpmon\include \
- /I$(LIBXML2_BIN_DIR)\include \
- /I$(ICONV_BIN_DIR)\include
+ /I$(AXIS2_SOURCE_DIR)\tools\tcpmon\include
+GUTHTHILA_INCLUDE_PATH = /I$(AXIS2_SOURCE_DIR)\guththila\include
+
+LIBXML2_INCLUDE_PATH = /I$(LIBXML2_BIN_DIR)\include /I$(ICONV_BIN_DIR)\include
+
+# optional include paths
+########################
+
!if "$(WITH_ARCHIVE)" == "1"
AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(ZLIB_BIN_DIR)\include
!endif
-
-GUTHTHILA_INCLUDE_PATH = /I$(AXIS2_SOURCE_DIR)\guththila\include
!if "$(ENABLE_SSL)" == "1"
AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include
!endif
+
!if "$(ENABLE_LIBCURL)" == "1"
AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(LIBCURL_BIN_DIR)\include
!endif
-##################### compiler options
+# Compiler Options
+###################
CC = @cl.exe
CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
@@ -142,19 +145,19 @@
CFLAGS = $(CFLAGS) /D "AXIS2_LIBCURL_ENABLED"
!endif
-!if "$(ENABLE_GUTHTHILA)" == "1"
-CFLAGS = $(CFLAGS) /D "AXIS2_GUTHTHILA_ENABLED"
+!if "$(ENABLE_LIBXML2)" == "1"
+CFLAGS = $(CFLAGS) /D "AXIS2_LIBXML2_ENABLED" $(LIBXML2_INCLUDE_PATH)
!else
-CFLAGS = $(CFLAGS) /D "AXIS2_LIBXML2_ENABLED"
+CFLAGS = $(CFLAGS) /D "AXIS2_GUTHTHILA_ENABLED" $(GUTHTHILA_INCLUDE_PATH)
!endif
-################### linker options
+# Linker Options
+####################
LD = @link.exe
-LDFLAGS = /NOLOGO /WX /LIBPATH:$(AXIS2_LIBS) \
- /LIBPATH:$(LIBXML2_BIN_DIR)\lib \
- /LIBPATH:$(APACHE_BIN_DIR)\lib /LIBPATH:$(ZLIB_BIN_DIR)\lib
-
+LDFLAGS = /NOLOGO /WX /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(LIBXML2_BIN_DIR)\lib \
+ /LIBPATH:$(APACHE_BIN_DIR)\lib /LIBPATH:$(ZLIB_BIN_DIR)\lib
+
LIBS = Rpcrt4.lib Ws2_32.lib
!if "$(ENABLE_SSL)" == "1"
@@ -173,6 +176,7 @@
APACHE_LIBS = apr-1.lib xml.lib libhttpd.lib libapr-1.lib libaprutil-1.lib
!endif
+# Manifest Options
####################
MT=mt.exe
MT="$(MT)"
@@ -185,7 +189,9 @@
_VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;2
!endif
-#################### debug symbols
+# Debug Symbols
+#####################
+
!if "$(DEBUG)" == "1"
CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 $(CRUNTIME)d
LDFLAGS = $(LDFLAGS) /DEBUG
@@ -194,8 +200,8 @@
LDFLAGS = $(LDFLAGS)
!endif
-
-################################################################
+# Build Targets
+#################
# create the directory structure
deploy:
@@ -216,7 +222,9 @@
if exist $(AXIS2_BINDIR) rmdir /S /Q $(AXIS2_BINDIR)
if exist $(AXIS2_INTDIR) rmdir /S /Q $(AXIS2_INTDIR)
-##### axutil
+
+# axutil
+###################
AXUTIL_SRC = $(AXIS2_SOURCE_DIR)\util\src
AXIS2_INTDIR_AXUTIL = $(AXIS2_INTDIR)\util
@@ -226,7 +234,6 @@
AXUTIL_OBJS = $(AXIS2_INTDIR_AXUTIL)\*.obj \
$(AXIS2_INTDIR_AXUTIL)\platform\*.obj
-
!if "$(WITH_ARCHIVE)" == "1"
AXUTIL_OBJS = $(AXUTIL_OBJS) $(AXIS2_INTDIR_AXUTIL)\minizip\*.obj
!endif
@@ -271,9 +278,14 @@
!endif
axis2_util : $(AXIS2_LIBS)\$(AXUTIL).dll
-##### end axutil
-##### guththila
+#end axutil
+
+
+
+# guththila
+##################
+
GUTHTHILA_SRC = $(AXIS2_SOURCE_DIR)\guththila\src
AXIS2_INTDIR_GUTHTHILA = $(AXIS2_INTDIR)\guththila
@@ -282,7 +294,6 @@
$(AXIS2_INTDIR_GUTHTHILA) :
@if not exist $(AXIS2_INTDIR_GUTHTHILA) mkdir $(AXIS2_INTDIR_GUTHTHILA)
-
{$(GUTHTHILA_SRC)}.c{$(AXIS2_INTDIR_GUTHTHILA)}.obj ::
$(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) /Fo$(AXIS2_INTDIR_GUTHTHILA)\ /c $<
@@ -295,9 +306,11 @@
guththila: $(AXIS2_LIBS)\$(GUTHTHILA).dll
-##### end guththila
+# end guththila
+
-##### axis2 parser
+# axis2 parser
+###################
AXIS2_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser
AXIS2_INTDIR_PARSER = $(AXIS2_INTDIR)\parser
@@ -305,64 +318,56 @@
$(AXIS2_INTDIR_PARSER) :
@if not exist $(AXIS2_INTDIR_PARSER) mkdir $(AXIS2_INTDIR_PARSER)
-##### end axis2 parser
-##### libxml2 wrapper
+!if "$(ENABLE_LIBXML2)" == "1"
AXIS2_INTDIR_PARSER1 = $(AXIS2_INTDIR)\parser\libxml2
-
AXIS2_PARSER_OBJS = $(AXIS2_INTDIR_PARSER)\*.obj \
$(AXIS2_INTDIR_PARSER)\libxml2\*.obj
+PARSER_LIB= $(LIBXML2_BIN_DIR)\lib\libxml2.lib
+!else
+
+AXIS2_INTDIR_PARSER1 = $(AXIS2_INTDIR)\parser\guththila
+AXIS2_PARSER_OBJS = $(AXIS2_INTDIR_PARSER)\*.obj \
+ $(AXIS2_INTDIR_PARSER)\guththila\*.obj
+
+PARSER_LIB = $(AXIS2_LIBS)\$(GUTHTHILA).lib
+!endif
+
$(AXIS2_INTDIR_PARSER1) :
@if not exist $(AXIS2_INTDIR_PARSER1) mkdir $(AXIS2_INTDIR_PARSER1)
-
{$(AXIS2_PARSER_SRC)}.c{$(AXIS2_INTDIR_PARSER)}.obj ::
$(CC) $(CFLAGS) /Fo$(AXIS2_INTDIR_PARSER)\ /c $<
+
+!if "$(ENABLE_LIBXML2)"=="1"
{$(AXIS2_PARSER_SRC)\libxml2}.c{$(AXIS2_INTDIR_PARSER1)}.obj ::
$(CC) $(CFLAGS) /Fo$(AXIS2_INTDIR_PARSER1)\ /c $<
+!else
+{$(AXIS2_PARSER_SRC)\guththila}.c{$(AXIS2_INTDIR_PARSER1)}.obj ::
+ $(CC) $(CFLAGS) /Fo$(AXIS2_INTDIR_PARSER1)\ /c $<
+!endif
$(AXIS2_PARSER_OBJS) : $(AXIS2_INTDIR_PARSER) $(AXIS2_INTDIR_PARSER1)
-
$(AXIS2_LIBS)\$(AXIS2_PARSER).dll : $(AXIS2_PARSER_OBJS)
- $(LD) $(LDFLAGS) $(AXIS2_PARSER_OBJS) $(AXUTIL).lib $(LIBS) \
- $(LIBXML2_BIN_DIR)\lib\libxml2.lib /DLL \
+ $(LD) $(LDFLAGS) $(AXIS2_PARSER_OBJS) $(AXUTIL).lib $(LIBS) $(PARSER_LIB) /DLL \
/OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
-@$(_VC_MANIFEST_EMBED_DLL)
axis2_parser : $(AXIS2_LIBS)\$(AXIS2_PARSER).dll
-##### end libxml2 wrapper
-
-##### guththila wrapper
-
-GHTHTHILA_WRAPPER_SRC = $(AXIS2_PARSER_SRC)
-GUTHTHILA_WRAPPER_INTDIR = $(AXIS2_INTDIR_PARSER)
-GUTHTHILA_WRAPPER_INTDIR1 = $(AXIS2_INTDIR)\parser\guththila
-
-GUTHTHILA_WRAPPER_OBJS = $(GUTHTHILA_WRAPPER_INTDIR)\*.obj \
- $(GUTHTHILA_WRAPPER_INTDIR1)\*.obj
-
-$(GUTHTHILA_WRAPPER_INTDIR1) :
- @if not exist $(GUTHTHILA_WRAPPER_INTDIR1) mkdir $(GUTHTHILA_WRAPPER_INTDIR1)
+# decide build order
-{$(GHTHTHILA_WRAPPER_SRC)}.c{$(GUTHTHILA_WRAPPER_INTDIR)}.obj ::
- $(CC) $(CFLAGS) /Fo$(GUTHTHILA_WRAPPER_INTDIR)\ /c $<
-
-{$(GHTHTHILA_WRAPPER_SRC)\guththila}.c{$(GUTHTHILA_WRAPPER_INTDIR1)}.obj ::
- $(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) /Fo$(GUTHTHILA_WRAPPER_INTDIR1)\ /c $<
-
-$(GUTHTHILA_WRAPPER_OBJS) : $(GUTHTHILA_WRAPPER_INTDIR) $(GUTHTHILA_WRAPPER_INTDIR1)
-
-axis2_parser_with_guththila: $(GUTHTHILA_WRAPPER_OBJS)
- $(LD) $(LDFLAGS) $(GUTHTHILA_WRAPPER_OBJS) $(AXUTIL).lib $(LIBS) $(AXIS2_LIBS)\$(GUTHTHILA).lib /DLL \
- /OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
- -@$(_VC_MANIFEST_EMBED_DLL)
+!if "$(ENABLE_LIBXML2)"=="1"
+axis2_basic_modules: axis2_util axis2_parser
+!else
+axis2_basic_modules: axis2_util guththila axis2_parser
+!endif
-##### end guththila wrapper
+#end parser
##### axiom
@@ -620,11 +625,10 @@
axis2_http_sender : $(AXIS2_LIBS)\$(AXIS2_HTTP_SENDER).dll
+# axis2 http sender
-##### axis2 http sender
-
-##### axis2_tcp_sender
-
+# axis2_tcp_sender
+##########################
TCP_SENDER_SRC = $(AXIS2_SOURCE_DIR)\src\core\transport\tcp\sender
TCP_SENDER_INTDIR = $(AXIS2_INTDIR)\tcp_sender
@@ -648,11 +652,12 @@
axis2_tcp_sender : $(AXIS2_LIBS)\$(AXIS2_TCP_SENDER).dll
+# end axis2_tcp_sender
-##### end axis2_tcp_sender
+# axis2 http receiver
+##############################
-##### axis2 http receiver
HTTP_RECEIVER_SRC = $(AXIS2_SOURCE_DIR)\src\core\transport\http\receiver
HTTP_RECEIVER_INTDIR = $(AXIS2_INTDIR)\http_receiver
@@ -675,9 +680,10 @@
axis2_http_receiver : $(AXIS2_LIBS)\$(AXIS2_HTTP_RECEIVER).dll
-##### end axis2 http receiver
+# end axis2 http receiver
-##### axis2_tcp_receiver
+# axis2_tcp_receiver
+##########################
TCP_RECEIVER_SRC = $(AXIS2_SOURCE_DIR)\src\core\transport\tcp\receiver
TCP_RECEIVER_INTDIR = $(AXIS2_INTDIR)\tcp_receiver
@@ -782,8 +788,6 @@
##### end simple tcp server
-
-
########## server modules
#apache module
@@ -826,7 +830,7 @@
{$(MOD_IIS_SRC)\iis_iaspi_plugin_51}.c{$(MOD_IIS_INTDIR1)}.obj ::
- $(CC) $(CFLAGS) /Fo$(MOD_IIS_INTDIR1)\ /c $<
+ $(CC) $(CFLAGS) /D "WIN32" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /Fo$(MOD_IIS_INTDIR1)\ /c $<
{$(MOD_IIS_SRC)}.c{$(MOD_IIS_INTDIR)}.obj ::
$(CC) $(CFLAGS) /Fo$(MOD_IIS_INTDIR)\ /c $<
@@ -841,37 +845,29 @@
axis2_IIS_module : $(AXIS2_LIBS)\mod_axis2_IIS.dll
-############# end modules ###################
+# end modules
+# Core Build Targets
+################################
-axis2_core: axis2_util axis2_parser axiom neethi axis2_engine axis2_http_sender \
+axis2_core:axis2_basic_modules axiom neethi axis2_engine axis2_http_sender \
axis2_http_receiver axis2_mod_addr simple_axis2_http_server
-axis2_core_without_server_guththila: axis2_util guththila axis2_parser_with_guththila axiom neethi \
- axis2_engine axis2_http_sender axis2_http_receiver axis2_mod_addr
-
-axis2_core_without_server: axis2_util axis2_parser axiom neethi axis2_engine axis2_http_sender \
+axis2_core_without_server: axis2_basic_modules axiom neethi axis2_engine axis2_http_sender \
axis2_http_receiver axis2_mod_addr
-axis2_core_guththila: axis2_util guththila axis2_parser_with_guththila axiom neethi axis2_engine \
- axis2_http_sender axis2_http_receiver axis2_mod_addr simple_axis2_http_server
-
axis2_tcp : axis2_tcp_sender axis2_tcp_receiver simple_axis2_tcp_server
##### logging module
MOD_LOG_SRC = $(AXIS2_SOURCE_DIR)\src\modules\mod_log
MOD_LOG_INTDIR = $(AXIS2_INTDIR)\mod_log
-
MOD_LOG_OBJS = $(MOD_LOG_INTDIR)\*.obj
-
-
$(MOD_LOG_INTDIR) :
@if not exist $(AXIS2_MDOULES)\logging mkdir $(AXIS2_MODULES)\logging
@if not exist $(MOD_LOG_INTDIR) mkdir $(MOD_LOG_INTDIR)
-
{$(MOD_LOG_SRC)}.c{$(MOD_LOG_INTDIR)}.obj ::
$(CC) $(CFLAGS) /Fo$(MOD_LOG_INTDIR)\ /c $<
@@ -1221,171 +1217,37 @@
copy_samples:
@if not exist $(AXIS2_BINDIR)\samples mkdir $(AXIS2_BINDIR)\samples
-
- @if not exist $(AXIS2_BINDIR)\samples\client mkdir $(AXIS2_BINDIR)\samples\client
- @if not exist $(AXIS2_BINDIR)\samples\user_guide mkdir $(AXIS2_BINDIR)\samples\user_guide
-
- @if not exist $(AXIS2_BINDIR)\samples\client\echo mkdir $(AXIS2_BINDIR)\samples\client\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\client\echo\echo.c $(AXIS2_BINDIR)\samples\client\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\client\echo\README.txt $(AXIS2_BINDIR)\samples\client\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\client\echo\echo.mk $(AXIS2_BINDIR)\samples\client\echo
-
- @if not exist $(AXIS2_BINDIR)\samples\client\math mkdir $(AXIS2_BINDIR)\samples\client\math
- @copy $(AXIS2_SOURCE_DIR)\samples\client\math\*.c $(AXIS2_BINDIR)\samples\client\math
- @copy $(AXIS2_SOURCE_DIR)\samples\client\math\*.h $(AXIS2_BINDIR)\samples\client\math
- @copy $(AXIS2_SOURCE_DIR)\samples\client\math\math.mk $(AXIS2_BINDIR)\samples\client\math
-
-
- @if not exist $(AXIS2_BINDIR)\samples\client\google mkdir $(AXIS2_BINDIR)\samples\client\google
- @copy $(AXIS2_SOURCE_DIR)\samples\client\google\*.c $(AXIS2_BINDIR)\samples\client\google
- @copy $(AXIS2_SOURCE_DIR)\samples\client\google\README.txt $(AXIS2_BINDIR)\samples\client\google
- @copy $(AXIS2_SOURCE_DIR)\samples\client\google\google.mk $(AXIS2_BINDIR)\samples\client\google
-
- @if not exist $(AXIS2_BINDIR)\samples\client\notify mkdir $(AXIS2_BINDIR)\samples\client\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\client\notify\*.c $(AXIS2_BINDIR)\samples\client\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\client\notify\notify.mk $(AXIS2_BINDIR)\samples\client\notify
-
- @if not exist $(AXIS2_BINDIR)\samples\client\mtom\resources mkdir $(AXIS2_BINDIR)\samples\client\mtom\resources
- @copy $(AXIS2_SOURCE_DIR)\samples\client\mtom\*.c $(AXIS2_BINDIR)\samples\client\mtom
- @copy $(AXIS2_SOURCE_DIR)\samples\client\mtom\resources\*.jpg $(AXIS2_BINDIR)\samples\client\mtom\resources
- @copy $(AXIS2_SOURCE_DIR)\samples\client\mtom\mtom.mk $(AXIS2_BINDIR)\samples\client\mtom
-
- @if not exist $(AXIS2_BINDIR)\samples\client\yahoo mkdir $(AXIS2_BINDIR)\samples\client\yahoo
- @copy $(AXIS2_SOURCE_DIR)\samples\client\yahoo\*.c $(AXIS2_BINDIR)\samples\client\yahoo
- @copy $(AXIS2_SOURCE_DIR)\samples\client\yahoo\yahoo.mk $(AXIS2_BINDIR)\samples\client\yahoo
-
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\samples\client $(AXIS2_BINDIR)\samples\client
@xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\samples\user_guide $(AXIS2_BINDIR)\samples\user_guide
-
- @if not exist $(AXIS2_BINDIR)\samples\server mkdir $(AXIS2_BINDIR)\samples\server
-
- @if not exist $(AXIS2_BINDIR)\samples\server\Calculator mkdir $(AXIS2_BINDIR)\samples\server\Calculator
- @copy $(AXIS2_SOURCE_DIR)\samples\server\Calculator\*.c $(AXIS2_BINDIR)\samples\server\Calculator
- @copy $(AXIS2_SOURCE_DIR)\samples\server\Calculator\*.h $(AXIS2_BINDIR)\samples\server\Calculator
- @copy $(AXIS2_SOURCE_DIR)\samples\server\Calculator\*.xml $(AXIS2_BINDIR)\samples\server\Calculator
- @copy $(AXIS2_SOURCE_DIR)\samples\server\Calculator\Calculator.mk $(AXIS2_BINDIR)\samples\server\Calculator
-
- @if not exist $(AXIS2_BINDIR)\samples\server\echo mkdir $(AXIS2_BINDIR)\samples\server\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.c $(AXIS2_BINDIR)\samples\server\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.h $(AXIS2_BINDIR)\samples\server\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.xml $(AXIS2_BINDIR)\samples\server\echo
- @copy $(AXIS2_SOURCE_DIR)\samples\server\echo\echo.mk $(AXIS2_BINDIR)\samples\server\echo
-
- @if not exist $(AXIS2_BINDIR)\samples\server\math mkdir $(AXIS2_BINDIR)\samples\server\math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.c $(AXIS2_BINDIR)\samples\server\math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.h $(AXIS2_BINDIR)\samples\server\math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.xml $(AXIS2_BINDIR)\samples\server\math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\math\math.mk $(AXIS2_BINDIR)\samples\server\math
-
- @if not exist $(AXIS2_BINDIR)\samples\server\notify mkdir $(AXIS2_BINDIR)\samples\server\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.c $(AXIS2_BINDIR)\samples\server\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.h $(AXIS2_BINDIR)\samples\server\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.xml $(AXIS2_BINDIR)\samples\server\notify
- @copy $(AXIS2_SOURCE_DIR)\samples\server\notify\notify.mk $(AXIS2_BINDIR)\samples\server\notify
-
- @if not exist $(AXIS2_BINDIR)\samples\server\sg_math mkdir $(AXIS2_BINDIR)\samples\server\sg_math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\sg_math\*.c $(AXIS2_BINDIR)\samples\server\sg_math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\sg_math\*.h $(AXIS2_BINDIR)\samples\server\sg_math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\sg_math\*.xml $(AXIS2_BINDIR)\samples\server\sg_math
- @copy $(AXIS2_SOURCE_DIR)\samples\server\sg_math\sg_math.mk $(AXIS2_BINDIR)\samples\server\sg_math
-
- @if not exist $(AXIS2_BINDIR)\samples\server\mtom mkdir $(AXIS2_BINDIR)\samples\server\mtom
- @copy $(AXIS2_SOURCE_DIR)\samples\server\mtom\*.c $(AXIS2_BINDIR)\samples\server\mtom
- @copy $(AXIS2_SOURCE_DIR)\samples\server\mtom\*.h $(AXIS2_BINDIR)\samples\server\mtom
- @copy $(AXIS2_SOURCE_DIR)\samples\server\mtom\*.xml $(AXIS2_BINDIR)\samples\server\mtom
- @copy $(AXIS2_SOURCE_DIR)\samples\server\mtom\mtom.mk $(AXIS2_BINDIR)\samples\server\mtom
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\samples\codegen $(AXIS2_BINDIR)\samples\codegen
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\samples\server $(AXIS2_BINDIR)\samples\server
+ @cd $(AXIS2_BINDIR)\samples
+ @del /s /q *.am
+ @cd .\..\..\win32
copy_include:
- @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\include $(AXIS2_BINDIR)\include\
-
- @if exist $(AXIS2_BINDIR)\include\Makefile.am del $(AXIS2_BINDIR)\include\Makefile.am
-
- @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\axiom\include $(AXIS2_BINDIR)\include\
-
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\include $(AXIS2_BINDIR)\include
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\axiom\include $(AXIS2_BINDIR)\include
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\util\include $(AXIS2_BINDIR)\include
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\neethi\include $(AXIS2_BINDIR)\include
@if exist $(AXIS2_BINDIR)\include\Makefile.am del $(AXIS2_BINDIR)\include\Makefile.am
- @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\util\include $(AXIS2_BINDIR)\include\
-
- @if exist $(AXIS2_BINDIR)\include\Makefile.am del $(AXIS2_BINDIR)\include\Makefile.am
-
- @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\neethi\include $(AXIS2_BINDIR)\include\
-
copy_vc_projects:
@if not exist $(AXIS2_BINDIR)\ides mkdir $(AXIS2_BINDIR)\ides
- @if not exist $(AXIS2_BINDIR)\ides\vc mkdir $(AXIS2_BINDIR)\ides\vc
@if not exist $(AXIS2_BINDIR)\ides\vc\samples mkdir $(AXIS2_BINDIR)\ides\vc\samples
-
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo\echo.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\math mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\math
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\math\math.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\math
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\google mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\google
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\google\google.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\google
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\mtom mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\mtom
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\mtom\mtom.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\mtom
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\notify mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\notify
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\notify\notify.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\notify
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\yahoo mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\yahoo
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\yahoo\yahoo.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\yahoo
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_blocking\echo_blocking.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_addr mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_addr
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_blocking_addr\echo_blocking_addr.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_addr
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_dual mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_dual
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_blocking_dual\echo_blocking_dual.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_blocking_dual
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_non_blocking\echo_non_blocking.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking_dual mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking_dual
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_non_blocking_dual\echo_non_blocking_dual.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_non_blocking_dual
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_rest mkdir $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_rest
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\echo_rest\echo_rest.vcproj $(AXIS2_BINDIR)\ides\vc\samples\clients\echo_rest
-
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\clients\clients.sln $(AXIS2_BINDIR)\ides\vc\samples\clients
-
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services mkdir $(AXIS2_BINDIR)\ides\vc\samples\services
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services\echo mkdir $(AXIS2_BINDIR)\ides\vc\samples\services\echo
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\echo\echo.vcproj $(AXIS2_BINDIR)\ides\vc\samples\services\echo
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services\math mkdir $(AXIS2_BINDIR)\ides\vc\samples\services\math
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\math\math.vcproj $(AXIS2_BINDIR)\ides\vc\samples\services\math
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services\mtom mkdir $(AXIS2_BINDIR)\ides\vc\samples\services\mtom
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\mtom\mtom.vcproj $(AXIS2_BINDIR)\ides\vc\samples\services\mtom
-
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services\notify mkdir $(AXIS2_BINDIR)\ides\vc\samples\services\notify
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\notify\notify.vcproj $(AXIS2_BINDIR)\ides\vc\samples\services\notify
- @if not exist $(AXIS2_BINDIR)\ides\vc\samples\services\Calculator mkdir $(AXIS2_BINDIR)\ides\vc\samples\services\Calculator
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\Calculator\Calculator.vcproj $(AXIS2_BINDIR)\ides\vc\samples\services\Calculator
-
- @copy $(AXIS2_SOURCE_DIR)\ides\vc\samples\services\services.sln $(AXIS2_BINDIR)\ides\vc\samples\services
-
+ @xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\ides\vc\samples $(AXIS2_BINDIR)\ides\vc\samples
+
copy_wsdl2c:
- @if not exist $(AXIS2_BINDIR)\bin\tools\wsdl2c mkdir $(AXIS2_BINDIR)\bin\tools\wsdl2c
- @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\README $(AXIS2_BINDIR)\bin\tools\wsdl2c
- @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\WSDL2C.bat $(AXIS2_BINDIR)\bin\tools\wsdl2c
- @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\WSDL2C.sh $(AXIS2_BINDIR)\bin\tools\wsdl2c
+ if not exist $(AXIS2_BINDIR)\bin\tools\wsdl2c mkdir $(AXIS2_BINDIR)\bin\tools\wsdl2c
+ @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\README $(AXIS2_BINDIR)\bin\tools\wsdl2c
+ @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\WSDL2C.bat $(AXIS2_BINDIR)\bin\tools\wsdl2c
+ @copy $(AXIS2_SOURCE_DIR)\tools\codegen\javatool\WSDL2C.sh $(AXIS2_BINDIR)\bin\tools\wsdl2c
mv_dist:
cd $(AXIS2_BINDIR)
cd ..
@if exist $(AXIS2_RELEASE_DIR) rmdir /S /Q $(AXIS2_RELEASE_DIR)
-# rename deploy $(AXIS2_RELEASE_DIR)
@xcopy /Y /E /I deploy $(AXIS2_RELEASE_DIR)
@@ -1397,7 +1259,7 @@
axis2_server_modules: axis2_apache_module axis2_IIS_module
-################################# tools ##################################################
+################ tools ###################
# tcpmon
TCPMON_SRC = $(AXIS2_SOURCE_DIR)\tools\tcpmon\src
TCPMON_INTDIR = $(AXIS2_INTDIR)\tools\tcpmon
@@ -1419,21 +1281,19 @@
tcpmon: $(AXIS2_TOOLS)\tcpmon.exe
-##############################################################################################
+#########################################
#Copy axis2 xml
copy_axis2_xml:
@copy $(AXIS2_SOURCE_DIR)\samples\server\axis2.xml $(AXIS2_BINDIR)\
-##############################################################################################
+#########################################
build: deploy axis2_core axis2_samples copy_include
-build_with_guththila : deploy axis2_core_guththila axis2_samples copy_include
-
!if "$(WITH_TCP)" == "1"
-all: $(PARSER) axis2_tcp
+all: build axis2_tcp
!else
-all: $(PARSER)
+all: build
!endif
##############################################################################################
@@ -1442,5 +1302,5 @@
dist: install axis2_apache_module axis2_IIS_module tcpmon copy_samples copy_vc_projects clean_manifest mv_dist
-dist_as_lib : deploy $(AXIS2_WITHOUT_SERVER) copy_axis2_xml copy_include clean_manifest mv_dist
-
+dist_as_lib : deploy axis2_core_without_server copy_axis2_xml copy_include clean_manifest mv_dist
+
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/configure.ac?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/configure.ac (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/configure.ac Tue Jun 10 22:08:36 2008
@@ -60,6 +60,7 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g"
# CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
@@ -118,6 +119,7 @@
AC_MSG_RESULT(yes)
zliblibs="minizip/libaxis2_minizip.la"
CFLAGS="$CFLAGS -DAXIS2_ARCHIVE_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_ARCHIVE_ENABLED"
if test -d $withval; then
zlibinc="-I$withval"
elif test -d '/usr/include'; then
@@ -144,6 +146,7 @@
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_GUTHTHILA_ENABLED"
WRAPPER_DIR="guththila"
;;
@@ -151,6 +154,7 @@
AC_MSG_RESULT(yes)
WRAPPER_DIR="guththila"
CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_GUTHTHILA_ENABLED"
AC_CONFIG_SUBDIRS(guththila)
GUTHTHILA_LIBS="/guththila/src/"
GUTHTHILA_DIR="guththila"
@@ -168,8 +172,9 @@
*)
AC_MSG_RESULT(yes)
WRAPPER_DIR="libxml2"
- PKG_CHECK_MODULES(PARSER, libxml-2.0)
- CFLAGS="$CFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
+ PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+ CFLAGS="$CFLAGS -DAXIS2_LIBXML2_ENABLED"
+ CPPFLAGS="$CPPFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
LDFLAGS="$LDFLAGS $PARSER_LIBS"
;;
esac ],
@@ -193,6 +198,33 @@
AC_MSG_RESULT(no)
)
+
+AC_MSG_CHECKING(whether to build AMQP transport)
+AC_ARG_WITH(qpid,
+[ --with-qpid[=PATH] 'PATH' specifies the location where the Qpid is installed into.
+ If this option is specified, AMQP transport would be built.
+ If you omit the '=PATH' part completely, the configure script will take
+ '/usr/local' as the Qpid home.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ AMQP_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ if test -d $withval; then
+ qpidhome="$withval"
+ elif test -d '/usr/local/include/qpid'; then
+ qpidhome="/usr/local"
+ else
+ AC_MSG_ERROR(*** Could not Find Qpid in /usr/local ...)
+ fi
+ AMQP_DIR="amqp"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to use apache2 as server transport)
AC_ARG_WITH(apache2,
[ --with-apache2[=PATH] Find the Apache2 HTTP Web server header files in 'PATH'.
@@ -277,14 +309,17 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_TRACE"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_TRACE"
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
AC_MSG_CHECKING(whether to enable multi threading)
@@ -294,14 +329,17 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SVR_MULTI_THREADED"
;;
esac ],[
AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"]
+ CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SVR_MULTI_THREADED"]
)
AC_MSG_CHECKING(whether to use openssl)
@@ -311,16 +349,19 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
ssl_enabled=false
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_SSL_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SSL_ENABLED"
ssl_enabled=true
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
AC_MSG_CHECKING(whether to use libcurl)
@@ -330,16 +371,19 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
libcurl_enabled=false
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_LIBCURL_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_LIBCURL_ENABLED"
libcurl_enabled=true
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
@@ -347,25 +391,25 @@
IKSEMELINC=$iksemelinc
APRINC=$aprinc
VERSION_NO="4:0:4"
+QPID_HOME=$qpidhome
AC_SUBST(VERSION_NO)
-AC_SUBST(PARSER_LIBS)
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
AC_SUBST(DICLIENT_DIR)
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
AC_SUBST(APACHE2BUILD)
-AC_SUBST(PARSER_DIR)
AC_SUBST(WRAPPER_DIR)
AC_SUBST(TCP_DIR)
+AC_SUBST(AMQP_DIR)
+AC_SUBST(QPID_HOME)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(ZLIBBUILD)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
-#export PARSER_DIR
export WRAPPER_DIR
export prefix
@@ -393,6 +437,15 @@
src/core/transport/tcp/receiver/Makefile \
src/core/transport/tcp/server/Makefile \
src/core/transport/tcp/server/simple_tcp_server/Makefile \
+ src/core/transport/amqp/Makefile \
+ src/core/transport/amqp/util/Makefile \
+ src/core/transport/amqp/receiver/Makefile \
+ src/core/transport/amqp/receiver/qpid_receiver/Makefile \
+ src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile \
+ src/core/transport/amqp/sender/Makefile \
+ src/core/transport/amqp/sender/qpid_sender/Makefile \
+ src/core/transport/amqp/server/Makefile \
+ src/core/transport/amqp/server/axis2_amqp_server/Makefile \
src/core/deployment/Makefile \
src/core/clientapi/Makefile \
src/core/receivers/Makefile \
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_attribute.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_attribute.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_attribute.h Tue Jun 10 22:08:36 2008
@@ -21,46 +21,35 @@
#include <guththila_defines.h>
#include <guththila_token.h>
#include <axutil_utils.h>
+
EXTERN_C_START()
+
#ifndef GUTHTHILA_ATTR_DEF_SIZE
#define GUTHTHILA_ATTR_DEF_SIZE 16
-#endif /* */
+#endif
+
+/* Representation of an attribute */
typedef struct guththila_attr_s
{
+ guththila_token_t *pref; /* Prefix */
+ guththila_token_t *name; /* Name */
+ guththila_token_t *val; /* Value */
+} guththila_attr_t;
- guththila_token_t *
- pref;
-
- guththila_token_t *
- name;
-
- guththila_token_t *
- val;
-
-}
-guththila_attr_t;
typedef struct guththila_attr_list_s
{
+ guththila_attr_t *list;
+ guththila_stack_t fr_stack;
+ int size;
+ int capacity;
+} guththila_attr_list_t;
- guththila_attr_t *
- list;
-
- guththila_stack_t
- fr_stack;
- int
- size;
- int
- capacity;
-
-}
-guththila_attr_list_t;
/**
* Create function of guththila_attr_list_t type structure
* @param env environment, MUST NOT be NULL.
* return new pointer to structure guththila_attr_list_s with initializing stack
* fr_stack
*/
-
guththila_attr_list_t *
GUTHTHILA_CALL guththila_attr_list_create(const axutil_env_t * env);
@@ -73,23 +62,22 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
int GUTHTHILA_CALL
guththila_attr_list_init(
guththila_attr_list_t * at_list,
const axutil_env_t * env);
+
/**
* @param at_list keeps the list of attributes in this structure using
* a guththila_stack_t variable
* @param env environment, MUST NOT be NULL.
* return the top value of the stack which is inside guththila_attr_list_t
*/
-
-
guththila_attr_t *
GUTHTHILA_CALL guththila_attr_list_get(guththila_attr_list_t * at_list,
const axutil_env_t * env);
+
/**
* This method push the given attribute in to the stack which is a
* member of guththila_attr_list_t
@@ -100,13 +88,12 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
-
int GUTHTHILA_CALL
guththila_attr_list_release(
guththila_attr_list_t * at_list,
guththila_attr_t * attr,
const axutil_env_t * env);
+
/**
* Free method for the stack which is inside guththila_attr_list_s
* structure, free the stack and other members
@@ -116,12 +103,11 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
-
void GUTHTHILA_CALL
msuila_attr_list_free_data(
guththila_attr_list_t * at_list,
const axutil_env_t * env);
+
/**
* Free method for guththila_attr_list_s structure,this free at_list too.
* @param at_list keeps the list of attributes in this structure using
@@ -131,8 +117,6 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
-
void GUTHTHILA_CALL
guththila_attr_list_free(
guththila_attr_list_t * at_list,
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_buffer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_buffer.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_buffer.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_buffer.h Tue Jun 10 22:08:36 2008
@@ -21,28 +21,27 @@
#include <guththila_defines.h>
#include <axutil_utils.h>
-
EXTERN_C_START()
+
typedef enum guththila_buffer_type
{
- GUTHTHILA_SINGLE_BUFFER = 0,
- GUTHTHILA_MULTIPLE_BUFFER
+ GUTHTHILA_SINGLE_BUFFER = 0, /* One buffer */
+ GUTHTHILA_MULTIPLE_BUFFER /* Mulitple buffers in a buff array */
} guththila_buffer_type_t;
typedef struct guththila_buffer_s
{
/* Required to manupulate multiple buffers */
- size_t *data_size;
- size_t *buffs_size;
- guththila_char_t **buff;
- int cur_buff;
- int cur_buff_pos;
- size_t pre_tot_data;
- unsigned int no_buffers;
- short type;
- guththila_char_t *xml;
-}
-guththila_buffer_t;
+ size_t *data_size; /* Array containing filled sizes of buffers */
+ size_t *buffs_size; /* Array containing actual sizes of buffers */
+ guththila_char_t **buff; /* Array of buffers */
+ int cur_buff; /* Current buffer */
+ int cur_buff_pos; /* Position of the current buffer */
+ size_t pre_tot_data; /* All the data in the previous buffers. Not include cur */
+ unsigned int no_buffers; /* No of buffers */
+ short type; /* Buffer type */
+ guththila_char_t *xml; /* All the buffers serialized together */
+} guththila_buffer_t;
#define GUTHTHILA_BUFFER_DEF_SIZE 16384
#define GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS 16
@@ -80,7 +79,6 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
int GUTHTHILA_CALL
guththila_buffer_init(guththila_buffer_t * buffer,
int size,
@@ -93,10 +91,10 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
int GUTHTHILA_CALL
guththila_buffer_un_init(guththila_buffer_t * buffer,
const axutil_env_t * env);
+
/**
* This method creates a new buffer and copy the content of given
* data by buffer variable
@@ -107,8 +105,6 @@
* return status of op AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error
*/
-
-
int GUTHTHILA_CALL
guththila_buffer_init_for_buffer(guththila_buffer_t * mu_buff,
guththila_char_t *buffer,
@@ -133,7 +129,6 @@
* @param env environment, MUST NOT be NULL.
* return xml element of guththila_buffer_s structure
*/
-
void *GUTHTHILA_CALL
guththila_buffer_get(guththila_buffer_t * buffer,
const axutil_env_t * env);
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_namespace.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_namespace.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_namespace.h Tue Jun 10 22:08:36 2008
@@ -25,24 +25,25 @@
#ifndef GUTHTHILA_NAMESPACE_DEF_SIZE
#define GUTHTHILA_NAMESPACE_DEF_SIZE 4
-#endif /* */
+#endif
typedef struct guththila_namespace_s
{
- guththila_token_t *name;
- guththila_token_t *uri;
+ guththila_token_t *name; /* Name */
+ guththila_token_t *uri; /* URI */
} guththila_namespace_t;
typedef struct guththila_namespace_list_s
{
- guththila_namespace_t *list;
+ guththila_namespace_t *list;
guththila_stack_t fr_stack;
int size;
int capacity;
} guththila_namespace_list_t;
-guththila_namespace_list_t *
-GUTHTHILA_CALL guththila_namespace_list_create(const axutil_env_t * env);
+guththila_namespace_list_t *GUTHTHILA_CALL
+guththila_namespace_list_create(
+ const axutil_env_t * env);
int GUTHTHILA_CALL
guththila_namespace_list_init(
@@ -50,7 +51,8 @@
const axutil_env_t * env);
guththila_namespace_t * GUTHTHILA_CALL
-guththila_namespace_list_get(guththila_namespace_list_t *at_list,
+guththila_namespace_list_get(
+ guththila_namespace_list_t *at_list,
const axutil_env_t * env);
int GUTHTHILA_CALL
@@ -70,5 +72,5 @@
const axutil_env_t * env);
EXTERN_C_END()
-#endif /* */
+#endif
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_reader.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_reader.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_reader.h Tue Jun 10 22:08:36 2008
@@ -21,63 +21,95 @@
#include <stdio.h>
#include <guththila_defines.h>
#include <axutil_utils.h>
-EXTERN_C_START() typedef int(
- GUTHTHILA_CALL * GUTHTHILA_READ_INPUT_CALLBACK)(
+
+EXTERN_C_START()
+
+typedef int(GUTHTHILA_CALL * GUTHTHILA_READ_INPUT_CALLBACK)(
guththila_char_t *buffer,
int size,
void *ctx);
+
enum guththila_reader_type
{
- GUTHTHILA_FILE_READER =
- 1, GUTHTHILA_IO_READER, GUTHTHILA_MEMORY_READER
+ GUTHTHILA_FILE_READER = 1,
+ GUTHTHILA_IO_READER,
+ GUTHTHILA_MEMORY_READER
};
+
typedef struct guththila_reader_s
{
- int
- type;
-
- FILE *
- fp;
- guththila_char_t *
- buff;
- int
- buff_size;
-
- GUTHTHILA_READ_INPUT_CALLBACK
- input_read_callback;
- void *
- context;
-
-}
-guththila_reader_t;
+ int type; /* Type of reader */
+ FILE *fp; /* File pointer */
+ guththila_char_t *buff; /* Buffer */
+ int buff_size; /* Buff size */
+ GUTHTHILA_READ_INPUT_CALLBACK input_read_callback; /* Call back */
+ void *context; /* Context */
+} guththila_reader_t;
#ifndef GUTHTHILA_READER_SET_LAST_START
#define GUTHTHILA_READER_SET_LAST_START(_reader, _start) ((_reader)->start = _start)
-#endif /* */
+#endif
#ifndef GUTHTHILA_READER_STEP_BACK
#define GUTHTHILA_READER_STEP_BACK(_reader) ((_reader->next--))
-#endif /* */
+#endif
+
+/*
+ * Reading a file.
+ * @param filename name of the file
+ * @param env environment
+ */
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
guththila_reader_create_for_file(guththila_char_t *filename,
const axutil_env_t * env);
+
+/*
+ * Reading from a call back function.
+ * @param input_read_callback function pointer to read data
+ * @param ctx context
+ * @param env environment
+ */
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
guththila_reader_create_for_io(GUTHTHILA_READ_INPUT_CALLBACK
input_read_callback, void *ctx,
const axutil_env_t * env);
+
+/*
+ * Reading from memory buffer.
+ * @param buffer buffer
+ * @param size size of the buffer
+ * @param env environment
+ */
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
guththila_reader_create_for_memory(void *buffer,
int size,
const axutil_env_t * env);
+
+/*
+ * Read the specified number of character to the given buffer.
+ * @param r reader
+ * @param buffer buffer to place the read data
+ * @param offset position to place the data on the given buffer
+ * @param length number of bytes to read
+ * @param env environment
+ * @return number of bytes put in to the buffer. -1 if end of the read.
+ */
GUTHTHILA_EXPORT int GUTHTHILA_CALL guththila_reader_read(
guththila_reader_t * r,
guththila_char_t * buffer,
int offset,
int length,
const axutil_env_t * env);
+
+/*
+ * Free the reader.
+ * @param r reader
+ * @param env environment
+ */
GUTHTHILA_EXPORT void GUTHTHILA_CALL guththila_reader_free(
guththila_reader_t * r,
const axutil_env_t * env);
+
EXTERN_C_END()
#endif /* */
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_stack.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_stack.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_stack.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_stack.h Tue Jun 10 22:08:36 2008
@@ -24,70 +24,73 @@
#include <guththila_defines.h>
#include <axutil_utils.h>
#define GUTHTHILA_STACK_DEFAULT 16
-EXTERN_C_START() typedef struct guththila_stack_s
-{
- /* Number of Items in the stack */
- int
- top;
+EXTERN_C_START()
+typedef struct guththila_stack_s
+{
+ /* Number of Items in the stack */
+ int top;
/* Max number of Items that can be hold in data */
- int
- max;
- void **
- data;
-
-}
-guththila_stack_t;
+ int max;
+ void ** data;
+} guththila_stack_t;
#ifndef GUTHTHILA_STACK_SIZE
#define GUTHTHILA_STACK_SIZE(_stack) ((_stack).top)
-#endif /* */
+#endif
#ifndef GUTHTHILA_STACK_TOP_INDEX
#define GUTHTHILA_STACK_TOP_INDEX(_stack) (((_stack).top - 1))
-#endif /* */
+#endif
+
int GUTHTHILA_CALL
guththila_stack_init(
guththila_stack_t * stack,
const axutil_env_t * env);
+
void GUTHTHILA_CALL
guththila_stack_free(
guththila_stack_t * stack,
const axutil_env_t * env);
+
void GUTHTHILA_CALL
guththila_stack_un_init(
guththila_stack_t * stack,
const axutil_env_t * env);
-void *
-GUTHTHILA_CALL
+
+void * GUTHTHILA_CALL
guththila_stack_pop(
guththila_stack_t * stack,
const axutil_env_t * env);
+
int GUTHTHILA_CALL
guththila_stack_push(
guththila_stack_t * stack,
void *data,
const axutil_env_t * env);
-void *
-GUTHTHILA_CALL
+
+void * GUTHTHILA_CALL
guththila_stack_peek(
guththila_stack_t * stack,
const axutil_env_t * env);
-void *
-GUTHTHILA_CALL
+
+void * GUTHTHILA_CALL
guththila_stack_get_by_index(
guththila_stack_t * stack,
int index,
const axutil_env_t * env);
+
int GUTHTHILA_CALL
guththila_stack_del_top(
guththila_stack_t * stack,
const axutil_env_t * env);
+
int GUTHTHILA_CALL
guththila_stack_is_empty(
guththila_stack_t * stack,
const axutil_env_t * env);
+
EXTERN_C_END()
-#endif /* */
+#endif
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_token.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_token.h?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_token.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/include/guththila_token.h Tue Jun 10 22:08:36 2008
@@ -20,58 +20,50 @@
#include <guththila_defines.h>
#include <guththila_stack.h>
-EXTERN_C_START() typedef struct guththila_token_s
+
+EXTERN_C_START()
+
+typedef struct guththila_token_s
{
- short
- type;
- guththila_char_t *
- start;
- int
- _start;
-
- size_t
- size;
- int
- last;
- int
- ref;
-}
-guththila_token_t;
+ short type;
+ guththila_char_t *start;
+ int _start;
+ size_t size;
+ int last;
+ int ref;
+} guththila_token_t;
+
enum guththila_token_type
{
- _Unknown =
- 1, _name, _attribute_name, _attribute_value, _prefix,
- _char_data, _text_data
+ _Unknown = 1,
+ _name,
+ _attribute_name,
+ _attribute_value,
+ _prefix,
+ _char_data,
+ _text_data
};
+
typedef struct guththila_tok_list_s
{
-
- guththila_stack_t
- fr_stack;
-
- guththila_token_t **
- list;
- int
- no_list;
- int
- cur_list;
- int *
- capacity;
-
-}
-guththila_tok_list_t;
+ guththila_stack_t fr_stack;
+ guththila_token_t **list;
+ int no_list;
+ int cur_list;
+ int *capacity;
+} guththila_tok_list_t;
#ifndef GUTHTHILA_TOK_DEF_SIZE
#define GUTHTHILA_TOK_DEF_SIZE 16
-#endif /* */
+#endif
#ifndef GUTHTHILA_TOK_DEF_LIST_SIZE
#define GUTHTHILA_TOK_DEF_LIST_SIZE 16
-#endif /* */
+#endif
#ifndef GUTHTHILA_TOKEN_LEN
#define GUTHTHILA_TOKEN_LEN(tok) (tok->size)
-#endif /* */
+#endif
#ifndef GUTHTHILA_TOKEN_TO_STRING
#define GUTHTHILA_TOKEN_TO_STRING(tok, string, _env) \
@@ -80,43 +72,78 @@
memcpy(string, (tok)->start, GUTHTHILA_TOKEN_LEN(tok)); \
string[GUTHTHILA_TOKEN_LEN(tok)] = 0; \
}
-#endif /* */
+#endif
+/*
+ * Initialize token list.
+ */
int GUTHTHILA_CALL
guththila_tok_list_init(
guththila_tok_list_t * tok_list,
const axutil_env_t * env);
+
+/*
+ * Free the token list. Allocated tokens are not free.
+ */
void GUTHTHILA_CALL
guththila_tok_list_free(
guththila_tok_list_t * tok_list,
const axutil_env_t * env);
+
+/*
+ * Get a token from the list.
+ */
guththila_token_t *
-GUTHTHILA_CALL guththila_tok_list_get_token(guththila_tok_list_t * tok_list,
- const axutil_env_t * env);
+GUTHTHILA_CALL guththila_tok_list_get_token(
+ guththila_tok_list_t * tok_list,
+ const axutil_env_t * env);
+
+/*
+ * Release a token to the token list.
+ */
int GUTHTHILA_CALL
guththila_tok_list_release_token(
guththila_tok_list_t * tok_list,
guththila_token_t * token,
const axutil_env_t * env);
+
+/*
+ * Free the tokens in the token list.
+ */
void GUTHTHILA_CALL
guththila_tok_list_free_data(
guththila_tok_list_t * tok_list,
const axutil_env_t * env);
+
+/*
+ * Grow the token list.
+ */
int GUTHTHILA_CALL
guththila_tok_list_grow(
guththila_tok_list_t * tok_list,
const axutil_env_t * env);
+
+/*
+ * Compare a token with a string.
+ * Return 0 if match.
+ */
int GUTHTHILA_CALL
guththila_tok_str_cmp(
guththila_token_t * tok,
guththila_char_t *str,
size_t str_len,
const axutil_env_t * env);
+
+/*
+ * Compare two tokens for string equalance
+ * Return 0 if match.
+ */
int GUTHTHILA_CALL
guththila_tok_tok_cmp(
guththila_token_t * tok1,
guththila_token_t * tok2,
const axutil_env_t * env);
+
void GUTHTHILA_CALL
guththila_set_token(
guththila_token_t* tok,
@@ -127,8 +154,9 @@
int last,
int ref,
const axutil_env_t* env);
+
EXTERN_C_END()
-#endif /* */
+#endif
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_attribute.c?rev=666526&r1=666525&r2=666526&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_attribute.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/guththila/src/guththila_attribute.c Tue Jun 10 22:08:36 2008
@@ -61,7 +61,7 @@
at_list->list =(guththila_attr_t *) AXIS2_MALLOC(env->allocator,sizeof(guththila_attr_t) *GUTHTHILA_ATTR_DEF_SIZE);
if (at_list->list && guththila_stack_init(&at_list->fr_stack, env))
-{
+ {
at_list->capacity = GUTHTHILA_ATTR_DEF_SIZE;
at_list->size = 0;
for (i = 0; i < GUTHTHILA_ATTR_DEF_SIZE; i++)