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 na...@apache.org on 2007/04/04 08:04:41 UTC
svn commit: r525423 - in /webservices/axis2/trunk/c: build/win32/
ides/vc/axis2c/ ides/vc/axis2c/axis2_http_sender/
modules/core/transport/http/sender/ savan/samples/client/subscriber/
savan/samples/server/listener/ savan/samples/server/publisher/
Author: nandika
Date: Tue Apr 3 23:04:40 2007
New Revision: 525423
URL: http://svn.apache.org/viewvc?view=rev&rev=525423
Log:
compile errors fixed
Modified:
webservices/axis2/trunk/c/build/win32/makefile
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
webservices/axis2/trunk/c/savan/samples/server/listener/listener.c
webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Tue Apr 3 23:04:40 2007
@@ -69,7 +69,7 @@
#binary distribution dll names
#core modules
-AXIS2_UTIL = axis2_util
+AXUTIL = axutil
AXIS2_PARSER = axis2_parser
AXIOM = axiom
AXIS2_TRANSPORT_SENDER = axis2_http_sender
@@ -267,55 +267,55 @@
axis2_util:
$(CC) $(CFLAGS) $(AXIS2_UTIL_SRC) /Fo$(AXIS2_INTDIR_UTIL)\ /c
$(LD) $(LDFLAGS) $(AXIS2_INTDIR_UTIL)\*.obj $(LIBS) $(ZLIB_BIN_DIR)\lib\zdll.lib \
- /DLL /OUT:$(AXIS2_LIBS)\$(AXIS2_UTIL).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_UTIL).lib
+ /DLL /OUT:$(AXIS2_LIBS)\$(AXUTIL).dll /IMPLIB:$(AXIS2_LIBS)\$(AXUTIL).lib
guththila:
$(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) $(GUTHTHILA_SRC) /Fo$(AXIS2_INTDIR_GUTHTHILA)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_GUTHTHILA)\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_GUTHTHILA)\*.obj $(AXUTIL).lib \
$(LIBS) \
/DLL /OUT:$(AXIS2_LIBS)\$(GUTHTHILA).dll /IMPLIB:$(AXIS2_LIBS)\$(GUTHTHILA).lib
axis2_parser:
$(CC) $(CFLAGS) $(AXIS2_PARSER_SRC) /Fo$(AXIS2_INTDIR_PARSER)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXIS2_UTIL).lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXUTIL).lib $(LIBS) \
$(LIBXML2_BIN_DIR)\lib\libxml2.lib /DLL \
/OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
axis2_parser_with_guththila:
$(CC) $(CFLAGS) $(GUTHTHILA_INCLUDE_PATH) $(AXIS2_GUTHTHILA_PARSER_SRC) /Fo$(AXIS2_INTDIR_PARSER)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXIS2_UTIL).lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_PARSER)\*.obj $(AXUTIL).lib $(LIBS) \
$(AXIS2_LIBS)\$(GUTHTHILA).lib /DLL \
/OUT:$(AXIS2_LIBS)\$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_PARSER).lib
axiom:
$(CC) $(CFLAGS) $(AXIOM_SRC) /Fo$(AXIS2_INTDIR_AXIOM)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_AXIOM)\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_AXIOM)\*.obj $(AXUTIL).lib \
$(AXIS2_PARSER).lib $(LIBS) /DLL /OUT:$(AXIS2_LIBS)\$(AXIOM).dll \
/IMPLIB:$(AXIS2_LIBS)\$(AXIOM).lib
axis2_engine:
$(CC) $(CFLAGS) $(AXIS2_ENGINE_SRC) /Fo$(AXIS2_INTDIR_CORE)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CORE)\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CORE)\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) \
/DLL /OUT:$(AXIS2_LIBS)\$(AXIS2_ENGINE).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_ENGINE).lib
axis2_http_sender:
$(CC) $(CFLAGS) $(AXIS2_HTTP_SENDER_SRC) /Fo$(AXIS2_INTDIR_TNS)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_TNS)\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_TNS)\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_LIBS)\$(AXIS2_TRANSPORT_SENDER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_TRANSPORT_SENDER).lib
axis2_http_receiver:
$(CC) $(CFLAGS) $(AXIS2_HTTP_RECEIVER_SRC) /Fo$(AXIS2_INTDIR_TNR)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_TNR)\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_TNR)\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_LIBS)\$(AXIS2_TRANSPORT_RECEIVER).dll /IMPLIB:$(AXIS2_LIBS)\$(AXIS2_TRANSPORT_RECEIVER).lib
axis2_mod_addr:
$(CC) $(CFLAGS) $(AXIS2_MOD_ADDR_SRC) /Fo$(AXIS2_INTDIR_ADDRESSING)\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_ADDRESSING)\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_ADDRESSING)\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_MODULES)\addressing\$(AXIS2_MOD_ADDR).dll
copy $(AXIS2_SOURCE_DIR)\modules\mod_addr\module.xml $(AXIS2_MODULES)\addressing
@@ -329,7 +329,7 @@
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(SIMPLE_AXIS2_SVR_SRC) /Fo$(AXIS2_INTDIR)\simple_http_server\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\simple_http_server\http_server_main.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\simple_http_server\http_server_main.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
$(AXIS2_TRANSPORT_RECEIVER).lib /OUT:$(AXIS2_BINS)\$(AXIS2_SERVER).exe
@@ -349,7 +349,7 @@
axis2_apache_module:
if not exist $(AXIS2_INTDIR)\apache_module mkdir $(AXIS2_INTDIR)\apache_module
$(CC) $(CFLAGS) $(APACHE_INCLUE_PATH) $(AXIS2_APACHE_MODULE_SRC) /Fo$(AXIS2_INTDIR)\apache_module\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\apache_module\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\apache_module\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib $(APACHE_LIBS) /DLL /OUT:$(AXIS2_LIBS)\mod_axis2.dll
#mod IIS
@@ -362,7 +362,7 @@
axis2_IIS_module:
if not exist $(AXIS2_INTDIR)\mod_IIS mkdir $(AXIS2_INTDIR)\mod_IIS
$(CC) $(CFLAGS) $(MOD_IIS_SRC) /Fo$(AXIS2_INTDIR)\mod_IIS\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\mod_IIS\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\mod_IIS\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) Advapi32.lib $(AXIS2_ENGINE).lib /DEF:$(DEF_FILE) /DLL /OUT:$(AXIS2_LIBS)\mod_axis2_IIS.dll
############# end modules ###################
@@ -374,7 +374,7 @@
if not exist $(AXIS2_SAMPLES)\logging mkdir $(AXIS2_SAMPLES)\logging
$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\modules\mod_log\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\mod_log\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\mod_log\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\mod_log\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_SAMPLES)\logging\axis2_mod_log.dll
copy $(AXIS2_SOURCE_DIR)\modules\mod_log\module.xml $(AXIS2_SAMPLES)\logging
@@ -387,7 +387,7 @@
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\echo \
$(AXIS2_SOURCE_DIR)\samples\server\echo\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\services\echo\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\echo\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\echo\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_SERVICES)\echo\echo.dll
@@ -399,7 +399,7 @@
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\echo \
$(AXIS2_SOURCE_DIR)\samples\server\notify\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\services\notify\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\notify\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\notify\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_SERVICES)\notify\notify.dll
@@ -412,7 +412,7 @@
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\math \
$(AXIS2_SOURCE_DIR)\samples\server\math\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\services\math\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\math\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\math\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_SERVICES)\math\math.dll
copy $(AXIS2_SOURCE_DIR)\samples\server\math\services.xml $(AXIS2_SERVICES)\math
@@ -422,7 +422,7 @@
if not exist $(AXIS2_INTDIR_SAMPLES)\services\mtom mkdir $(AXIS2_INTDIR_SAMPLES)\services\mtom
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\mtom \
$(AXIS2_SOURCE_DIR)\samples\server\mtom\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\services\mtom\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\mtom\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\mtom\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_SERVICES)\mtom\mtom.dll
copy $(AXIS2_SOURCE_DIR)\samples\server\mtom\services.xml $(AXIS2_SERVICES)\mtom
@@ -433,7 +433,7 @@
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\Calculator \
$(AXIS2_SOURCE_DIR)\samples\server\Calculator\*.c /Fo$(AXIS2_INTDIR_SAMPLES)\services\Calculator\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\Calculator\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SAMPLES)\services\Calculator\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_SERVICES)\Calculator\Calculator.dll
@@ -452,26 +452,26 @@
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\sg_math \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\add.c \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\add_skeleton.c /Fo$(AXIS2_INTDIR_SGM)\add\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\add\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\add\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/DLL /OUT:$(AXIS2_SERVICES)\sg_math\add.dll
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\sg_math \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\div.c \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\div_skeleton.c /Fo$(AXIS2_INTDIR_SGM)\div\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\div\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\div\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_SERVICES)\sg_math\div.dll
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\sg_math \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\sub.c \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\sub_skeleton.c /Fo$(AXIS2_INTDIR_SGM)\sub\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\sub\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\sub\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_SERVICES)\sg_math\sub.dll
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\sg_math \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\mul.c \
$(AXIS2_SOURCE_DIR)\samples\server\sg_math\mul_skeleton.c /Fo$(AXIS2_INTDIR_SGM)\mul\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\mul\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_SGM)\mul\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib $(AXIS2_TRANSPORT_RECEIVER).lib \
$(AXIS2_TRANSPORT_SENDER).lib /DLL /OUT:$(AXIS2_SERVICES)\sg_math\mul.dll
@@ -492,37 +492,37 @@
axis2_client_math:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\math\*.c /Fo$(AXIS2_INTDIR_CLI)\math\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\math\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\math\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\math.exe
axis2_client_echo:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\echo\echo.c /Fo$(AXIS2_INTDIR_CLI)\echo\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\echo\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\echo\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\echo.exe
axis2_client_google_spell:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\google\*.c /Fo$(AXIS2_INTDIR_CLI)\gslc\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\gslc\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\gslc\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\google.exe
axis2_client_yahoo:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\yahoo\*.c /Fo$(AXIS2_INTDIR_CLI)\yahoo\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\yahoo\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\yahoo\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
$(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\yahoo.exe
axis2_client_notify:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\notify\*.c /Fo$(AXIS2_INTDIR_CLI)\notify\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\notify\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\notify\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
$(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\notify.exe
axis2_client_mtom:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\client\mtom\*.c /Fo$(AXIS2_INTDIR_CLI)\mtom\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\mtom\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR_CLI)\mtom\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
$(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\mtom.exe
mkdir $(AXIS2_BINS)\samples\resources
@@ -541,14 +541,14 @@
$(CC) $(CFLAGS) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_blocking.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_blocking\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\echo_blocking.exe
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_non_blocking.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_non_blocking\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_non_blocking\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_non_blocking\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/OUT:$(AXIS2_BINS)\samples\echo_non_blocking.exe
@@ -557,7 +557,7 @@
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_blocking_addr.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_blocking_addr\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_addr\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_addr\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/OUT:$(AXIS2_BINS)\samples\echo_blocking_addr.exe
@@ -565,27 +565,27 @@
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_rest.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_rest\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_rest\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_rest\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/OUT:$(AXIS2_BINS)\samples\echo_rest.exe
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_blocking_dual.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_blocking_dual\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_dual\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_dual\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\echo_blocking_dual.exe
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_non_blocking_dual.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_non_blocking_dual\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_non_blocking_dual\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_non_blocking_dual\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
/OUT:$(AXIS2_BINS)\samples\echo_non_blocking_dual.exe
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH) \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_blocking_soap11.c \
$(AXIS2_SOURCE_DIR)\samples\user_guide\clients\echo_util.c /Fo$(AXIS2_INTDIR)\userguide\echo_blocking_soap11\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_soap11\*.obj $(AXIS2_UTIL).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\userguide\echo_blocking_soap11\*.obj $(AXUTIL).lib \
$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) \
$(AXIS2_ENGINE).lib /OUT:$(AXIS2_BINS)\samples\echo_blocking_soap11.exe
@@ -689,7 +689,7 @@
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" $(AXIS2_INCLUDE_PATH) \
/I $(AXIS2_SOURCE_DIR)\tools\tcpmon\include \
$(AXIS2_SOURCE_DIR)\tools\tcpmon\src\*.c /Fo$(AXIS2_INTDIR)\tools\tcpmon\ /c
- $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\tools\tcpmon\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(LD) $(LDFLAGS) $(AXIS2_INTDIR)\tools\tcpmon\*.obj $(AXUTIL).lib $(AXIOM).lib \
$(AXIS2_PARSER).lib /OUT:$(AXIS2_BINS)\tcpmon.exe
################################# SAVAN #################################################
@@ -720,26 +720,26 @@
mod_savan: savan_dirs
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\savan\include $(SAVAN_SRC) /Fo$(SAVAN_INTDIR)\ /c
- $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\*.obj $(AXIS2_UTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\*.obj $(AXUTIL).lib $(AXIOM).lib $(AXIS2_PARSER).lib \
$(LIBS) $(AXIS2_ENGINE).lib /DLL /OUT:$(AXIS2_BINDIR)\savan\savan\mod_savan.dll
copy $(AXIS2_SOURCE_DIR)\savan\src\data\module.xml $(AXIS2_BINDIR)\savan\savan\
savan_samples:
$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\client\subscriber\*.c \
/I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\client\subscriber\ /c
- $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\client\subscriber\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\client\subscriber\*.obj axutil.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
/LIBPATH:$(AXIS2_BINDIR)\savan\savan /OUT:$(AXIS2_BINDIR)\savan\bin\subscriber.exe
$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\server\listener\*.c \
/I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\server\listener\ /c
- $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\listener\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\listener\*.obj axutil.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
/LIBPATH:$(AXIS2_BINDIR)\savan\savan /DLL /OUT:$(AXIS2_BINDIR)\savan\services\listener\listener.dll
copy $(AXIS2_SOURCE_DIR)\savan\samples\server\listener\services.xml $(AXIS2_BINDIR)\savan\services\listener\
$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\savan\samples\server\publisher\*.c \
/I$(AXIS2_SOURCE_DIR)\savan\include /Fo$(SAVAN_INTDIR)\samples\server\publisher\ /c
- $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\publisher\*.obj axis2_util.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
+ $(LD) $(LDFLAGS) $(SAVAN_INTDIR)\samples\server\publisher\*.obj axutil.lib axiom.lib axis2_parser.lib mod_savan.lib axis2_engine.lib $(LIBS) \
/LIBPATH:$(AXIS2_BINDIR)\savan\savan /DLL /OUT:$(AXIS2_BINDIR)\savan\services\publisher\publisher.dll
copy $(AXIS2_SOURCE_DIR)\savan\samples\server\publisher\services.xml $(AXIS2_BINDIR)\savan\services\publisher\
@@ -754,7 +754,7 @@
##############################################################################################
#axis2.dll
-SRC_DIR = $(AXIS2_SOURCE_DIR)\util\src\platforms\windows\*.c \
+SRC_DIR = $(AXIS2_SOURCE_DIR)\util\src\platforms\windows\*.c \
$(AXIS2_SOURCE_DIR)\util\src\minizip\*.c \
$(AXIS2_SOURCE_DIR)\util\src\*.c \
$(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c \
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_sender/axis2_http_sender.vcproj Tue Apr 3 23:04:40 2007
@@ -240,6 +240,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
+ <File
+ RelativePath="..\..\..\..\include\axis2_http_sender.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln Tue Apr 3 23:04:40 2007
@@ -59,6 +59,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_savan", "mod_savan\mod_savan.vcproj", "{C781F3DE-8F38-4778-A50F-003D04336A10}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52AB54B9-4457-4E03-B892-75CC56F22B32}"
+ ProjectSection(SolutionItems) = preProject
+ ..\..\..\build\win32\makefile = ..\..\..\build\win32\makefile
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Tue Apr 3 23:04:40 2007
@@ -1172,7 +1172,7 @@
return flag;
}
-void
+void AXIS2_CALL
axis2_http_sender_util_add_header (const axutil_env_t *env,
axis2_http_simple_request_t *request,
axis2_char_t *header_name,
Modified: webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c Tue Apr 3 23:04:40 2007
@@ -193,7 +193,7 @@
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIOM_NODE_TO_STRING(ret_node, env);
+ om_str = axiom_node_to_string(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\nPublisher init successful\n");
@@ -223,7 +223,7 @@
text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
axiom_element_set_text(text_om_ele, env, "echo5", text_om_node);
- om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
+ om_str = axiom_node_to_string(echo_om_node, env);
if (om_str)
{
AXIS2_FREE(env->allocator, om_str);
Modified: webservices/axis2/trunk/c/savan/samples/server/listener/listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/listener/listener.c?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/listener/listener.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/listener/listener.c Tue Apr 3 23:04:40 2007
@@ -28,7 +28,7 @@
printf("listener service called.\n");
- str = AXIOM_NODE_TO_STRING(node, env);
+ str = axiom_node_to_string(node, env);
if (str)
printf("\nReceived : %s\n", str);
Modified: webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c Tue Apr 3 23:04:40 2007
@@ -57,6 +57,13 @@
listener_on_fault(axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env, axiom_node_t *node);
+static const axis2_svc_skeleton_ops_t listener_skeleton_ops_var = {
+ listener_init,
+ listener_invoke,
+ listener_on_fault,
+ listener_free
+};
+
/*Create function */
axis2_svc_skeleton_t *
axis2_listener_create(const axutil_env_t *env)
@@ -70,17 +77,11 @@
/* Allocate memory for the structs */
svc_skeleton = AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_skeleton_t));
- svc_skeleton->ops = AXIS2_MALLOC(
- env->allocator, sizeof(axis2_svc_skeleton_ops_t));
-
+ svc_skeleton->ops = &listener_skeleton_ops_var;
svc_skeleton->func_array = NULL;
/* Assign function pointers */
- svc_skeleton->ops->free = listener_free;
- svc_skeleton->ops->init = listener_init;
- svc_skeleton->ops->invoke = listener_invoke;
- svc_skeleton->ops->on_fault = listener_on_fault;
-
+
return svc_skeleton;
}
Modified: webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c?view=diff&rev=525423&r1=525422&r2=525423
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c Tue Apr 3 23:04:40 2007
@@ -72,6 +72,13 @@
publisher_worker_func(
axutil_thread_t *thrd,
void* data);
+
+static const axis2_svc_skeleton_ops_t publisher_skeleton_ops_var = {
+ publisher_init,
+ publisher_invoke,
+ publisher_on_fault,
+ publisher_free
+};
/*Create function */
axis2_svc_skeleton_t *
@@ -88,16 +95,11 @@
svc_skeleton = AXIS2_MALLOC(env->allocator,
sizeof(axis2_svc_skeleton_t));
- svc_skeleton->ops = AXIS2_MALLOC(
- env->allocator, sizeof(axis2_svc_skeleton_ops_t));
-
+ svc_skeleton->ops = &publisher_skeleton_ops_var;
svc_skeleton->func_array = NULL;
/* Assign function pointers */
- svc_skeleton->ops->free = publisher_free;
- svc_skeleton->ops->init = publisher_init;
- svc_skeleton->ops->invoke = publisher_invoke;
- svc_skeleton->ops->on_fault = publisher_on_fault;
+
return svc_skeleton;
}
@@ -144,14 +146,14 @@
data->svc = axis2_msg_ctx_get_svc(msg_ctx, env);
data->conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
publisher_worker_func, (void*)data);
if(! worker_thread)
{
printf("failed to create thread");
return AXIS2_FAILURE;
}
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+ axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
return axis2_publisher_start(env, node);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org