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 sa...@apache.org on 2006/03/30 23:32:31 UTC
svn commit: r390245 - in /webservices/axis2/trunk/c: INSTALL
build/win32/configure.in build/win32/makefile modules/core/clientapi/call.c
modules/core/transport/http/receiver/http_svr_thread.c
Author: sahan
Date: Thu Mar 30 13:32:30 2006
New Revision: 390245
URL: http://svn.apache.org/viewcvs?rev=390245&view=rev
Log:
Fixed a crash in Win32, Fixed the build system in Windows, Updated INSTALL doc
Modified:
webservices/axis2/trunk/c/INSTALL
webservices/axis2/trunk/c/build/win32/configure.in
webservices/axis2/trunk/c/build/win32/makefile
webservices/axis2/trunk/c/modules/core/clientapi/call.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
Modified: webservices/axis2/trunk/c/INSTALL
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/INSTALL?rev=390245&r1=390244&r2=390245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/INSTALL (original)
+++ webservices/axis2/trunk/c/INSTALL Thu Mar 30 13:32:30 2006
@@ -248,7 +248,6 @@
eg: C:\axis2c\build\deploy\lib
5.2 Deploying in Apache2 Web Server
-
Note: To do the following tasks you might need super user privileges in your machine.
* Copy the mod_axis2 (libmod_axis2.so.0.0.0 on Linux and mod_axis2.dll in Windows) to "<apache2 modules directory>" (eg: /usr/lib/apache2/modules in Linux or C:\Apache2\modules in Windows) as mod_axis2.so
@@ -271,6 +270,8 @@
AXIS2_LOG_LEVEL_INFO - Log info and above
AXIS2_LOG_LEVEL_DEBUG - Log debug and above (default)
AXIS2_LOG_LEVEL_TRACE - Log trace messages
+* Use forward slashes "/" for path seperators in <apache2 modules directory>, <axis2 repository path> and <axis2 log file path>
+
* Make sure that the apache2 user has correct permissions to above paths
- Read permission to the repository
- Write permission to the log file
Modified: webservices/axis2/trunk/c/build/win32/configure.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build/win32/configure.in?rev=390245&r1=390244&r2=390245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/configure.in (original)
+++ webservices/axis2/trunk/c/build/win32/configure.in Thu Mar 30 13:32:30 2006
@@ -1,4 +1,4 @@
LIBXML2_INSTALL_DIR = E:\libxml2-2.6.23.win32
ICONV_INSTALL_DIR = E:\iconv-1.9.1.win32
APACHE_INSTALL_DIR = E:\Apache2
-
+RELEASE_VER = 0.90
Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build/win32/makefile?rev=390245&r1=390244&r2=390245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Thu Mar 30 13:32:30 2006
@@ -234,6 +234,22 @@
copy $(AXIS2_SOURCE_DIR)\samples\server\echo\services.xml $(AXIS2_SERVICES)\echo
+axis2_services_notify:
+ $(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\echo $(AXIS2_SOURCE_DIR)\samples\server\notify\*.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib $(AXIS2_TRANSPORT_RECEIVER).lib $(AXIS2_TRANSPORT_SENDER).lib /DLL /OUT:notify.dll
+ del *.obj
+
+ if not exist $(AXIS2_SERVICES)\notify mkdir $(AXIS2_SERVICES)\notify
+
+ copy notify.dll $(AXIS2_SERVICES)\notify
+
+ del *.dll
+
+ del *.lib
+
+ copy $(AXIS2_SOURCE_DIR)\samples\server\notify\services.xml $(AXIS2_SERVICES)\notify
+
+
axis2_services_math:
$(CC) $(CFLAGS) /I$(AXIS2_SOURCE_DIR)\samples\server\math $(AXIS2_SOURCE_DIR)\samples\server\math\*.c /c
$(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib $(AXIS2_TRANSPORT_RECEIVER).lib $(AXIS2_TRANSPORT_SENDER).lib /DLL /OUT:math.dll
@@ -310,18 +326,97 @@
del addr_echo.exe
-axis2_client_google_search:
+axis2_client_google_spell:
$(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCP) $(AXIS2_SOURCE_DIR)\samples\client\google\*.c /c
- $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:google_search.exe
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:google_spell.exe
del *.obj
if not exist $(AXIS2_BINS)\samples mkdir $(AXIS2_BINS)\samples
- copy google_search.exe $(AXIS2_BINS)\samples
- del google_search.exe
+ copy google_spell.exe $(AXIS2_BINS)\samples
+ del google_spell.exe
-all: clean_make_dir clean deploy axis2_win axis2_util axis2_parser axis2_om axis2_soap axis2_wsdl axis2_engine axis2_http_sender axis2_http_receiver axis2_mod_addr axis2_server axis2_services_echo axis2_services_math axis2_client_echo axis2_client_math axis2_client_echo_addr axis2_client_google_search copy_include clean_make_dir
+axis2_client_notify:
+ $(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCP) $(AXIS2_SOURCE_DIR)\samples\client\notify\*.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:notify.exe
+ del *.obj
+
+ if not exist $(AXIS2_BINS)\samples mkdir $(AXIS2_BINS)\samples
+
+ copy notify.exe $(AXIS2_BINS)\samples
+ del notify.exe
+ del notify.exp
+
+
+axis2_client_echo_non_blocking:
+ $(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCP) $(AXIS2_SOURCE_DIR)\samples\client\echo_non_blocking\*.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIS2_OM).lib $(AXIS2_SOAP).lib $(AXIS2_PARSER).lib $(AXIS2_WINDOWS).lib $(LIBS) $(AXIS2_ENGINE).lib /OUT:echo_non_blocking.exe
+ del *.obj
+
+ if not exist $(AXIS2_BINS)\samples mkdir $(AXIS2_BINS)\samples
+
+ copy echo_non_blocking.exe $(AXIS2_BINS)\samples
+ del echo_non_blocking.exe
+
+copy_extra:
+ copy $(AXIS2_SOURCE_DIR)\INSTALL $(AXIS2_INSTALL_DIR)
+ copy $(AXIS2_SOURCE_DIR)\LICENSE $(AXIS2_INSTALL_DIR)
+ copy $(AXIS2_SOURCE_DIR)\CREDITS $(AXIS2_INSTALL_DIR)
+
+copy_samples:
+ if not exist $(AXIS2_INSTALL_DIR)\samples mkdir $(AXIS2_INSTALL_DIR)\samples
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client mkdir $(AXIS2_INSTALL_DIR)\samples\client
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\echo mkdir $(AXIS2_INSTALL_DIR)\samples\client\echo
+ copy $(AXIS2_SOURCE_DIR)\samples\client\echo\*.c $(AXIS2_INSTALL_DIR)\samples\client\echo
+ copy $(AXIS2_SOURCE_DIR)\samples\client\echo\*.h $(AXIS2_INSTALL_DIR)\samples\client\echo
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\math mkdir $(AXIS2_INSTALL_DIR)\samples\client\math
+ copy $(AXIS2_SOURCE_DIR)\samples\client\math\*.c $(AXIS2_INSTALL_DIR)\samples\client\math
+ copy $(AXIS2_SOURCE_DIR)\samples\client\math\*.h $(AXIS2_INSTALL_DIR)\samples\client\math
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\addr_echo mkdir $(AXIS2_INSTALL_DIR)\samples\client\addr_echo
+ copy $(AXIS2_SOURCE_DIR)\samples\client\addr_echo\*.c $(AXIS2_INSTALL_DIR)\samples\client\addr_echo
+ copy $(AXIS2_SOURCE_DIR)\samples\client\addr_echo\README.txt $(AXIS2_INSTALL_DIR)\samples\client\addr_echo
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\google mkdir $(AXIS2_INSTALL_DIR)\samples\client\google
+ copy $(AXIS2_SOURCE_DIR)\samples\client\google\*.c $(AXIS2_INSTALL_DIR)\samples\client\google
+ copy $(AXIS2_SOURCE_DIR)\samples\client\google\README.txt $(AXIS2_INSTALL_DIR)\samples\client\google
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\notify mkdir $(AXIS2_INSTALL_DIR)\samples\client\notify
+ copy $(AXIS2_SOURCE_DIR)\samples\client\notify\*.c $(AXIS2_INSTALL_DIR)\samples\client\notify
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\client\echo_non_blocking mkdir $(AXIS2_INSTALL_DIR)\samples\client\echo_non_blocking
+ copy $(AXIS2_SOURCE_DIR)\samples\client\echo_non_blocking\*.c $(AXIS2_INSTALL_DIR)\samples\client\echo_non_blocking
+ copy $(AXIS2_SOURCE_DIR)\samples\client\echo_non_blocking\README.txt $(AXIS2_INSTALL_DIR)\samples\client\echo_non_blocking
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\server mkdir $(AXIS2_INSTALL_DIR)\samples\server
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\server\echo mkdir $(AXIS2_INSTALL_DIR)\samples\server\echo
+ copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.c $(AXIS2_INSTALL_DIR)\samples\server\echo
+ copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.h $(AXIS2_INSTALL_DIR)\samples\server\echo
+ copy $(AXIS2_SOURCE_DIR)\samples\server\echo\*.xml $(AXIS2_INSTALL_DIR)\samples\server\echo
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\server\math mkdir $(AXIS2_INSTALL_DIR)\samples\server\math
+ copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.c $(AXIS2_INSTALL_DIR)\samples\server\math
+ copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.h $(AXIS2_INSTALL_DIR)\samples\server\math
+ copy $(AXIS2_SOURCE_DIR)\samples\server\math\*.xml $(AXIS2_INSTALL_DIR)\samples\server\math
+
+
+ if not exist $(AXIS2_INSTALL_DIR)\samples\server\notify mkdir $(AXIS2_INSTALL_DIR)\samples\server\notify
+ copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.c $(AXIS2_INSTALL_DIR)\samples\server\notify
+ copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.h $(AXIS2_INSTALL_DIR)\samples\server\notify
+ copy $(AXIS2_SOURCE_DIR)\samples\server\notify\*.xml $(AXIS2_INSTALL_DIR)\samples\server\notify
+
+mv_dist:
+ if exist ..\axis2c-bin-$(RELEASE_VER)-win32 rmdir /S /Q ..\axis2c-bin-$(RELEASE_VER)-win32
+ xcopy /E /I $(AXIS2_INSTALL_DIR) ..\axis2c-bin-$(RELEASE_VER)-win32
+ rmdir /S /Q $(AXIS2_INSTALL_DIR)
+
+all: clean_make_dir clean deploy axis2_win axis2_util axis2_parser axis2_om axis2_soap axis2_wsdl axis2_engine axis2_http_sender axis2_http_receiver axis2_mod_addr axis2_server axis2_services_echo axis2_services_math axis2_services_notify axis2_client_echo axis2_client_math axis2_client_echo_addr axis2_client_google_spell axis2_client_notify axis2_client_echo_non_blocking copy_include clean_make_dir
install: all
-
\ No newline at end of file
+
+dist: all axis2_apache_module copy_extra copy_samples mv_dist
\ No newline at end of file
Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=390245&r1=390244&r2=390245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Thu Mar 30 13:32:30 2006
@@ -471,12 +471,14 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *response = NULL;
axis2_soap_envelope_t *response_envelope = NULL;
- axis2_char_t *address = NULL;
+ axis2_char_t *address = NULL;
+ axis2_char_t *epr_address = NULL;
/* Usual Request-Response Sync implemetation */
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(call_impl->to, env);
+ epr_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(call_impl->to, env);
+ address = AXIS2_STRDUP(epr_address, env);
AXIS2_PROPERTY_SET_VALUE(property, env, address);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=390245&r1=390244&r2=390245&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Thu Mar 30 13:32:30 2006
@@ -350,7 +350,7 @@
#endif
}
axis2_env_free_masked(thread_env, 0x2);
- axis2_xml_reader_cleanup();
+ /*axis2_xml_reader_cleanup();*/
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD((*env)->thread_pool, thd);
#endif