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 07:28:31 UTC
svn commit: r525411 - in /webservices/axis2/trunk/c: axiom/src/soap/
build/win32/ ides/vc/axis2c/ ides/vc/axis2c/axiom/
ides/vc/axis2c/axis2_engine/ ides/vc/axis2c/axis2_http_receiver/
ides/vc/axis2c/axis2_http_sender/ ides/vc/axis2c/axis2_mod_addr/ id...
Author: nandika
Date: Tue Apr 3 22:28:30 2007
New Revision: 525411
URL: http://svn.apache.org/viewvc?view=rev&rev=525411
Log:
compile errors fixed, vc project updated
Added:
webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axutil.vcproj
- copied, changed from r525397, webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axis2_util.vcproj
Removed:
webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axis2_util.vcproj
Modified:
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
webservices/axis2/trunk/c/build/win32/makefile
webservices/axis2/trunk/c/ides/vc/axis2c/axiom/axiom.vcproj
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/axis2_mod_addr/axis2_mod_addr.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_log/axis2_mod_log.vcproj
webservices/axis2/trunk/c/ides/vc/axis2c/axis2_parser/axis2_parser.vcproj
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/savan/src/client/savan_client.c
webservices/axis2/trunk/c/savan/src/core/mod_savan.c
webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
webservices/axis2/trunk/c/savan/src/util/savan_util.c
webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
webservices/axis2/trunk/c/util/include/axutil_string.h
webservices/axis2/trunk/c/util/src/dir_handler.c
webservices/axis2/trunk/c/util/src/properties.c
webservices/axis2/trunk/c/util/src/string.c
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Tue Apr 3 22:28:30 2007
@@ -26,6 +26,12 @@
#include <axiom_stax_builder_internal.h>
#include "_axiom_soap_fault.h"
+axis2_status_t
+axiom_soap_builder_create_om_element(axiom_soap_builder_t *soap_builder,
+ const axutil_env_t *env,
+ axiom_node_t *current_node,
+ int current_event);
+
static axis2_status_t
axiom_soap_builder_construct_node(axiom_soap_builder_t *soap_builder,
const axutil_env_t *env,
Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Tue Apr 3 22:28:30 2007
@@ -132,10 +132,11 @@
$(AXIS2_SOURCE_DIR)\util\src\*.c
AXIS2_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\*.c \
- $(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c
+ $(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c
AXIS2_GUTHTHILA_PARSER_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\parser\*.c \
- $(AXIS2_SOURCE_DIR)\axiom\src\parser\guththila\*.c
+ $(AXIS2_SOURCE_DIR)\axiom\src\parser\guththila\*.c
+
AXIOM_SRC = $(AXIS2_SOURCE_DIR)\axiom\src\om\*.c \
$(AXIS2_SOURCE_DIR)\axiom\src\soap\*.c \
@@ -181,7 +182,7 @@
CC = @cl.exe
CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_SECURE_NO_WARNINGS" \
- /D "AXIS2_SVR_MULTI_THREADED" /W3 /nologo $(AXIS2_INCLUDE_PATH) \
+ /D "AXIS2_SVR_MULTI_THREADED" /w /nologo $(AXIS2_INCLUDE_PATH) \
$(APACHE_INCLUDE_PATH)
!if "$(ENABLE_SSL)" == "1"
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axiom/axiom.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axiom/axiom.vcproj?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axiom/axiom.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axiom/axiom.vcproj Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib"
+ AdditionalDependencies="axutil.lib axis2_parser.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
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=525411&r1=525410&r2=525411
==============================================================================
--- 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 Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axiom.lib axis2_util.lib axis2_parser.lib xml_schema.lib woden.lib"
+ AdditionalDependencies="axiom.lib axutil.lib axis2_parser.lib xml_schema.lib woden.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
@@ -510,6 +510,10 @@
<Filter
Name="transport"
>
+ <File
+ RelativePath="..\..\..\..\modules\core\transport\transport_receiver.c"
+ >
+ </File>
<Filter
Name="http"
>
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=525411&r1=525410&r2=525411
==============================================================================
--- 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 Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib"
+ AdditionalDependencies="axutil.lib axis2_parser.lib axis2_engine.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
@@ -185,15 +185,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_response_writer.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\modules\core\transport\http\receiver\http_svr_thread.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\modules\core\transport\http\receiver\simple_http_svr_conn.c"
>
</File>
</Filter>
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=525411&r1=525410&r2=525411
==============================================================================
--- 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 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axis2_parser.lib axis2_engine.lib ssleay32MTd.lib libeay32MTd.lib libcurl_imp.lib axiom.lib"
+ AdditionalDependencies="axutil.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/axis2_mod_addr/axis2_mod_addr.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_addr/axis2_mod_addr.vcproj Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib axiom.lib axis2_parser.lib axis2_engine.lib"
+ AdditionalDependencies="axutil.lib axiom.lib axis2_parser.lib axis2_engine.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_log/axis2_mod_log.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_log/axis2_mod_log.vcproj?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_log/axis2_mod_log.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_mod_log/axis2_mod_log.vcproj Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_engine.lib axis2_util.lib axiom.lib"
+ AdditionalDependencies="axis2_engine.lib axutil.lib axiom.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_parser/axis2_parser.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_parser/axis2_parser.vcproj?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_parser/axis2_parser.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_parser/axis2_parser.vcproj Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib libxml2.lib"
+ AdditionalDependencies="axutil.lib libxml2.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
@@ -186,6 +186,14 @@
</File>
<File
RelativePath="..\..\..\..\axiom\src\parser\libxml2\libxml2_writer_wrapper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\axiom\src\parser\xml_reader.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\axiom\src\parser\xml_writer.c"
>
</File>
</Filter>
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=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2c.sln Tue Apr 3 22:28:30 2007
@@ -1,8 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_util", "axis2_util\axis2_util.vcproj", "{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_parser", "axis2_parser\axis2_parser.vcproj", "{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}"
ProjectSection(ProjectDependencies) = postProject
{3887B3E3-1A45-40E5-BC95-9C51000C86DB} = {3887B3E3-1A45-40E5-BC95-9C51000C86DB}
@@ -57,16 +55,16 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_axis2", "mod_axis2\mod_axis2.vcproj", "{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axutil", "axutil\axutil.vcproj", "{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
+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
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Debug|Win32.ActiveCfg = Debug|Win32
- {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Debug|Win32.Build.0 = Debug|Win32
- {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Release|Win32.ActiveCfg = Release|Win32
- {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Release|Win32.Build.0 = Release|Win32
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}.Debug|Win32.ActiveCfg = Debug|Win32
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}.Debug|Win32.Build.0 = Debug|Win32
{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}.Release|Win32.ActiveCfg = Release|Win32
@@ -107,6 +105,14 @@
{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
+ {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Debug|Win32.Build.0 = Debug|Win32
+ {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.Release|Win32.ActiveCfg = Release|Win32
+ {3887B3E3-1A45-40E5-BC95-9C51000C86DB}.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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Copied: webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axutil.vcproj (from r525397, webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axis2_util.vcproj)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axutil.vcproj?view=diff&rev=525411&p1=webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axis2_util.vcproj&r1=525397&p2=webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axutil.vcproj&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axis2_util.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axutil/axutil.vcproj Tue Apr 3 22:28:30 2007
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="axis2_util"
+ Name="axutil"
ProjectGUID="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
RootNamespace="axis2_util"
Keyword="Win32Proj"
@@ -318,6 +318,10 @@
RelativePath="..\..\..\..\util\src\uuid_gen.c"
>
</File>
+ <File
+ RelativePath="..\..\..\..\util\src\version.c"
+ >
+ </File>
<Filter
Name="minizip"
>
@@ -365,15 +369,11 @@
<Filter
Name="platforms"
>
- <File
- RelativePath="..\..\..\..\util\include\platforms\axis2_platform_auto_sense.h"
- >
- </File>
<Filter
Name="windows"
>
<File
- RelativePath="..\..\..\..\util\src\platforms\windows\axis2_windows.c"
+ RelativePath="..\..\..\..\util\src\platforms\windows\axutil_windows.c"
>
</File>
<File
@@ -409,185 +409,197 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\..\..\util\include\axis2_allocator.h"
+ RelativePath="..\..\..\..\util\include\axutil_allocator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\axutil_array_list.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_array_list.h"
+ RelativePath="..\..\..\..\util\include\axutil_base64.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_base64.h"
+ RelativePath="..\..\..\..\util\include\axutil_base64_binary.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_base64_binary.h"
+ RelativePath="..\..\..\..\util\include\axutil_class_loader.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_class_loader.h"
+ RelativePath="..\..\..\..\util\include\axutil_date_time.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_date_time.h"
+ RelativePath="..\..\..\..\util\include\axutil_date_time_util.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_date_time_util.h"
+ RelativePath="..\..\..\..\util\include\axutil_dir_handler.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_dir_handler.h"
+ RelativePath="..\..\..\..\util\include\axutil_dll_desc.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_dll_desc.h"
+ RelativePath="..\..\..\..\util\include\axutil_env.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_env.h"
+ RelativePath="..\..\..\..\util\include\axutil_error.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_error.h"
+ RelativePath="..\..\..\..\util\include\axutil_error_default.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_error_default.h"
+ RelativePath="..\..\..\..\util\include\axutil_file.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_file.h"
+ RelativePath="..\..\..\..\util\include\axutil_file_handler.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_file_handler.h"
+ RelativePath="..\..\..\..\util\include\axutil_generic_obj.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_generic_obj.h"
+ RelativePath="..\..\..\..\util\include\axutil_hash.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_hash.h"
+ RelativePath="..\..\..\..\util\include\axutil_linked_list.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_linked_list.h"
+ RelativePath="..\..\..\..\util\include\axutil_log.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_log.h"
+ RelativePath="..\..\..\..\util\include\axutil_log_default.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_log_default.h"
+ RelativePath="..\..\..\..\util\include\axutil_network_handler.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_network_handler.h"
+ RelativePath="..\..\..\..\util\include\axutil_param.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_param.h"
+ RelativePath="..\..\..\..\util\include\axutil_param_container.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_param_container.h"
+ RelativePath="..\..\..\..\util\include\axutil_properties.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_properties.h"
+ RelativePath="..\..\..\..\util\include\axutil_property.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_property.h"
+ RelativePath="..\..\..\..\util\include\axutil_qname.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_qname.h"
+ RelativePath="..\..\..\..\util\include\axutil_rand.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_rand.h"
+ RelativePath="..\..\..\..\util\include\axutil_stack.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_stack.h"
+ RelativePath="..\..\..\..\util\include\axutil_stream.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_stream.h"
+ RelativePath="..\..\..\..\util\include\axutil_string.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_string_util.h"
+ RelativePath="..\..\..\..\util\include\axutil_string_util.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_types.h"
+ RelativePath="..\..\..\..\util\include\axutil_thread.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_uri.h"
+ RelativePath="..\..\..\..\util\include\axutil_thread_pool.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_url.h"
+ RelativePath="..\..\..\..\util\include\axutil_types.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_utils.h"
+ RelativePath="..\..\..\..\util\include\axutil_uri.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\axis2_utils_defines.h"
+ RelativePath="..\..\..\..\util\include\axutil_url.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\axutil_utils.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\axutil_utils_defines.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\axutil_uuid_gen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\axutil_version.h"
>
</File>
<Filter
Name="platforms"
>
<File
- RelativePath="..\..\..\..\util\include\axis2_string.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\util\include\axis2_thread.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\util\include\axis2_thread_pool.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\util\include\axis2_uuid_gen.h"
+ RelativePath="..\..\..\..\util\include\platforms\axutil_platform_auto_sense.h"
>
</File>
<Filter
Name="windows"
>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_dir_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_date_time_util_windows.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_dir_windows.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_getopt_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_getopt_windows.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_thread_mutex_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_thread_mutex_windows.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_thread_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_thread_windows.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_uuid_gen_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_uuid_gen_windows.h"
>
</File>
<File
- RelativePath="..\..\..\..\util\include\platforms\windows\axis2_windows.h"
+ RelativePath="..\..\..\..\util\include\platforms\windows\axutil_windows.h"
>
</File>
</Filter>
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=525411&r1=525410&r2=525411
==============================================================================
--- 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 Tue Apr 3 22:28:30 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libapr-1.lib apr-1.lib libhttpd.lib axis2_util.lib axis2_engine.lib axiom.lib axis2_parser.lib"
+ AdditionalDependencies="libapr-1.lib apr-1.lib libhttpd.lib axutil.lib axis2_engine.lib axiom.lib axis2_parser.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=".\..\deploy\lib"
GenerateDebugInformation="true"
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=525411&r1=525410&r2=525411
==============================================================================
--- 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 Tue Apr 3 22:28:30 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"
+ AdditionalDependencies="axiom.lib axis2_parser.lib axutil.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/savan/src/client/savan_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_client.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Tue Apr 3 22:28:30 2007
@@ -156,7 +156,7 @@
* requests */
/* Get Body element from body node */
- body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(reply, env);
+ body_elem = (axiom_element_t*)axiom_node_get_data_element(reply, env);
/* Check whether we have received a SubscribeResponse */
sub_elem_local_name = axiom_element_get_localname(body_elem, env);
@@ -335,7 +335,7 @@
/* Extract the expire string and return */
/* Get Body element from body node */
- body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(reply, env);
+ body_elem = (axiom_element_t*)axiom_node_get_data_element(reply, env);
/* Get Subscribe element from Body */
qname = axutil_qname_create(env, ELEM_NAME_GETSTATUS_RESPONSE, EVENTING_NAMESPACE, NULL);
Modified: webservices/axis2/trunk/c/savan/src/core/mod_savan.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/mod_savan.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/mod_savan.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/mod_savan.c Tue Apr 3 22:28:30 2007
@@ -31,8 +31,15 @@
axis2_module_desc_t *module_desc);
axis2_status_t AXIS2_CALL
-mod_savan_fill_handler_create_func_map(axis2_module_t *module,
- const axutil_env_t *env);
+mod_savan_fill_handler_create_func_map(
+ axis2_module_t *module,
+ const axutil_env_t *env);
+
+static const axis2_module_ops_t savan_module_ops_var = {
+ mod_savan_init,
+ mod_savan_shutdown,
+ mod_savan_fill_handler_create_func_map
+};
/*************************** End of Function Prototypes ***********************/
@@ -43,14 +50,7 @@
module = AXIS2_MALLOC(env->allocator,
sizeof(axis2_module_t));
- module->ops = AXIS2_MALLOC(
- env->allocator, sizeof(axis2_module_ops_t));
-
- module->ops->shutdown = mod_savan_shutdown;
- module->ops->init = mod_savan_init;
- module->ops->fill_handler_create_func_map =
- mod_savan_fill_handler_create_func_map;
-
+ module->ops = &savan_module_ops_var;
return module;
}
Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Tue Apr 3 22:28:30 2007
@@ -382,7 +382,7 @@
/* Get Body element from body node */
body_node = axiom_soap_body_get_base_node(body, env);
- body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
+ body_elem = (axiom_element_t*)axiom_node_get_data_element(body_node, env);
/* Get Subscribe element from Body */
qname = axutil_qname_create(env, ELEM_NAME_SUBSCRIBE, EVENTING_NAMESPACE, NULL);
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c Tue Apr 3 22:28:30 2007
@@ -61,8 +61,7 @@
/* Handler init is handled by conf loading, so no need to do it here */
/* Set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = savan_in_handler_invoke;
+ axis2_handler_set_invoke(handler, env, savan_in_handler_invoke);
return handler;
}
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Tue Apr 3 22:28:30 2007
@@ -65,8 +65,7 @@
/* handler init is handled by conf loading, so no need to do it here */
/* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = savan_out_handler_invoke;
+ axis2_handler_set_invoke(handler, env,savan_out_handler_invoke);
return handler;
}
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=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Tue Apr 3 22:28:30 2007
@@ -237,7 +237,7 @@
&expires_node);
axiom_element_set_text(expires_elem, env, expires, expires_node);
- AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
+ axiom_node_add_child(body_node , env, response_node);
axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
@@ -297,7 +297,7 @@
response_elem = axiom_element_create(env, NULL, ELEM_NAME_UNSUB_RESPONSE, ns,
&response_node);
- AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
+ axiom_node_add_child(body_node , env, response_node);
axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
@@ -372,7 +372,7 @@
&expires_node);
axiom_element_set_text(expires_elem, env, expires, expires_node);
- AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
+ axiom_node_add_child(body_node , env, response_node);
axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
@@ -430,7 +430,7 @@
&expires_node);
axiom_element_set_text(expires_elem, env, expires, expires_node);
- AXIOM_NODE_ADD_CHILD(body_node , env, response_node);
+ axiom_node_add_child(body_node , env, response_node);
axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Tue Apr 3 22:28:30 2007
@@ -255,8 +255,8 @@
op_client = axis2_svc_client_create_op_client(svc_client, env,
op_qname);
- AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx);
- status = AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_TRUE);
+ axis2_op_client_add_msg_ctx(op_client, env, msg_ctx);
+ status = axis2_op_client_execute(op_client, env, AXIS2_TRUE);
return status;
}
Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Tue Apr 3 22:28:30 2007
@@ -108,7 +108,7 @@
/* Get header element from header node */
header_node = axiom_soap_header_get_base_node(header, env);
- header_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
+ header_elem = (axiom_element_t*)axiom_node_get_data_element(header_node, env);
/* Get Identifier element from header */
qname = axutil_qname_create(env, ELEM_NAME_ID, EVENTING_NAMESPACE, NULL);
Modified: webservices/axis2/trunk/c/util/include/axutil_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dir_handler.h?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dir_handler.h Tue Apr 3 22:28:30 2007
@@ -43,7 +43,7 @@
*/
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axutil_dir_handler_list_services_or_modules_in_dir(const axutil_env_t *env,
- axis2_char_t *pathname);
+ const axis2_char_t *pathname);
/**
* List services or modules directories in the services or modules folder
@@ -53,7 +53,7 @@
*/
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axutil_dir_handler_list_service_or_module_dirs(const axutil_env_t *env,
- axis2_char_t *pathname);
+ const axis2_char_t *pathname);
/*
*extentions for module and service archives
Modified: webservices/axis2/trunk/c/util/include/axutil_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_string.h?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_string.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_string.h Tue Apr 3 22:28:30 2007
@@ -184,7 +184,7 @@
AXIS2_EXTERN int AXIS2_CALL
axutil_strncasecmp(const axis2_char_t *s1,
const axis2_char_t *s2,
- int n);
+ const int n);
/* much similar to the strcat behaviour. But the difference is
* this allocates new memory to put the conatenated string rather than
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Tue Apr 3 22:28:30 2007
@@ -37,7 +37,7 @@
*/
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axutil_dir_handler_list_services_or_modules_in_dir(const axutil_env_t *env,
- axis2_char_t *pathname)
+ const axis2_char_t *pathname)
{
axutil_array_list_t *file_list = NULL;
struct stat *buf = NULL;
@@ -160,7 +160,7 @@
*/
AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axutil_dir_handler_list_service_or_module_dirs(const axutil_env_t *env,
- axis2_char_t *pathname)
+ const axis2_char_t *pathname)
{
axutil_array_list_t *file_list = NULL;
struct stat *buf = NULL;
Modified: webservices/axis2/trunk/c/util/src/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/properties.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Tue Apr 3 22:28:30 2007
@@ -305,9 +305,9 @@
axutil_properties_read(FILE* input,
const axutil_env_t* env)
{
- int nread = 0;
+ size_t nread = 0;
axis2_char_t* out_stream = NULL;
- int ncount = 0;
+ size_t ncount = 0;
size_t curr_alloc = MAX_SIZE * 2;
size_t total_alloc = curr_alloc;
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=525411&r1=525410&r2=525411
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Tue Apr 3 22:28:30 2007
@@ -17,6 +17,7 @@
#include <axutil_string.h>
#include <stdlib.h>
+#include <ctype.h>
#include <axutil_utils.h>
#include <axutil_utils_defines.h>
#include <stdarg.h> /* NULL */
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org