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/02/27 10:12:21 UTC
svn commit: r512184 - in /webservices/axis2/trunk/c: build/win32/
ides/vc/axis2c/ ides/vc/axis2c/axis2_http_receiver/ ides/vc/axis2c/clients/
include/ modules/core/transport/http/sender/
Author: nandika
Date: Tue Feb 27 01:12:19 2007
New Revision: 512184
URL: http://svn.apache.org/viewvc?view=rev&rev=512184
Log:
makefile updated, patch applied from jared , vc projects updated
Modified:
webservices/axis2/trunk/c/build/win32/makefile
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln
webservices/axis2/trunk/c/ides/vc/axis2c/clients/clients.sln
webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.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=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Tue Feb 27 01:12:19 2007
@@ -31,6 +31,9 @@
# directory structure of install directory
+
+AXIS2_RELEASE_DIR=axis2c-bin-$(RELEASE_VER)-win32
+
AXIS2_BINDIR = ..\deploy
AXIS2_SERVICES = $(AXIS2_BINDIR)\services
AXIS2_MODULES = $(AXIS2_BINDIR)\modules
@@ -670,9 +673,11 @@
mv_dist:
+ cd $(AXIS2_BINDIR)
cd ..
- if exist axis2c-bin-$(RELEASE_VER)-win32 rmdir /S /Q axis2c-bin-$(RELEASE_VER)-win32
- rename deploy axis2c-bin-$(RELEASE_VER)-win32
+ if exist $(AXIS2_RELEASE_DIR) rmdir /S /Q $(AXIS2_RELEASE_DIR)
+ rename deploy $(AXIS2_RELEASE_DIR)
+
all_services: axis2_services_echo axis2_services_math axis2_services_notify axis2_services_sg_math axis2_services_mtom axis2_services_calculator
@@ -1156,5 +1161,5 @@
install: all
-dist: all mod_rampart_all axis2_server_modules savan copy_extra copy_samples mv_dist
+dist: all axis2_server_modules savan copy_extra copy_samples mv_dist
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj?view=diff&rev=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj Tue Feb 27 01:12:19 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib axis2_http_common.lib"
+ AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
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=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln Tue Feb 27 01:12:19 2007
@@ -92,6 +92,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_savan", "mod_savan\mod_savan.vcproj", "{C781F3DE-8F38-4778-A50F-003D04336A10}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rampart", "mod_rampart\mod_rampart.vcproj", "{E29A8228-26E8-431F-A218-3F2849BC724D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -154,6 +156,10 @@
{C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.Build.0 = Debug|Win32
{C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.ActiveCfg = Release|Win32
{C781F3DE-8F38-4778-A50F-003D04336A10}.Release|Win32.Build.0 = Release|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Debug|Win32.Build.0 = Debug|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Release|Win32.ActiveCfg = Release|Win32
+ {E29A8228-26E8-431F-A218-3F2849BC724D}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/clients/clients.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/clients/clients.sln?view=diff&rev=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/clients/clients.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/clients/clients.sln Tue Feb 27 01:12:19 2007
@@ -7,12 +7,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "math", "math\math.vcproj", "{9121BA33-CE71-4775-AD78-1114696BFEC8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_echo", "..\..\..\..\..\SandeshaC\ides\vc8\rm_echo\rm_echo.vcproj", "{38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_engine", "..\axis2_engine\axis2_engine.vcproj", "{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandesha2", "..\..\..\..\..\SandeshaC\ides\vc8\sandesha2\sandesha2.vcproj", "{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -31,18 +27,10 @@
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Debug|Win32.Build.0 = Debug|Win32
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Release|Win32.ActiveCfg = Release|Win32
{9121BA33-CE71-4775-AD78-1114696BFEC8}.Release|Win32.Build.0 = Release|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Debug|Win32.ActiveCfg = Debug|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Debug|Win32.Build.0 = Debug|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Release|Win32.ActiveCfg = Release|Win32
- {38A618E5-CB4C-4D3C-AB22-8EE82A3D4FFA}.Release|Win32.Build.0 = Release|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Debug|Win32.ActiveCfg = Debug|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Debug|Win32.Build.0 = Debug|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Release|Win32.ActiveCfg = Release|Win32
{9524B8C5-79D9-4470-9A47-8BD163ABBB15}.Release|Win32.Build.0 = Release|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Debug|Win32.ActiveCfg = Debug|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Debug|Win32.Build.0 = Debug|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.ActiveCfg = Release|Win32
- {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h?view=diff&rev=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h Tue Feb 27 01:12:19 2007
@@ -35,6 +35,7 @@
#include <axiom_output.h>
#include <axis2_http_simple_response.h>
#include <axiom_soap_envelope.h>
+#include <axis2_http_client.h>
#ifdef __cplusplus
@@ -73,6 +74,11 @@
const axis2_char_t *str_url,
const axis2_char_t *soap_action);
+ axis2_http_client_t* (AXIS2_CALL *
+ get_client)(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env);
+
/**
* @param sender sender
* @param env pointer to environment struct
@@ -183,6 +189,9 @@
#define AXIS2_SOAP_OVER_HTTP_SENDER_SEND(sender, env, msg_ctx, output, url, \
soap_action) ((sender)->ops->send (sender, env, msg_ctx\
,output, url, soap_action))
+
+#define AXIS2_SOAP_OVER_HTTP_SENDER_GET_CLIENT(sender, env) \
+ ((sender)->ops->get_client(sender, env))
/** Set chunked.
@sa axis2_soap_over_http_sender_ops#set_chunked */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Tue Feb 27 01:12:19 2007
@@ -548,6 +548,7 @@
const axis2_char_t *soap_ns_uri = NULL;
axiom_soap_envelope_t *response_envelope = NULL;
axis2_op_t *op = NULL;
+ axis2_http_client_t *client = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -616,6 +617,10 @@
status = AXIS2_SOAP_OVER_HTTP_SENDER_SEND(sender, env, msg_ctx, out, url
, soap_action);
+ /* Get the client used to send. We will own this, and free it after
+ * having read the response */
+ client = AXIS2_SOAP_OVER_HTTP_SENDER_GET_CLIENT(sender, env);
+
/*
* TODO check for errors
*/
@@ -647,14 +652,31 @@
}
}
+ /* Free the client */
+ if (client)
+ {
+ AXIS2_HTTP_CLIENT_FREE(client, env);
+ client = NULL;
+ }
+
return status;
}
/**
* Following block distinguish the exposed part of the dll.
*/
+
+/* When building for static deployment, give the get and remove methods
+ * unique names. This avoids having the linker fail with duplicate symbol
+ * errors.
+ */
+
AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
axis2_get_instance(
+#else
+axis2_http_transport_sender_get_instance(
+#endif
struct axis2_transport_sender **inst,
const axis2_env_t *env)
{
@@ -669,7 +691,11 @@
}
AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
axis2_remove_instance(
+#else
+axis2_http_transport_sender_remove_instance(
+#endif
axis2_transport_sender_t *inst,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?view=diff&rev=512184&r1=512183&r2=512184
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Tue Feb 27 01:12:19 2007
@@ -80,6 +80,11 @@
const axis2_char_t *str_url,
const axis2_char_t *soap_action);
+axis2_http_client_t* AXIS2_CALL
+axis2_soap_over_http_sender_get_client(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env);
+
axis2_status_t AXIS2_CALL
axis2_soap_over_http_sender_set_chunked(
axis2_soap_over_http_sender_t *sender,
@@ -162,6 +167,8 @@
sender_impl->sender.ops->send =
axis2_soap_over_http_sender_send;
+ sender_impl->sender.ops->get_client =
+ axis2_soap_over_http_sender_get_client;
sender_impl->sender.ops->set_chunked =
axis2_soap_over_http_sender_set_chunked;
sender_impl->sender.ops->set_om_output =
@@ -564,6 +571,16 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_HTTP_CLIENT_TRANSPORT_ERROR,
AXIS2_FAILURE);
return AXIS2_FAILURE;
+}
+
+
+axis2_http_client_t* AXIS2_CALL
+axis2_soap_over_http_sender_get_client(
+ axis2_soap_over_http_sender_t *sender,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ return AXIS2_INTF_TO_IMPL(sender)->client;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org