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/03/22 13:08:06 UTC
svn commit: r521233 - in /webservices/axis2/trunk/c: ides/vc/axis2c/
ides/vc/axis2c/axis2_engine/ ides/vc/axis2c/axis2_http_receiver/
ides/vc/axis2c/axis2_http_sender/ ides/vc/axis2c/clients/yahoo/
ides/vc/axis2c/mod_axis2/ include/ modules/core/transp...
Author: nandika
Date: Thu Mar 22 05:08:05 2007
New Revision: 521233
URL: http://svn.apache.org/viewvc?view=rev&rev=521233
Log:
compilation errors fixed, axis2_out_transport_info.h axis2_out_transport_info.c modified
Modified:
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_http_receiver/axis2_http_receiver.vcproj
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/ides/vc/axis2c/clients/yahoo/yahoo.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/mod_axis2/mod_axis2.vcproj
webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj Thu Mar 22 05:08:05 2007
@@ -239,10 +239,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\modules\core\engine\event.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\modules\core\engine\handler.c"
>
</File>
@@ -438,14 +434,6 @@
<Filter
Name="description"
>
- <File
- RelativePath="..\..\..\..\modules\core\description\axis2_client_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\modules\core\description\client_utils.c"
- >
- </File>
<File
RelativePath="..\..\..\..\modules\core\description\desc.c"
>
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=521233&r1=521232&r2=521233
==============================================================================
--- 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 Thu Mar 22 05:08:05 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib"
+ AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
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=521233&r1=521232&r2=521233
==============================================================================
--- 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 Thu Mar 22 05:08:05 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib axis2_http_util.lib ssleay32MTd.lib libeay32MTd.lib libcurl_imp.lib"
+ AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib ssleay32MTd.lib libeay32MTd.lib libcurl_imp.lib axiom.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateDebugInformation="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=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln Thu Mar 22 05:08:05 2007
@@ -10,78 +10,70 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axiom", "axiom\axiom.vcproj", "{7C816A64-FA96-4C6C-8DB0-5256441F54BC}"
ProjectSection(ProjectDependencies) = postProject
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_engine", "axis2_engine\axis2_engine.vcproj", "{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
ProjectSection(ProjectDependencies) = postProject
- {DC6F6E35-5D1D-46D9-8358-3324FC677A1F} = {DC6F6E35-5D1D-46D9-8358-3324FC677A1F}
- {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
+ {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
+ {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
+ {DC6F6E35-5D1D-46D9-8358-3324FC677A1F} = {DC6F6E35-5D1D-46D9-8358-3324FC677A1F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_schema", "xml_schema\xml_schema.vcproj", "{1C869543-9F6E-45D6-8780-B078745C3E67}"
ProjectSection(ProjectDependencies) = postProject
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
+ {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "woden", "woden\woden.vcproj", "{DC6F6E35-5D1D-46D9-8358-3324FC677A1F}"
ProjectSection(ProjectDependencies) = postProject
- {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_receiver", "axis2_http_receiver\axis2_http_receiver.vcproj", "{9441F689-6ED3-4FF8-9B13-2E80E391DF39}"
- ProjectSection(ProjectDependencies) = postProject
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
- {9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
- {3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
+ {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_mod_log", "axis2_mod_log\axis2_mod_log.vcproj", "{423F7156-84C4-43C1-855A-D0FEE24DB0A0}"
ProjectSection(ProjectDependencies) = postProject
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
- {9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
+ {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
+ {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_server", "axis2_http_server\axis2_http_server.vcproj", "{D2975362-DEAA-41BF-AE5E-E6FCDB526726}"
ProjectSection(ProjectDependencies) = postProject
- {7332F525-8C77-4FB3-A0C0-FCEB2382F03C} = {7332F525-8C77-4FB3-A0C0-FCEB2382F03C}
- {DC6F6E35-5D1D-46D9-8358-3324FC677A1F} = {DC6F6E35-5D1D-46D9-8358-3324FC677A1F}
- {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
- {423F7156-84C4-43C1-855A-D0FEE24DB0A0} = {423F7156-84C4-43C1-855A-D0FEE24DB0A0}
- {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
- {0DEEAA74-F06D-4C60-B408-1B875B4FB338} = {0DEEAA74-F06D-4C60-B408-1B875B4FB338}
- {9441F689-6ED3-4FF8-9B13-2E80E391DF39} = {9441F689-6ED3-4FF8-9B13-2E80E391DF39}
- {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
- {9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
+ {9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
+ {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
+ {9441F689-6ED3-4FF8-9B13-2E80E391DF39} = {9441F689-6ED3-4FF8-9B13-2E80E391DF39}
+ {0DEEAA74-F06D-4C60-B408-1B875B4FB338} = {0DEEAA74-F06D-4C60-B408-1B875B4FB338}
+ {7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
+ {423F7156-84C4-43C1-855A-D0FEE24DB0A0} = {423F7156-84C4-43C1-855A-D0FEE24DB0A0}
+ {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
+ {DC6F6E35-5D1D-46D9-8358-3324FC677A1F} = {DC6F6E35-5D1D-46D9-8358-3324FC677A1F}
+ {7332F525-8C77-4FB3-A0C0-FCEB2382F03C} = {7332F525-8C77-4FB3-A0C0-FCEB2382F03C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_mod_addr", "axis2_mod_addr\axis2_mod_addr.vcproj", "{0DEEAA74-F06D-4C60-B408-1B875B4FB338}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_sender", "axis2_http_sender\axis2_http_sender.vcproj", "{7332F525-8C77-4FB3-A0C0-FCEB2382F03C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_http_receiver", "axis2_http_receiver\axis2_http_receiver.vcproj", "{9441F689-6ED3-4FF8-9B13-2E80E391DF39}"
ProjectSection(ProjectDependencies) = postProject
+ {DC6F6E35-5D1D-46D9-8358-3324FC677A1F} = {DC6F6E35-5D1D-46D9-8358-3324FC677A1F}
+ {1C869543-9F6E-45D6-8780-B078745C3E67} = {1C869543-9F6E-45D6-8780-B078745C3E67}
{7C816A64-FA96-4C6C-8DB0-5256441F54BC} = {7C816A64-FA96-4C6C-8DB0-5256441F54BC}
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8} = {D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}
{9524B8C5-79D9-4470-9A47-8BD163ABBB15} = {9524B8C5-79D9-4470-9A47-8BD163ABBB15}
{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_savan", "mod_savan\mod_savan.vcproj", "{C781F3DE-8F38-4778-A50F-003D04336A10}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -112,10 +104,6 @@
{DC6F6E35-5D1D-46D9-8358-3324FC677A1F}.Debug|Win32.Build.0 = Debug|Win32
{DC6F6E35-5D1D-46D9-8358-3324FC677A1F}.Release|Win32.ActiveCfg = Release|Win32
{DC6F6E35-5D1D-46D9-8358-3324FC677A1F}.Release|Win32.Build.0 = Release|Win32
- {9441F689-6ED3-4FF8-9B13-2E80E391DF39}.Debug|Win32.ActiveCfg = Debug|Win32
- {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
{423F7156-84C4-43C1-855A-D0FEE24DB0A0}.Debug|Win32.ActiveCfg = Debug|Win32
{423F7156-84C4-43C1-855A-D0FEE24DB0A0}.Debug|Win32.Build.0 = Debug|Win32
{423F7156-84C4-43C1-855A-D0FEE24DB0A0}.Release|Win32.ActiveCfg = Release|Win32
@@ -132,14 +120,10 @@
{7332F525-8C77-4FB3-A0C0-FCEB2382F03C}.Debug|Win32.Build.0 = Debug|Win32
{7332F525-8C77-4FB3-A0C0-FCEB2382F03C}.Release|Win32.ActiveCfg = Release|Win32
{7332F525-8C77-4FB3-A0C0-FCEB2382F03C}.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
- {C781F3DE-8F38-4778-A50F-003D04336A10}.Debug|Win32.ActiveCfg = Debug|Win32
- {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
+ {9441F689-6ED3-4FF8-9B13-2E80E391DF39}.Debug|Win32.ActiveCfg = Debug|Win32
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj Thu Mar 22 05:08:05 2007
@@ -40,6 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories=".\..\..\..\..\..\include;.\..\..\..\..\..\util\include;.\..\..\..\..\..\axiom\include;.\..\..\..\..\..\xml_schema\include;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
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=521233&r1=521232&r2=521233
==============================================================================
--- 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 Thu Mar 22 05:08:05 2007
@@ -40,6 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="./../../../../include;./../../../../util/include;./../../../../axiom/include;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_AXIS2_EXPORTS;AXIS2_DECLARE_EXPORT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -60,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libapr.lib apr.lib libhttpd.lib axis2_util.lib axis2_engine.lib axiom.lib axis2_parser.lib"
+ AdditionalDependencies="libapr-1.lib apr-1.lib libhttpd.lib axis2_util.lib axis2_engine.lib axiom.lib axis2_parser.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -208,6 +209,10 @@
</File>
<File
RelativePath="..\..\..\..\modules\core\transport\http\server\apache2\axis2_apache2_worker.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\include\axis2_http_out_transport_info.h"
>
</File>
</Filter>
Modified: webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h Thu Mar 22 05:08:05 2007
@@ -48,8 +48,21 @@
{
axis2_http_simple_response_t *response;
axis2_char_t *encoding;
- };
+ axis2_status_t (AXIS2_CALL *set_content_type)(
+ axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
+ axis2_char_t *content_type);
+
+ axis2_status_t (AXIS2_CALL *set_char_encoding)
+ (axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
+ axis2_char_t *encoding);
+
+ axis2_status_t (AXIS2_CALL *free_function)
+ (axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env);
+ };
/**
* @param info pointer to info
* @param env pointer to environment struct
@@ -98,6 +111,30 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_free_void_arg(void *transport_info,
const axis2_env_t *env);
+
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_http_out_transport_info_set_char_encoding_func(
+ axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env,
+ axis2_status_t (AXIS2_CALL *set_encoding)
+ (axis2_http_out_transport_info_t *, const axis2_env_t *,axis2_char_t *));
+
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_http_out_transport_info_set_content_type_func(
+ axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env,
+ axis2_status_t (AXIS2_CALL *set_content_type)(
+ axis2_http_out_transport_info_t *,
+ const axis2_env_t*,axis2_char_t *));
+
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_http_out_transport_info_set_free_func(
+ axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env,
+ axis2_status_t (AXIS2_CALL *free_function)(
+ axis2_http_out_transport_info_t *,
+ const axis2_env_t*, axis2_char_t *));
+
/** Set content type. */
#define AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CONTENT_TYPE(out_transport_info, \
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Thu Mar 22 05:08:05 2007
@@ -20,6 +20,8 @@
#include <axis2_http_transport.h>
#include <axis2_string.h>
+
+
AXIS2_EXTERN axis2_http_out_transport_info_t *AXIS2_CALL
axis2_http_out_transport_info_create(
const axis2_env_t *env,
@@ -39,7 +41,9 @@
}
http_out_transport_info->response = response;
http_out_transport_info->encoding = NULL;
-
+ http_out_transport_info->set_char_encoding = NULL;
+ http_out_transport_info->set_content_type = NULL;
+ http_out_transport_info->free_function = NULL;
return http_out_transport_info;
}
@@ -49,7 +53,6 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if(http_out_transport_info->response)
{
AXIS2_HTTP_SIMPLE_RESPONSE_FREE(http_out_transport_info->response, env);
@@ -86,33 +89,39 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
- if (http_out_transport_info->encoding)
- {
- axis2_char_t *charset_pos = axis2_strcasestr(content_type, "charset");
- if (!charset_pos)
- {
- tmp1 = axis2_stracat(content_type, ";charset=", env);
- tmp2 = axis2_stracat(tmp1, http_out_transport_info->encoding, env);
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- tmp2));
- AXIS2_FREE(env->allocator, tmp1);
- AXIS2_FREE(env->allocator, tmp2);
- }
- else
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- content_type));
- }
- }
- else
- {
- if(http_out_transport_info->response)
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
- axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
- content_type));
- }
+ if(http_out_transport_info->set_content_type)
+ {
+ return http_out_transport_info->set_content_type(http_out_transport_info, env, content_type);
+ }else{
+
+ if (http_out_transport_info->encoding)
+ {
+ axis2_char_t *charset_pos = axis2_strcasestr(content_type, "charset");
+ if (!charset_pos)
+ {
+ tmp1 = axis2_stracat(content_type, ";charset=", env);
+ tmp2 = axis2_stracat(tmp1, http_out_transport_info->encoding, env);
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
+ axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ tmp2));
+ AXIS2_FREE(env->allocator, tmp1);
+ AXIS2_FREE(env->allocator, tmp2);
+ }
+ else
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
+ axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ content_type));
+ }
+ }
+ else
+ {
+ if(http_out_transport_info->response)
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(http_out_transport_info->response, env,
+ axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
+ content_type));
+ }
+ }
return AXIS2_SUCCESS;
}
@@ -125,13 +134,48 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
+ if(http_out_transport_info->set_char_encoding)
+ {
+ return http_out_transport_info->set_char_encoding(http_out_transport_info, env, encoding);
+ }else{
+
+ if (http_out_transport_info->encoding)
+ {
+ AXIS2_FREE(env->allocator, http_out_transport_info->encoding);
+ }
+ http_out_transport_info->encoding = axis2_strdup(encoding, env);
+ }
+ return AXIS2_SUCCESS;
+}
- if (http_out_transport_info->encoding)
- {
- AXIS2_FREE(env->allocator, http_out_transport_info->encoding);
- }
- http_out_transport_info->encoding = axis2_strdup(encoding, env);
+AXIS2_EXTERN void AXIS2_CALL
+ axis2_http_out_transport_info_set_char_encoding_func(
+ axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env,
+ axis2_status_t (AXIS2_CALL *set_char_encoding)
+ (axis2_http_out_transport_info_t *, const axis2_env_t *,axis2_char_t *))
+{
+ out_transport_info->set_char_encoding = set_char_encoding;
+}
- return AXIS2_SUCCESS;
+AXIS2_EXTERN void AXIS2_CALL
+ axis2_http_out_transport_info_set_content_type_func(
+ axis2_http_out_transport_info_t *out_transport_info,
+ const axis2_env_t *env,
+ axis2_status_t (AXIS2_CALL *set_content_type)(
+ axis2_http_out_transport_info_t *,
+ const axis2_env_t*,axis2_char_t *))
+{
+ out_transport_info->set_content_type = set_content_type;
}
+AXIS2_EXTERN void AXIS2_CALL
+axis2_http_out_transport_info_set_free_func(
+axis2_http_out_transport_info_t *out_transport_info,
+const axis2_env_t *env,
+axis2_status_t (AXIS2_CALL *free_function)(
+axis2_http_out_transport_info_t *,
+const axis2_env_t*, axis2_char_t *))
+{
+ out_transport_info->free_function = free_function;
+}
\ No newline at end of file
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Thu Mar 22 05:08:05 2007
@@ -31,29 +31,6 @@
#define AXIS2_INTF_TO_IMPL(out_transport_info) \
((axis2_apache2_out_transport_info_t *)(out_transport_info))
-axis2_http_out_transport_info_t *AXIS2_CALL
-axis2_apache2_out_transport_info_create(
- const axis2_env_t *env,
- request_rec *request)
-{
- axis2_apache2_out_transport_info_t *info = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
- info = (axis2_apache2_out_transport_info_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_apache2_out_transport_info_t));
-
- if (! info)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- info->request = request;
- info->encoding = NULL;
-
- return &(info->out_transport_info);
-}
-
axis2_status_t AXIS2_CALL
axis2_apache2_out_transport_info_free_void_arg(
void *transport_info,
@@ -67,7 +44,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_http_out_transport_info_free(
+axis2_apache_out_transport_info_free(
axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env)
{
@@ -88,7 +65,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_http_out_transport_info_set_content_type(
+axis2_apache_out_transport_info_set_content_type(
axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env,
const axis2_char_t *content_type)
@@ -122,7 +99,7 @@
axis2_status_t AXIS2_CALL
-axis2_http_out_transport_info_set_char_encoding(
+axis2_apache_out_transport_info_set_char_encoding(
axis2_http_out_transport_info_t *info,
const axis2_env_t *env,
const axis2_char_t *encoding)
@@ -138,5 +115,37 @@
info->encoding = axis2_strdup(encoding, env);
return AXIS2_SUCCESS;
+}
+
+
+
+axis2_http_out_transport_info_t *AXIS2_CALL
+axis2_apache2_out_transport_info_create(
+ const axis2_env_t *env,
+ request_rec *request)
+{
+ axis2_apache2_out_transport_info_t *info = NULL;
+ axis2_http_out_transport_info_t *out_transport_info = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+
+ info = (axis2_apache2_out_transport_info_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(
+ axis2_apache2_out_transport_info_t));
+
+ if (! info)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+ info->request = request;
+ info->encoding = NULL;
+
+ out_transport_info = &(info->out_transport_info);
+
+ axis2_http_out_transport_info_set_char_encoding_func(out_transport_info, env, axis2_apache_out_transport_info_set_char_encoding);
+ axis2_http_out_transport_info_set_content_type_func(out_transport_info, env, axis2_apache_out_transport_info_set_content_type);
+
+ return out_transport_info;
}
Modified: webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=521233&r1=521232&r2=521233
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Thu Mar 22 05:08:05 2007
@@ -98,10 +98,9 @@
axis2_msg_recv_free(msg_recv, env);
return NULL;
}
-
- msg_recv->ops->invoke_in_out_business_logic_sync =
- savan_msg_recv_invoke_business_logic_sync;
- msg_recv->ops->receive = msg_recv->ops->receive_sync;
+
+ axis2_msg_recv_set_invoke_business_logic(msg_recv, env,
+ savan_msg_recv_invoke_business_logic_sync);
return msg_recv;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org