axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r407455 - in /webservices/axis2/trunk/c: ./ include/ modules/util/ modules/util/include/ modules/util/minizip/ modules/util/platforms/unix/ modules/util/platforms/windows/
Date Thu, 18 May 2006 04:53:31 GMT
Author: damitha
Date: Wed May 17 21:53:30 2006
New Revision: 407455

URL: http://svn.apache.org/viewvc?rev=407455&view=rev
Log:
more changes

Added:
    webservices/axis2/trunk/c/modules/util/include/axis2_error_default.h
      - copied, changed from r407443, webservices/axis2/trunk/c/include/axis2_error_default.h
    webservices/axis2/trunk/c/modules/util/include/axis2_log_default.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_log_default.h
    webservices/axis2/trunk/c/modules/util/minizip/ioapi.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/ioapi.h
    webservices/axis2/trunk/c/modules/util/minizip/unzip.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/unzip.h
Removed:
    webservices/axis2/trunk/c/include/axis2_error_default.h
    webservices/axis2/trunk/c/include/axis2_log_default.h
    webservices/axis2/trunk/c/include/ioapi.h
    webservices/axis2/trunk/c/include/unzip.h
Modified:
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/modules/util/Makefile.am
    webservices/axis2/trunk/c/modules/util/allocator.c
    webservices/axis2/trunk/c/modules/util/array_list.c
    webservices/axis2/trunk/c/modules/util/include/axis2_array_list.h
    webservices/axis2/trunk/c/modules/util/include/axis2_hash.h
    webservices/axis2/trunk/c/modules/util/include/axis2_linked_list.h
    webservices/axis2/trunk/c/modules/util/include/axis2_qname.h
    webservices/axis2/trunk/c/modules/util/include/axis2_string.h
    webservices/axis2/trunk/c/modules/util/include/axis2_thread.h
    webservices/axis2/trunk/c/modules/util/linked_list.c
    webservices/axis2/trunk/c/modules/util/param.c
    webservices/axis2/trunk/c/modules/util/platforms/unix/Makefile.am
    webservices/axis2/trunk/c/modules/util/platforms/windows/thread_windows.c
    webservices/axis2/trunk/c/modules/util/qname.c
    webservices/axis2/trunk/c/modules/util/stack.c
    webservices/axis2/trunk/c/modules/util/string.c
    webservices/axis2/trunk/c/modules/util/string_util.c

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed May 17 21:53:30 2006
@@ -212,14 +212,64 @@
   DICLIENT_DIR="diclient"
 )
 
+AC_MSG_CHECKING(To Use Axis2 C OM. This is a compulsory module to build Axis2 C)
+AC_ARG_WITH(axiom,
+[  --with-axiom[=PATH]      use axiom.],
+[ case "$withval" in
+  no)
+    AC_MSG_RESULT(no)
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    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)/modules/xml/om/include
+    elif test -d '$(AXIS2C_HOME)/modules/xml/om/include'; then
+        axiominc="-I$(AXIS2C_HOME)/modules/xml/om/include"
+    else
+        AC_MSG_ERROR(could not find axiom. stop)
+    fi
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
+AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
+AC_ARG_WITH(axis2_util,
+[  --with-axis2_util[=PATH]      use axis2_util.],
+[ case "$withval" in
+  no)
+    AC_MSG_RESULT(no)
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    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)/modules/util/include
+    elif test -d '$(AXIS2C_HOME)/modules/util/include'; then
+        axis2_utilinc="-I$(AXIS2C_HOME)/modules/util/include"
+    else
+        AC_MSG_ERROR(could not find axis2_util. stop)
+    fi
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
 CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
 
 APACHE2INC=$apache2inc
+OMINC=$axiominc
+UTILINC=$axis2_utilinc
 APRINC=$aprinc
 
 AC_SUBST(APACHE2INC)
 AC_SUBST(APRINC)
+AC_SUBST(OMINC)
+AC_SUBST(UTILINC)
 AC_SUBST(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML2_DIR)
@@ -250,12 +300,6 @@
     modules/core/clientapi/diclient/Makefile \
     modules/core/receivers/Makefile \
     modules/core/util/Makefile \
-    modules/xml/Makefile \
-    modules/xml/parser/Makefile \
-    modules/xml/parser/libxml2/Makefile \
-    modules/xml/soap/Makefile \
-    modules/xml/om/Makefile \
-    modules/xml/attachments/Makefile \
     modules/util/Makefile \
     modules/util/minizip/Makefile \
     modules/platforms/unix/Makefile \

Modified: webservices/axis2/trunk/c/modules/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/Makefile.am?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/Makefile.am Wed May 17 21:53:30 2006
@@ -1,10 +1,8 @@
 TESTS =
-SUBDIRS=minizip
+SUBDIRS = platforms/unix
 lib_LTLIBRARIES = libaxis2_util.la
-
-libaxis2_util_la_LIBADD = minizip/libaxis2_minizip.la 
-
-libaxis2_util_la_SOURCES = hash.c \
+libaxis2_util_la_SOURCES = \
+						hash.c \
                         allocator.c \
                         env.c \
                         error.c \
@@ -32,7 +30,7 @@
                         stack.c \
 						generic_obj.c
 
-
 INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/platforms
+           -I$(top_builddir)/include/platforms \
+           -I$(top_builddir)/include/platforms/unix
+EXTRA_DIST=platforms/windows

Modified: webservices/axis2/trunk/c/modules/util/allocator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/allocator.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/allocator.c (original)
+++ webservices/axis2/trunk/c/modules/util/allocator.c Wed May 17 21:53:30 2006
@@ -15,7 +15,7 @@
  */
 
 #include <axis2_allocator.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <stdlib.h>
 
 AXIS2_DECLARE(axis2_allocator_t *)

