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 na...@apache.org on 2007/03/23 08:21:26 UTC
svn commit: r521605 - in /webservices/axis2/trunk/c: ides/vc/axis2c/
ides/vc/axis2c/mod_axis2/ ides/vc/axis2c/mod_axis2_IIS/
modules/core/transport/http/server/IIS/ woden/src/builder/
woden/src/builder/wsdl10/
Author: nandika
Date: Fri Mar 23 00:21:23 2007
New Revision: 521605
URL: http://svn.apache.org/viewvc?view=rev&rev=521605
Log:
http_out_transport_info compile errors fixed
Modified:
webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln
webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2_IIS/mod_axis2_IIS.vcproj
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
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=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln Fri Mar 23 00:21:23 2007
@@ -74,6 +74,10 @@
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_axis2_IIS", "mod_axis2_IIS\mod_axis2_IIS.vcproj", "{1D949369-9C4B-4C59-9F2A-278FD8CE0D41}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_axis2", "mod_axis2\mod_axis2.vcproj", "{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -124,6 +128,14 @@
{9441F689-6ED3-4FF8-9B13-2E80E391DF39}.Debug|Win32.Build.0 = Debug|Win32
{9441F689-6ED3-4FF8-9B13-2E80E391DF39}.Release|Win32.ActiveCfg = Release|Win32
{9441F689-6ED3-4FF8-9B13-2E80E391DF39}.Release|Win32.Build.0 = Release|Win32
+ {1D949369-9C4B-4C59-9F2A-278FD8CE0D41}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1D949369-9C4B-4C59-9F2A-278FD8CE0D41}.Debug|Win32.Build.0 = Debug|Win32
+ {1D949369-9C4B-4C59-9F2A-278FD8CE0D41}.Release|Win32.ActiveCfg = Release|Win32
+ {1D949369-9C4B-4C59-9F2A-278FD8CE0D41}.Release|Win32.Build.0 = Release|Win32
+ {9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Debug|Win32.Build.0 = Debug|Win32
+ {9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Release|Win32.ActiveCfg = Release|Win32
+ {9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj Fri Mar 23 00:21:23 2007
@@ -63,6 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="libapr-1.lib apr-1.lib libhttpd.lib axis2_util.lib axis2_engine.lib axiom.lib axis2_parser.lib"
LinkIncremental="2"
+ AdditionalLibraryDirectories=".\..\deploy\lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2_IIS/mod_axis2_IIS.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2_IIS/mod_axis2_IIS.vcproj?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2_IIS/mod_axis2_IIS.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2_IIS/mod_axis2_IIS.vcproj Fri Mar 23 00:21:23 2007
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axiom.lib axis2_parser.lib axis2_util.lib axis2_engine.lib axis2_http_receiver.lib axis2_http_sender.lib axis2_http_util.lib"
+ AdditionalDependencies="axiom.lib axis2_parser.lib axis2_util.lib axis2_engine.lib axis2_http_receiver.lib axis2_http_sender.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=".\..\deploy\lib"
ModuleDefinitionFile=".\..\..\..\..\modules\core\transport\http\server\IIS\mod_axis2.def"
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c Fri Mar 23 00:21:23 2007
@@ -138,13 +138,11 @@
env, axis2_iis_out_transport_info_set_content_type);
axis2_http_out_transport_info_set_char_encoding_func(http_out_info,
env, axis2_iis_out_transport_info_set_char_encoding);
- axis2_http_out_transport_info_set_free_function(http_out_info,
+ axis2_http_out_transport_info_set_free_func(http_out_info,
env, axis2_iis_out_transport_info_free);
return http_out_info;
}
-
-
axis2_char_t *
axis2_iis_out_transport_get_content(axis2_http_out_transport_info_t *info)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.h Fri Mar 23 00:21:23 2007
@@ -50,7 +50,7 @@
void *transport_info,
const axis2_env_t *env);
-axis2_char_t *axis2_http_out_transport_get_content(axis2_http_out_transport_info_t *out_transport_info);
+axis2_char_t *axis2_iis_out_transport_get_content(axis2_http_out_transport_info_t *out_transport_info);
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Fri Mar 23 00:21:23 2007
@@ -348,7 +348,7 @@
const char *headers_vhtml[2];
headers_vhtml[1] = (char *)malloc(16);
- headers_vhtml[0] = axis2_http_out_transport_get_content(iis_out_transport_info);
+ headers_vhtml[0] = axis2_iis_out_transport_get_content(iis_out_transport_info);
sprintf(headers_vhtml[1], "%d", body_str_len);
if(!start_response(lpECB, send_status, NULL, headers_names, headers_vhtml, 2))
{
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Fri Mar 23 00:21:23 2007
@@ -3752,9 +3752,9 @@
{
int len = 0;
axiom_text_t *text_node = NULL;
-
- text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- const axis2_char_t *temp_str = axiom_text_get_value(text_node, env);
+ const axis2_char_t *temp_str = NULL;
+ text_node = axiom_node_get_data_element(node, env);
+ temp_str = axiom_text_get_value(text_node, env);
text_value = axis2_strtrim(env, temp_str, NULL);
len = axis2_strlen(text_value);
if (len > 0)
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=521605&r1=521604&r2=521605
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Fri Mar 23 00:21:23 2007
@@ -3569,9 +3569,9 @@
{
int len = 0;
axiom_text_t *text_node = NULL;
-
- text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- const axis2_char_t *temp_str = axiom_text_get_value(text_node, env);
+ const axis2_char_t *temp_str = NULL;
+ text_node = axiom_node_get_data_element(node, env);
+ temp_str = axiom_text_get_value(text_node, env);
text_value = axis2_strtrim(env, temp_str, NULL);
len = axis2_strlen(text_value);
if (len > 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org