You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/05/18 08:41:52 UTC
svn commit: r407475 - in /webservices/axis2/trunk/c: ./ axiom/
axiom/attachments/ axiom/include/ axiom/om/ axiom/parser/guththila/
axiom/parser/libxml2/ include/ util/include/
Author: damitha
Date: Wed May 17 23:41:51 2006
New Revision: 407475
URL: http://svn.apache.org/viewvc?rev=407475&view=rev
Log:
Changes regarding folder structure changes
Added:
webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h
- copied, changed from r407443, webservices/axis2/trunk/c/include/axis2_data_handler.h
webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h
- copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_xml_reader.h
webservices/axis2/trunk/c/axiom/include/axis2_xml_schema_constants.h
- copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_xml_schema_constants.h
webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h
- copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_xml_writer.h
webservices/axis2/trunk/c/util/include/axis2_handler_desc.h
- copied, changed from r407443, webservices/axis2/trunk/c/include/axis2_handler_desc.h
Removed:
webservices/axis2/trunk/c/include/axis2_data_handler.h
webservices/axis2/trunk/c/include/axis2_handler_desc.h
webservices/axis2/trunk/c/include/axis2_xml_reader.h
webservices/axis2/trunk/c/include/axis2_xml_schema_constants.h
webservices/axis2/trunk/c/include/axis2_xml_writer.h
Modified:
webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h
webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h
webservices/axis2/trunk/c/axiom/build.sh
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/axiom/include/axis2_om_document.h
webservices/axis2/trunk/c/axiom/include/axis2_om_element.h
webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h
webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h
webservices/axis2/trunk/c/axiom/include/axis2_om_node.h
webservices/axis2/trunk/c/axiom/include/axis2_om_output.h
webservices/axis2/trunk/c/axiom/om/Makefile.am
webservices/axis2/trunk/c/axiom/om/om_attribute.c
webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_reader_wrapper.c
webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_writer_wrapper.c
webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_writer_wrapper.c
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_defines.h
Modified: webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h Wed May 17 23:41:51 2006
@@ -24,7 +24,7 @@
#include <axis2_utils.h>
#include <axis2_error.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
#include <axis2_string.h>
Modified: webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h Wed May 17 23:41:51 2006
@@ -24,7 +24,7 @@
#include <axis2_utils.h>
#include <axis2_error.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
#include <axis2_string.h>
@@ -37,7 +37,7 @@
{
#endif
-/* This should be moved to header file later axis2_defines.h*/
+/* This should be moved to header file later axis2_utils_defines.h*/
#define axis2_byte_t char
typedef struct axis2_mime_output_ops axis2_mime_output_ops_t;
Modified: webservices/axis2/trunk/c/axiom/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/build.sh?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/build.sh (original)
+++ webservices/axis2/trunk/c/axiom/build.sh Wed May 17 23:41:51 2006
@@ -1,4 +1,4 @@
#!/bin/bash
./autogen.sh
-./configure --enable-static=no
+./configure --enable-static=no --with-axis2_util=/home/damitha/projects/c/util/include
make
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Wed May 17 23:41:51 2006
@@ -57,9 +57,9 @@
dnl Find axis2_util include dir in the path
if test -d $withval; then
axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/util/include
- elif test -d '$(AXIS2C_HOME)/util/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/util/include"
+ dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include/util/include
+ elif test -d '$(AXIS2C_HOME)/include/util/include'; then
+ axis2_utilinc="-I$(AXIS2C_HOME)/include/util/include"
else
AC_MSG_ERROR(could not find axis2_util. stop)
fi
Copied: webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h (from r407443, webservices/axis2/trunk/c/include/axis2_data_handler.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h?p2=webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h&p1=webservices/axis2/trunk/c/include/axis2_data_handler.h&r1=407443&r2=407475&rev=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h Wed May 17 23:41:51 2006
@@ -22,14 +22,13 @@
* @brief axis2 data_handler interface
*/
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_error.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
#include <axis2_string.h>
#include <axis2_array_list.h>
-#include <axis2_handler_desc.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_document.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_document.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_document.h Wed May 17 23:41:51 2006
@@ -19,7 +19,7 @@
#include <axis2_env.h>
#include <axis2_om_node.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_om_output.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_element.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_element.h Wed May 17 23:41:51 2006
@@ -25,7 +25,7 @@
#include <axis2_om_children_qname_iterator.h>
#include <axis2_om_child_element_iterator.h>
#include <axis2_hash.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h Wed May 17 23:41:51 2006
@@ -23,7 +23,7 @@
* used for representing XML namespaces in OM
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_om_output.h>
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h Wed May 17 23:41:51 2006
@@ -29,7 +29,7 @@
* @brief defines axis2_om_navigator struct and its ops
*/
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_env.h>
#include <axis2_om_node.h>
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_node.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_node.h Wed May 17 23:41:51 2006
@@ -29,7 +29,7 @@
* @brief defines axis2_om_node struct and its ops
*/
#include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_output.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_output.h Wed May 17 23:41:51 2006
@@ -22,8 +22,8 @@
* @brief interface of om xml writer
*/
-#include <axis2_defines.h>
-#include <axis2_const.h>
+#include <axis2_utils_defines.h>
+#include <axis2_utils.h>
#include <axis2_env.h>
#include <axis2_om_node.h>
#include <axis2_xml_writer.h>
Modified: webservices/axis2/trunk/c/axiom/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/om/Makefile.am?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/om/Makefile.am Wed May 17 23:41:51 2006
@@ -19,10 +19,10 @@
libaxis2_om_la_LIBADD = ../../util/libaxis2_util.la ../attachments/libaxis2_attachments.la
INCLUDES = -I$(top_builddir)/include \
- -I$(top_builddir)/modules/util \
- -I$(top_builddir)/modules/xml/parser \
- -I$(top_builddir)/modules/platforms \
- -I$(top_builddir)/modules/xml/om\
- -I$(top_builddir)/modules/xml/attachments
+ -I$(top_builddir)/parser \
+ -I$(top_builddir)/om \
+ -I$(top_builddir)/attachments \
+ @UTILINC@ \
+ @UTILINC@/platforms
EXTRA_DIST=axis2_om_node_internal.h axis2_om_stax_builder_internal.h axis2_om_namespace_internal.h
Modified: webservices/axis2/trunk/c/axiom/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/om/om_attribute.c?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/om/om_attribute.c Wed May 17 23:41:51 2006
@@ -16,7 +16,7 @@
#include <axis2_om_attribute.h>
#include <string.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
axis2_status_t AXIS2_CALL
axis2_om_attribute_free (axis2_om_attribute_t *om_attribute,
Modified: webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_reader_wrapper.c?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_reader_wrapper.c Wed May 17 23:41:51 2006
@@ -17,7 +17,7 @@
#include <axis2_xml_reader.h>
#include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <guththila_xml_pull_parser.h>
/**************** function prototypes ******************************************/
Modified: webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_writer_wrapper.c?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/parser/guththila/guththila_xml_writer_wrapper.c Wed May 17 23:41:51 2006
@@ -15,7 +15,7 @@
*/
#include <guththila_xml_stream_writer.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_env.h>
#include <axis2_xml_writer.h>
/*********************** function prototypes ***********************************/
Modified: webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_reader_wrapper.c?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_reader_wrapper.c Wed May 17 23:41:51 2006
@@ -18,8 +18,8 @@
#include <axis2_xml_reader.h>
#include <libxml/xmlreader.h>
#include <libxml/parser.h>
- #include <axis2_defines.h>
- #include <axis2_const.h>
+ #include <axis2_utils_defines.h>
+ #include <axis2_utils.h>
#include <string.h>
#include <axis2_string.h>
Modified: webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_writer_wrapper.c?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/parser/libxml2/libxml2_writer_wrapper.c Wed May 17 23:41:51 2006
@@ -15,8 +15,8 @@
*/
#include <libxml/xmlwriter.h>
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_xml_writer.h>
#include <axis2_string.h>
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed May 17 23:41:51 2006
@@ -224,9 +224,9 @@
dnl Find axiom include dir in the path
if test -d $withval; then
axiominc="-I$withval"
- dnl else find the axiom include dir in $(AXIS2C_HOME)/axiom/include
- elif test -d '$(AXIS2C_HOME)/axiom/include'; then
- axiominc="-I$(AXIS2C_HOME)/axiom/include"
+ dnl else find the axiom include dir in $(AXIS2C_HOME)/include/axiom/include
+ elif test -d '$(AXIS2C_HOME)/include/axiom/include'; then
+ axiominc="-I$(AXIS2C_HOME)/include/axiom/include"
else
AC_MSG_ERROR(could not find axiom. stop)
fi
@@ -247,9 +247,9 @@
dnl Find axis2_util include dir in the path
if test -d $withval; then
axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/util/include
- elif test -d '$(AXIS2C_HOME)/util/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/util/include"
+ dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include/util/include
+ elif test -d '$(AXIS2C_HOME)/include/util/include'; then
+ axis2_utilinc="-I$(AXIS2C_HOME)/include/util/include"
else
AC_MSG_ERROR(could not find axis2_util. stop)
fi
Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_defines.h?rev=407475&r1=407474&r2=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Wed May 17 23:41:51 2006
@@ -14,16 +14,6 @@
{
#endif
-/**
- * This enum is used to decide the type of storage used
- */
-typedef enum _axis2_xml_parser_type
-{
- AXIS2_XML_PARSER_TYPE_BUFFER = 1,
- AXIS2_XML_PARSER_TYPE_FILE,
- AXIS2_XML_PARSER_TYPE_DOC
-} axis2_xml_parser_type;
-
#ifdef __cplusplus
}
#endif
Copied: webservices/axis2/trunk/c/util/include/axis2_handler_desc.h (from r407443, webservices/axis2/trunk/c/include/axis2_handler_desc.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_handler_desc.h?p2=webservices/axis2/trunk/c/util/include/axis2_handler_desc.h&p1=webservices/axis2/trunk/c/include/axis2_handler_desc.h&r1=407443&r2=407475&rev=407475&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_handler_desc.h Wed May 17 23:41:51 2006
@@ -22,7 +22,7 @@
* @brief Axis2 handler_desc interface
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_qname.h>
#include <axis2_param.h>
#include <axis2_param_container.h>