Modified: webservices/axis2/trunk/c/modules/util/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/array_list.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/array_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/array_list.c Wed May 17 21:53:30 2006
@@ -15,7 +15,7 @@
  */
 
 #include <axis2_array_list.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 
 typedef struct axis2_array_list_impl
 {

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_array_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_array_list.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_array_list.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_array_list.h Wed May 17 21:53:30
2006
@@ -22,7 +22,7 @@
  * @brief Axis2 array_list interface
  */
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_env.h>
 
 #ifdef __cplusplus

Copied: webservices/axis2/trunk/c/modules/util/include/axis2_error_default.h (from r407443,
webservices/axis2/trunk/c/include/axis2_error_default.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_error_default.h?p2=webservices/axis2/trunk/c/modules/util/include/axis2_error_default.h&p1=webservices/axis2/trunk/c/include/axis2_error_default.h&r1=407443&r2=407455&rev=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error_default.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_error_default.h Wed May 17 21:53:30
2006
@@ -17,7 +17,7 @@
 #ifndef AXIS2_ERROR_DEFAULT_H
 #define AXIS2_ERROR_DEFAULT_H
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_allocator.h>
 #include <axis2_error.h>
 

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_hash.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_hash.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_hash.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_hash.h Wed May 17 21:53:30 2006
@@ -22,7 +22,7 @@
  * @brief Axis2 Hash Tables
  */
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_env.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_linked_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_linked_list.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_linked_list.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_linked_list.h Wed May 17 21:53:30
2006
@@ -22,7 +22,7 @@
  * @brief Axis2 linked_list interface
  */
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_env.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_qname.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_qname.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_qname.h Wed May 17 21:53:30 2006
@@ -22,7 +22,7 @@
  * @brief represents a qualified name
  */
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_env.h>
 
 #include <axis2_string.h>

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_string.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_string.h Wed May 17 21:53:30 2006
@@ -17,7 +17,7 @@
 #ifndef AXIS2_STRING_H
 #define AXIS2_STRING_H
 
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_error.h>
 #include <axis2_env.h>
 #include <string.h>

Modified: webservices/axis2/trunk/c/modules/util/include/axis2_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_thread.h?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_thread.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_thread.h Wed May 17 21:53:30 2006
@@ -24,7 +24,7 @@
   */
 
 #include <axis2_allocator.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
 #include <axis2_error.h>
 
 

Modified: webservices/axis2/trunk/c/modules/util/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/linked_list.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/linked_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/linked_list.c Wed May 17 21:53:30 2006
@@ -15,7 +15,7 @@
  */
 
 #include <axis2_linked_list.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 
 typedef struct axis2_linked_list_impl
 {

Modified: webservices/axis2/trunk/c/modules/util/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/param.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/param.c (original)
+++ webservices/axis2/trunk/c/modules/util/param.c Wed May 17 21:53:30 2006
@@ -15,7 +15,7 @@
  */
 
 #include <axis2_param.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_string.h>
 #include <axis2_generic_obj.h>
 

Modified: webservices/axis2/trunk/c/modules/util/platforms/unix/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/platforms/unix/Makefile.am?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/platforms/unix/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/platforms/unix/Makefile.am Wed May 17 21:53:30
2006
@@ -7,5 +7,4 @@
 
 INCLUDES = -I$(top_builddir)/include \
            -I$(top_builddir)/include/platforms \
-           -I$(top_builddir)/include/platforms/unix \
-           -I$(top_builddir)/modules/util 
+           -I$(top_builddir)/include/platforms/unix

Modified: webservices/axis2/trunk/c/modules/util/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/platforms/windows/thread_windows.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/modules/util/platforms/windows/thread_windows.c Wed May 17 21:53:30
2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <platforms/windows/axis2_thread_windows.h>
 
 AXIS2_DECLARE(axis2_threadattr_t*)

Modified: webservices/axis2/trunk/c/modules/util/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/qname.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/qname.c Wed May 17 21:53:30 2006
@@ -16,8 +16,8 @@
 
 #include <axis2_qname.h>
 #include <axis2_env.h>
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
 #include <string.h>
 
 /********************************** Function prototypes *****************/

Modified: webservices/axis2/trunk/c/modules/util/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/stack.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stack.c (original)
+++ webservices/axis2/trunk/c/modules/util/stack.c Wed May 17 21:53:30 2006
@@ -15,7 +15,7 @@
  */
  
 #include <axis2_stack.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_env.h>
 #include <stdlib.h>
 #include <string.h>

Modified: webservices/axis2/trunk/c/modules/util/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/string.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/string.c (original)
+++ webservices/axis2/trunk/c/modules/util/string.c Wed May 17 21:53:30 2006
@@ -17,8 +17,8 @@
 #include <axis2_string.h>
 #include <stdlib.h>
 #include <string.h>
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
 #include <ctype.h>
 
 AXIS2_DECLARE(void*)

Modified: webservices/axis2/trunk/c/modules/util/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/string_util.c?rev=407455&r1=407454&r2=407455&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/string_util.c (original)
+++ webservices/axis2/trunk/c/modules/util/string_util.c Wed May 17 21:53:30 2006
@@ -16,7 +16,7 @@
  
 #include <axis2_string_util.h>
 #include <string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 
 AXIS2_DECLARE(axis2_array_list_t *)
 axis2_tokenize(axis2_env_t **env,
@@ -138,4 +138,4 @@
     AXIS2_ARRAY_LIST_ADD(list, env, rest);
  
     return list;
-}
\ No newline at end of file
+}



Mime
View raw message