You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/07/06 10:03:43 UTC

svn commit: r419478 - in /webservices/axis2/trunk/c/woden: configure.ac samples/wsdl10/Makefile.am src/Makefile.am src/builder/reader.c src/builder/wsdl10/wsdl10_reader.c src/wsdl10/Makefile.am src/wsdl10/xml/Makefile.am src/wsdl20/Makefile.am

Author: damitha
Date: Thu Jul  6 01:03:42 2006
New Revision: 419478

URL: http://svn.apache.org/viewvc?rev=419478&view=rev
Log:
Work on making it a one lib.

Modified:
    webservices/axis2/trunk/c/woden/configure.ac
    webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
    webservices/axis2/trunk/c/woden/src/Makefile.am
    webservices/axis2/trunk/c/woden/src/builder/reader.c
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
    webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
    webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am

Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Thu Jul  6 01:03:42 2006
@@ -125,12 +125,10 @@
     src/wsdl/Makefile \
     src/wsdl20/Makefile \
     src/wsdl20/xml/Makefile \
-    src/wsdl20/enumeration/Makefile \
     src/wsdl20/extensions/Makefile \
     src/wsdl20/extensions/soap/Makefile \
     src/wsdl10/Makefile \
     src/wsdl10/xml/Makefile \
-    src/wsdl10/enumeration/Makefile \
     src/wsdl10/extensions/Makefile \
     src/wsdl10/extensions/soap/Makefile \
     src/builder/Makefile \

Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am Thu Jul  6 01:03:42 2006
@@ -9,7 +9,7 @@
 					-laxis2_axiom \
 					-laxis2_xml_schema \
                     -laxis2_parser \
-					../../src/wsdl10/libwoden_wsdl10.la \
+					../../src/wsdl20/libwoden_wsdl20.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 

Modified: webservices/axis2/trunk/c/woden/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/Makefile.am?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/Makefile.am Thu Jul  6 01:03:42 2006
@@ -1 +1 @@
-SUBDIRS = util types schema xml builder wsdl wsdl20 wsdl10
+SUBDIRS = util types schema xml builder wsdl wsdl10 wsdl20

Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/reader.c Thu Jul  6 01:03:42 2006
@@ -383,7 +383,7 @@
         void *desc,
         void *parent);
 
-axis2_status_t AXIS2_CALL
+static axis2_status_t
 parse_ext_attributes(
         void *reader,
         const axis2_env_t *env,
@@ -3776,7 +3776,7 @@
     return property;
 }
 
-axis2_status_t AXIS2_CALL
+static axis2_status_t
 parse_ext_attributes(
         void *reader,
         const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Thu Jul  6 01:03:42 2006
@@ -33,7 +33,6 @@
 #include <woden_feature.h>
 #include <woden_import.h>
 #include <woden_include.h>
-#include <woden_interface_fault.h>
 #include <woden_wsdl10_interface_fault_ref.h>
 #include <woden_wsdl10_msg_ref.h>
 #include <woden_wsdl10_msg_ref_element.h>
@@ -77,7 +76,6 @@
 #include <woden_import_element.h>
 #include <woden_include_element.h>
 #include <woden_interface_element.h>
-#include <woden_interface_fault_element.h>
 #include <woden_wsdl10_interface_fault_ref_element.h>
 #include <woden_wsdl10_interface_msg_ref_element.h>
 #include <woden_interface_op_element.h>
@@ -385,7 +383,7 @@
  * @param wsdl_obj wsdl_obj_t type object
  * @param desc desc object
  */
-axis2_status_t AXIS2_CALL
+static axis2_status_t
 parse_ext_attributes(
         void *reader,
         const axis2_env_t *env,
@@ -3599,7 +3597,7 @@
     return property;
 }
 
-axis2_status_t AXIS2_CALL
+static axis2_status_t
 parse_ext_attributes(
         void *reader,
         const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am Thu Jul  6 01:03:42 2006
@@ -1,5 +1,5 @@
 SUBDIRS = xml extensions
-lib_LTLIBRARIES = libwoden_wsdl10.la
+noinst_LTLIBRARIES = libwoden_wsdl10.la
 
 libwoden_wsdl10_la_SOURCES = \
 							msg_ref.c \
@@ -12,17 +12,6 @@
 							svc.c \
 							desc.c \
 							component_model_builder.c
-
-libwoden_wsdl10_la_LIBADD =  \
-                    $(top_builddir)/src/xml/libwoden_xml.la \
-                    $(top_builddir)/src/util/libwoden_util.la \
-                    $(top_builddir)/src/types/libwoden_types.la \
-                    $(top_builddir)/src/schema/libwoden_schema.la \
-                    $(top_builddir)/src/builder/wsdl10/libwoden_wsdl10_builder.la \
-                    $(top_builddir)/src/wsdl10/xml/libwoden_wsdl10_xml.la \
-                    $(top_builddir)/src/wsdl10/extensions/libwoden_wsdl10_extensions.la \
-                    $(top_builddir)/src/wsdl10/extensions/soap/libwoden_wsdl10_extensions_soap.la \
-                    $(top_builddir)/src/wsdl/libwoden_wsdl.la
 
 INCLUDES = -I$(top_builddir)/include \
 			@AXIOMINC@ \

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am Thu Jul  6 01:03:42 2006
@@ -3,13 +3,10 @@
 libwoden_wsdl10_xml_la_SOURCES = \
 							msg_ref_element.c \
 							part_element.c \
-							interface_fault_element.c \
 							interface_fault_ref_element.c \
 							interface_msg_ref_element.c \
-							binding_fault_element.c \
 							binding_msg_ref_element.c \
 							binding_op_element.c \
-							fault_ref_element.c \
 							desc_element.c \
 							endpoint_element.c \
 							svc_element.c

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am?rev=419478&r1=419477&r2=419478&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am Thu Jul  6 01:03:42 2006
@@ -22,8 +22,12 @@
                     $(top_builddir)/src/wsdl20/xml/libwoden_wsdl20_xml.la \
                     $(top_builddir)/src/wsdl20/extensions/libwoden_extensions.la \
                     $(top_builddir)/src/wsdl20/extensions/soap/libwoden_extensions_soap.la \
+                    $(top_builddir)/src/builder/wsdl10/libwoden_wsdl10_builder.la \
+                    $(top_builddir)/src/wsdl10/xml/libwoden_wsdl10_xml.la \
+                    $(top_builddir)/src/wsdl10/extensions/libwoden_wsdl10_extensions.la \
+                    $(top_builddir)/src/wsdl10/extensions/soap/libwoden_wsdl10_extensions_soap.la \
+                    $(top_builddir)/src/wsdl10/libwoden_wsdl10.la \
                     $(top_builddir)/src/wsdl/libwoden_wsdl.la
-
 INCLUDES = -I$(top_builddir)/include \
 			@AXIOMINC@ \
 			@UTILINC@ \



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