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 di...@apache.org on 2007/07/16 18:43:11 UTC
svn commit: r556666 [5/7] - in /webservices/axis2/scratch/c/dinesh/602/c: ./
build/win32/ guththila/ guththila/include/ guththila/src/ ides/vc/axis2c/
ides/vc/axis2c/axis2_engine/ ides/vc/axis2c/clients/echo_blocking/
ides/vc/axis2c/clients/echo_blocki...
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2_engine/axis2_engine.vcproj Mon Jul 16 09:42:53 2007
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axiom.lib axutil.lib axis2_parser.lib"
+ AdditionalDependencies="axiom.lib axutil.lib axis2_parser.lib neethi.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SolutionDir)\deploy\lib""
GenerateManifest="true"
@@ -412,6 +412,10 @@
</File>
<File
RelativePath="..\..\..\..\src\core\description\phase_rule.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\core\description\policy_include.c"
>
</File>
<File
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2c.sln
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2c.sln?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2c.sln (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/axis2c.sln Mon Jul 16 09:42:53 2007
@@ -14,23 +14,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axis2_engine", "axis2_engine\axis2_engine.vcproj", "{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
ProjectSection(ProjectDependencies) = postProject
+ {20643536-7BF0-4201-9EA6-039E6CF19ADB} = {20643536-7BF0-4201-9EA6-039E6CF19ADB}
{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_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}
- 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}
- {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}
@@ -51,8 +43,6 @@
{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}") = "axutil", "axutil\axutil.vcproj", "{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{52AB54B9-4457-4E03-B892-75CC56F22B32}"
@@ -60,7 +50,12 @@
..\..\..\build\win32\makefile = ..\..\..\build\win32\makefile
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_axis2", "mod_axis2\mod_axis2.vcproj", "{9CA2AEC7-8781-4B5E-B2A2-C143ABF5E818}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neethi", "neethi\neethi.vcproj", "{20643536-7BF0-4201-9EA6-039E6CF19ADB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,10 +75,6 @@
{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
- {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
- {423F7156-84C4-43C1-855A-D0FEE24DB0A0}.Release|Win32.Build.0 = Release|Win32
{D2975362-DEAA-41BF-AE5E-E6FCDB526726}.Debug|Win32.ActiveCfg = Debug|Win32
{D2975362-DEAA-41BF-AE5E-E6FCDB526726}.Debug|Win32.Build.0 = Debug|Win32
{D2975362-DEAA-41BF-AE5E-E6FCDB526726}.Release|Win32.ActiveCfg = Release|Win32
@@ -100,18 +91,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
{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
- {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
+ {20643536-7BF0-4201-9EA6-039E6CF19ADB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {20643536-7BF0-4201-9EA6-039E6CF19ADB}.Debug|Win32.Build.0 = Debug|Win32
+ {20643536-7BF0-4201-9EA6-039E6CF19ADB}.Release|Win32.ActiveCfg = Release|Win32
+ {20643536-7BF0-4201-9EA6-039E6CF19ADB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking/echo_blocking.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking/echo_blocking.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking/echo_blocking.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking/echo_blocking.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -44,7 +44,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -73,6 +73,7 @@
/>
<Tool
Name="VCManifestTool"
+ UseFAT32Workaround="true"
/>
<Tool
Name="VCXDCMakeTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_addr/echo_blocking_addr.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_addr/echo_blocking_addr.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_addr/echo_blocking_addr.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_addr/echo_blocking_addr.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_dual/echo_blocking_dual.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_dual/echo_blocking_dual.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_dual/echo_blocking_dual.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_blocking_dual/echo_blocking_dual.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking/echo_non_blocking.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking/echo_non_blocking.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking/echo_non_blocking.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking/echo_non_blocking.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking_dual/echo_non_blocking_dual.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking_dual/echo_non_blocking_dual.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking_dual/echo_non_blocking_dual.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_non_blocking_dual/echo_non_blocking_dual.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_rest/echo_rest.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_rest/echo_rest.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_rest/echo_rest.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/echo_rest/echo_rest.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/google/google.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/google/google.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/google/google.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/google/google.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/notify/notify.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/notify/notify.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/notify/notify.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/notify/notify.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/clients/yahoo/yahoo.vcproj Mon Jul 16 09:42:53 2007
@@ -20,7 +20,7 @@
OutputDirectory="..\..\deploy\bin\samples"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
Modified: webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/guththila/guththila.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/guththila/guththila.vcproj?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/guththila/guththila.vcproj (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/ides/vc/axis2c/guththila/guththila.vcproj Mon Jul 16 09:42:53 2007
@@ -177,27 +177,31 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\..\..\guththila\src\guththila_attribute.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\guththila\src\guththila_buffer.c"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\src\guththila_reader.c"
+ RelativePath="..\..\..\..\guththila\src\guththila_namespace.c"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\src\guththila_token.c"
+ RelativePath="..\..\..\..\guththila\src\guththila_reader.c"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\src\guththila_unicode.c"
+ RelativePath="..\..\..\..\guththila\src\guththila_stack.c"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\src\guththila_writer.c"
+ RelativePath="..\..\..\..\guththila\src\guththila_token.c"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\src\guththila_xml_pull_parser.c"
+ RelativePath="..\..\..\..\guththila\src\guththila_xml_parser.c"
>
</File>
<File
@@ -227,10 +231,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\guththila\include\guththila_depth.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\guththila\include\guththila_error.h"
>
</File>
@@ -243,15 +243,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\guththila\include\guththila_token.h"
+ RelativePath="..\..\..\..\guththila\include\guththila_stack.h"
>
</File>
<File
- RelativePath="..\..\..\..\guththila\include\guththila_unicode.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\guththila\include\guththila_writer.h"
+ RelativePath="..\..\..\..\guththila\include\guththila_token.h"
>
</File>
<File
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_conf.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_conf.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_conf.h Mon Jul 16 09:42:53 2007
@@ -382,6 +382,19 @@
axis2_conf_get_all_svcs(const axis2_conf_t *conf,
const axutil_env_t *env);
+ /**
+ * Gets all the list of services that need to be loaded into configuration
+ * at the start up of the axis2 engine.
+ * @param conf pointer to conf struct
+ * @param env pointer to environment struct
+ * @return a pointer to the hash table of services. Returns a
+ * reference, not a cloned copy
+ */
+ AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
+ axis2_conf_get_all_svcs_to_load(
+ const axis2_conf_t *conf,
+ const axutil_env_t *env);
+
/**
* Checks is the named module is engaged.
* @param conf pointer to conf struct
@@ -667,10 +680,31 @@
const axutil_env_t *env,
axis2_bool_t enable_security);
+ AXIS2_EXTERN void* AXIS2_CALL
+ axis2_conf_get_security_context(
+ axis2_conf_t *conf,
+ const axutil_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_conf_set_security_context(
+ axis2_conf_t *conf,
+ const axutil_env_t *env,
+ void* security_context);
+
+
AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_conf_get_param_container(const axis2_conf_t *conf,
const axutil_env_t *env);
+ /**
+ * Gets base description.
+ * @param conf pointer to message
+ * @param env pointer to environment struct
+ * @return pointer to base description struct
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_conf_get_base(const axis2_conf_t *conf,
+ const axutil_env_t *env);
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_const.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_const.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_const.h Mon Jul 16 09:42:53 2007
@@ -331,6 +331,9 @@
#define AXIS2_TESTING_REPOSITORY "target/test-resources/samples"
+/* Indicate whether the axis2 service should be loaded at start up */
+#define AXIS2_LOAD_SVC_STARTUP "loadServiceAtStartup"
+
/*************************** REST_WITH_GET ************************************/
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_desc.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_desc.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_desc.h Mon Jul 16 09:42:53 2007
@@ -37,6 +37,8 @@
/** Type name of struct axis2_desc */
typedef struct axis2_desc axis2_desc_t;
+
+ struct axis2_policy_include;
/**
* Creates a description struct instance.
@@ -154,6 +156,37 @@
const axutil_env_t *env,
const axis2_char_t *key);
+ /**
+ * Sets parent description.
+ * @param desc pointer to description
+ * @param env pointer to environment struct
+ * @param parent pointer to parent description
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_desc_set_parent(axis2_desc_t *desc,
+ const axutil_env_t *env,
+ axis2_desc_t *parent);
+
+ /**
+ * Gets parent description.
+ * @param desc pointer to description
+ * @param env pointer to environment struct
+ * @return parent pointer to parent description
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_desc_get_parent(const axis2_desc_t *desc,
+ const axutil_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_desc_set_policy_include(axis2_desc_t *desc,
+ const axutil_env_t *env,
+ struct axis2_policy_include *policy_include);
+
+ AXIS2_EXTERN struct axis2_policy_include *AXIS2_CALL
+ axis2_desc_get_policy_include(axis2_desc_t *desc,
+ const axutil_env_t *env);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_server.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_server.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_server.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_server.h Mon Jul 16 09:42:53 2007
@@ -40,7 +40,7 @@
{
#endif
- int axis2_http_socket_read_timeout;
+
AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL
axis2_http_server_create (
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_svr_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_svr_thread.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_svr_thread.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_svr_thread.h Mon Jul 16 09:42:53 2007
@@ -42,8 +42,6 @@
/** Type name for struct axist_http_svr_thread */
typedef struct axis2_http_svr_thread axis2_http_svr_thread_t;
- extern int axis2_http_socket_read_timeout;
-
/**
* @param svr_thread pointer to server thread
* @param env pointer to environment struct
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_transport.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_transport.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_transport.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_http_transport.h Mon Jul 16 09:42:53 2007
@@ -274,11 +274,16 @@
#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_ALL "text/*"
/**
- * HEADER_ACCEPT_TEXT_ALL
+ * HEADER_ACCEPT_TEXT_PLAIN
*/
#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN "text/plain"
/**
+ * HEADER_ACCEPT_TEXT_HTML
+ */
+#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_HTML "text/html"
+
+/**
* HEADER_ACCEPT_TEXT_XML
*/
#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML "text/xml"
@@ -419,12 +424,14 @@
/**
* Constant for HTTP proxy host
*/
-#define AXIS2_PROXY_HOST_NAME "proxy_host"
+#define AXIS2_HTTP_PROXY_HOST "proxy_host"
/**
* Constant for HTTP proxy port
*/
-#define AXIS2_PROXY_HOST_PORT "proxy_port"
+#define AXIS2_HTTP_PROXY_PORT "proxy_port"
+
+#define AXIS2_HTTP_PROXY_API "PROXY_API"
/**
* Constant for HTTP method
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg.h Mon Jul 16 09:42:53 2007
@@ -34,8 +34,8 @@
#include <axis2_description.h>
#include <axis2_phase_meta.h>
-#define AXIS2_MSG_IN "InMessage"
-#define AXIS2_MSG_OUT "OutMessage"
+#define AXIS2_MSG_IN "in"
+#define AXIS2_MSG_OUT "out"
#define AXIS2_MSG_IN_FAULT "InFaultMessage"
#define AXIS2_MSG_OUT_FAULT "OutFaultMessage"
@@ -229,6 +229,20 @@
axis2_msg_set_name(axis2_msg_t *msg,
const axutil_env_t *env,
const axis2_char_t *name);
+
+ /**
+ * Gets base description.
+ * @param msg pointer to message
+ * @param env pointer to environment struct
+ * @return pointer to base description struct
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_msg_get_base(const axis2_msg_t *msg,
+ const axutil_env_t *env);
+
+ AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
+ axis2_msg_get_param_container(const axis2_msg_t *msg,
+ const axutil_env_t *env);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg_ctx.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_msg_ctx.h Mon Jul 16 09:42:53 2007
@@ -848,15 +848,28 @@
* @param msg_ctx pointer to message context
* @param env pointer to environment struct
* @param key key string with which the property is stored
- * @param persistent AXIS2_TRUE if the property is to be retrieved from
- * persistent map, AXIS2_FALSE if the property is to be retrieved from
- * non-persistent map
* @return pointer to property struct
*/
AXIS2_EXTERN axutil_property_t *AXIS2_CALL
axis2_msg_ctx_get_property(const axis2_msg_ctx_t *msg_ctx,
const axutil_env_t *env,
const axis2_char_t *key);
+
+
+ /**
+ * Gets property value corresponding to the property given key.
+ * @param msg_ctx pointer to message context
+ * @param env pointer to environment struct
+ * @param key key string with which the property is stored
+ * @return pointer to property struct
+ */
+
+ AXIS2_EXTERN void * AXIS2_CALL
+ axis2_msg_ctx_get_property_value(
+ axis2_msg_ctx_t *msg_ctx,
+ const axutil_env_t *env,
+ const axis2_char_t *property_str);
+
/**
* Sets property with given key.
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_op.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_op.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_op.h Mon Jul 16 09:42:53 2007
@@ -596,6 +596,15 @@
axis2_op_free_void_arg(void *op,
const axutil_env_t *env);
+ /**
+ * Gets base description.
+ * @param op pointer to message
+ * @param env pointer to environment struct
+ * @return pointer to base description struct
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_op_get_base(const axis2_op_t *op,
+ const axutil_env_t *env);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_options.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_options.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_options.h Mon Jul 16 09:42:53 2007
@@ -561,7 +561,7 @@
* Gets SOAP version.
* @param options pointer to options struct
* @param env pointer to environment struct
- * @return AXIOM_SOAP_11 if SOAP version 1.1 is in use, else AXIOM_SOAP_12
+ * @return AXIOM_SOAP11 if SOAP version 1.1 is in use, else AXIOM_SOAP12
*/
AXIS2_EXTERN int AXIS2_CALL
axis2_options_get_soap_version(const axis2_options_t *options,
@@ -571,7 +571,7 @@
* Sets SOAP version.
* @param options pointer to options struct
* @param env pointer to environment struct
- * @param soap_version soap version, either AXIOM_SOAP_11 or AXIOM_SOAP_12
+ * @param soap_version soap version, either AXIOM_SOAP11 or AXIOM_SOAP12
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_stub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_stub.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_stub.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_stub.h Mon Jul 16 09:42:53 2007
@@ -36,10 +36,12 @@
#include <axiom_xml_reader.h>
#include <axutil_property.h>
-/** Constant value representing SOAP version 1.1 */
-#define AXIOM_SOAP_11 0
-/** Constant value representing SOAP version 1.2 */
-#define AXIOM_SOAP_12 1
+/** DEPRECATED: Please use AXIOM_SOAP11 instead.
+ Constant value representing SOAP version 1.1 */
+#define AXIOM_SOAP_11 1
+/** DEPRECATED: Please use AXIOM_SOAP12 instead.
+ Constant value representing SOAP version 1.2 */
+#define AXIOM_SOAP_12 2
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc.h Mon Jul 16 09:42:53 2007
@@ -1021,6 +1021,15 @@
const axutil_env_t *env,
void *impl_class);
+ /**
+ * Gets base description.
+ * @param svc pointer to message
+ * @param env pointer to environment struct
+ * @return pointer to base description struct
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_svc_get_base(const axis2_svc_t *svc,
+ const axutil_env_t *env);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_client.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_client.h Mon Jul 16 09:42:53 2007
@@ -53,6 +53,7 @@
#include <axis2_conf_ctx.h>
#include <axis2_op_client.h>
#include <axutil_string.h>
+#include <neethi_policy.h>
/** Name of anonymous service */
#define AXIS2_ANON_SERVICE "__ANONYMOUS_SERVICE__"
@@ -66,9 +67,6 @@
/** out-in MEP operation name */
#define AXIS2_ANON_OUT_IN_OP "__OPERATION_OUT_IN__"
-#define AXIS2_HTTP_PROXY_API "PROXY_API"
-#define AXIS2_HTTP_PROXY_HOST "proxy_host"
-#define AXIS2_HTTP_PROXY_PORT "proxy_port"
#ifdef __cplusplus
extern "C"
{
@@ -510,6 +508,35 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_svc_client_get_last_response_has_fault(const axis2_svc_client_t *svc_client,
const axutil_env_t *env);
+
+ /**
+ * Create a policy object and set it to the description hierarchy
+ * @param svc_client pointer to service_client struct
+ * @param env pointer to environemt struct
+ * @param root_node pointer to a policy node
+ * @return AXIS2_FAILURE if there was a fault, else AXIS2_SUCCESS
+ */
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_client_set_policy_from_om(axis2_svc_client_t *svc_client,
+ const axutil_env_t *env,
+ axiom_node_t *root_node);
+
+ /**
+ * Set the given policy object to the description hierarchy
+ * @param svc_client pointer to service_client struct
+ * @param env pointer to environemt struct
+ * @param policy neethi_policy_t to a policy struct
+ * @return AXIS2_FAILURE if there was a fault, else AXIS2_SUCCESS
+ */
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_client_set_policy(axis2_svc_client_t *svc_client,
+ const axutil_env_t *env,
+ neethi_policy_t *policy);
+
+
+
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_grp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_grp.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_grp.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_grp.h Mon Jul 16 09:42:53 2007
@@ -45,6 +45,7 @@
*/
#include <axutil_param_container.h>
+#include <axis2_desc.h>
#include <axis2_svc.h>
#include <axis2_svc_grp_ctx.h>
@@ -309,6 +310,16 @@
AXIS2_EXTERN axis2_svc_grp_t *AXIS2_CALL
axis2_svc_grp_create_with_conf(const axutil_env_t *env,
struct axis2_conf *conf);
+
+ /**
+ * Gets base description.
+ * @param svc_grp pointer to message
+ * @param env pointer to environment struct
+ * @return pointer to base description struct
+ */
+ AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
+ axis2_svc_grp_get_base(const axis2_svc_grp_t *svc_grp,
+ const axutil_env_t *env);
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_skeleton.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_skeleton.h?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_skeleton.h (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/include/axis2_svc_skeleton.h Mon Jul 16 09:42:53 2007
@@ -113,6 +113,18 @@
axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env);
+ /**
+ * Initializes the service implementation.
+ * @param svc_skeleton pointer to svc_skeleton struct
+ * @param env pointer to environment struct
+ * @param conf pointer to axis2c configuration struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ int (AXIS2_CALL *
+ init_with_conf)(
+ axis2_svc_skeleton_t *svc_skeleton,
+ const axutil_env_t *env,
+ struct axis2_conf *conf);
} ;
/**
@@ -133,6 +145,11 @@
@sa axis2_svc_skeleton_ops#init */
#define AXIS2_SVC_SKELETON_INIT(svc_skeleton, env) \
((svc_skeleton)->ops->init (svc_skeleton, env))
+
+/** Initialize the svc skeleton with axis2c configuration struct.
+ @sa axis2_svc_skeleton_ops#init_with_conf */
+#define AXIS2_SVC_SKELETON_INIT_WITH_CONF(svc_skeleton, env, conf) \
+ ((svc_skeleton)->ops->init_with_conf (svc_skeleton, env, conf))
/** Frees the svc skeleton.
@sa axis2_svc_skeleton_ops#free */
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/Calculator.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/Calculator.wsdl?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/Calculator.wsdl (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/Calculator.wsdl Mon Jul 16 09:42:53 2007
@@ -1,135 +1,255 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2003-2004 The Apache Software Foundation. -->
-<!-- -->
-<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
-<!-- you may not use this file except in compliance with the License. -->
-<!-- You may obtain a copy of the License at -->
-<!-- -->
-<!-- http://www.apache.org/licenses/LICENSE-2.0 -->
-<!-- -->
-<!-- Unless required by applicable law or agreed to in writing, software -->
-<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
-<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
-<!-- See the License for the specific language governing permissions and -->
-<!-- limitations under the License. -->
-
-<wsdl:definitions targetNamespace="http://localhost/axis/Calculator"
-xmlns="http://schemas.xmlsoap.org/wsdl/"
-xmlns:apachesoap="http://xml.apache.org/xml-soap"
-xmlns:impl="http://localhost/axis/Calculator"
-xmlns:intf="http://localhost/axis/Calculator"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:message name="addRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="addResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="subResponse">
- <wsdl:part name="subReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="subRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="mulRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="mulResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="divRequest">
- <wsdl:part name="in0" type="xsd:int"/>
- <wsdl:part name="in1" type="xsd:int"/>
- </wsdl:message>
- <wsdl:message name="divResponse">
- <wsdl:part name="addReturn" type="xsd:int"/>
- </wsdl:message>
- <wsdl:portType name="Calculator">
- <wsdl:operation name="add" parameterOrder="in0 in1">
- <wsdl:input message="intf:addRequest" name="addRequest"/>
- <wsdl:output message="intf:addResponse" name="addResponse"/>
- </wsdl:operation>
- <wsdl:operation name="sub" parameterOrder="in0 in1">
- <wsdl:input message="intf:subRequest" name="subRequest"/>
- <wsdl:output message="intf:subResponse" name="subResponse"/>
- </wsdl:operation>
- <wsdl:operation name="mul" parameterOrder="in0 in1">
- <wsdl:input message="intf:mulRequest" name="mulRequest"/>
- <wsdl:output message="intf:mulResponse" name="mulResponse"/>
- </wsdl:operation>
- <wsdl:operation name="div" parameterOrder="in0 in1">
- <wsdl:input message="intf:divRequest" name="divRequest"/>
- <wsdl:output message="intf:divResponse" name="divResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CalculatorSoapBinding" type="intf:Calculator">
- <wsdlsoap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="add">
- <wsdlsoap:operation soapAction="Calculator#add"/>
- <wsdl:input name="addRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="addResponse">
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="sub">
- <wsdlsoap:operation soapAction="Calculator#sub"/>
- <wsdl:input name="subRequest">
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="subResponse">
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="mul">
- <wsdlsoap:operation soapAction="Calculator#mul"/>
- <wsdl:input name="mulRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="mulResponse">
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="div">
- <wsdlsoap:operation soapAction="Calculator#div"/>
- <wsdl:input name="divRequest">
- <wsdlsoap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:input>
- <wsdl:output name="divResponse">
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="http://localhost/axis/Calculator"
- use="encoded"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="Calculator">
- <wsdl:port binding="intf:CalculatorSoapBinding" name="Calculator">
- <wsdlsoap:address location="http://localhost/axis/Calculator"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2003-2004 The Apache Software Foundation. -->
+<!-- (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!-- http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
+<!-- See the License for the specific language governing permissions and -->
+<!-- limitations under the License. -->
+
+<wsdl:definitions targetNamespace="http://localhost/axis/Calculator" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://localhost/axis/Calculator" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost/axis/Calculator" xmlns:intf="http://localhost/axis/Calculator" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <element name="add">
+ <complexType>
+ <sequence>
+ <element name="arg_0_0" type="xsd:int"/>
+ <element name="arg_1_0" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="addResponse">
+ <complexType>
+ <sequence>
+ <element name="addReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="sub">
+ <complexType>
+ <sequence>
+ <element name="arg_0_1" type="xsd:int"/>
+ <element name="arg_1_1" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="subResponse">
+ <complexType>
+ <sequence>
+ <element name="subReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="mul">
+ <complexType>
+ <sequence>
+ <element name="arg_0_2" type="xsd:int"/>
+ <element name="arg_1_2" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="mulResponse">
+ <complexType>
+ <sequence>
+ <element name="mulReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="div">
+ <complexType>
+ <sequence>
+ <element name="arg_0_3" type="xsd:int"/>
+ <element name="arg_1_3" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="divResponse">
+ <complexType>
+ <sequence>
+ <element name="divReturn" type="xsd:int"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="subResponse">
+
+ <wsdl:part element="impl:subResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="mulResponse">
+
+ <wsdl:part element="impl:mulResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="subRequest">
+
+ <wsdl:part element="impl:sub" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="divRequest">
+
+ <wsdl:part element="impl:div" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="divResponse">
+
+ <wsdl:part element="impl:divResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="mulRequest">
+
+ <wsdl:part element="impl:mul" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="addResponse">
+
+ <wsdl:part element="impl:addResponse" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="addRequest">
+
+ <wsdl:part element="impl:add" name="parameters"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="Calculator">
+
+ <wsdl:operation name="add">
+
+ <wsdl:input message="impl:addRequest" name="addRequest"/>
+
+ <wsdl:output message="impl:addResponse" name="addResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="sub">
+
+ <wsdl:input message="impl:subRequest" name="subRequest"/>
+
+ <wsdl:output message="impl:subResponse" name="subResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="mul">
+
+ <wsdl:input message="impl:mulRequest" name="mulRequest"/>
+
+ <wsdl:output message="impl:mulResponse" name="mulResponse"/>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="div">
+
+ <wsdl:input message="impl:divRequest" name="divRequest"/>
+
+ <wsdl:output message="impl:divResponse" name="divResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="CalculatorSoapBinding" type="impl:Calculator">
+
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="add">
+
+ <wsdlsoap:operation soapAction="Calculator#add"/>
+
+ <wsdl:input name="addRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="addResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="sub">
+
+ <wsdlsoap:operation soapAction="Calculator#sub"/>
+
+ <wsdl:input name="subRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="subResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="mul">
+
+ <wsdlsoap:operation soapAction="Calculator#mul"/>
+
+ <wsdl:input name="mulRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="mulResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="div">
+
+ <wsdlsoap:operation soapAction="Calculator#div"/>
+
+ <wsdl:input name="divRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="divResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="Calculator">
+
+ <wsdl:port binding="impl:CalculatorSoapBinding" name="Calculator">
+
+ <wsdlsoap:address location="http://localhost/axis/Calculator"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/client/CalculatorAdd.c Mon Jul 16 09:42:53 2007
@@ -26,8 +26,8 @@
add_in = axis2_add_create(env);
- AXIS2_ADD_SET_IN0(add_in, env, 10);
- AXIS2_ADD_SET_IN1(add_in, env, 10);
+ axis2_add_set_arg_0_0(add_in, env, 10);
+ axis2_add_set_arg_1_0(add_in, env, 10);
add_res = axis2_stub_Calculator_add(stub, env, add_in);
@@ -37,7 +37,7 @@
return -1;
}
- res_val = AXIS2_ADDRESPONSE_GET_ADDRETURN(add_res, env);
+ res_val = axis2_addResponse_get_addReturn(add_res, env);
printf("ADD Result:%d ", res_val);
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/codegen/databinding/Calculator/server/axis2_skel_Calculator.c Mon Jul 16 09:42:53 2007
@@ -29,13 +29,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_ADD_GET_IN0(add, env);
- val2 = AXIS2_ADD_GET_IN1(add, env);
+ val1 = axis2_add_get_arg_0_0(add, env);
+ val2 = axis2_add_get_arg_1_0(add, env);
ret_val = val1 + val2;
add_res = axis2_addResponse_create(env);
- AXIS2_ADDRESPONSE_SET_ADDRETURN(add_res, env, ret_val);
+ axis2_addResponse_set_addReturn(add_res, env, ret_val);
return add_res;
}
@@ -56,13 +56,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_DIV_GET_IN0(div, env);
- val2 = AXIS2_DIV_GET_IN1(div, env);
+ val1 = axis2_div_get_arg_0_3(div, env);
+ val2 = axis2_div_get_arg_1_3(div, env);
ret_val = val1/val2;
div_res = axis2_divResponse_create(env);
- AXIS2_DIVRESPONSE_SET_ADDRETURN(div_res, env, ret_val);
+ axis2_divResponse_set_divReturn(div_res, env, ret_val);
return div_res;
}
@@ -85,13 +85,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_SUB_GET_IN0(sub, env);
- val2 = AXIS2_SUB_GET_IN1(sub, env);
+ val1 = axis2_sub_get_arg_0_1(sub, env);
+ val2 = axis2_sub_get_arg_1_1(sub, env);
ret_val = val1 - val2;
sub_res = axis2_subResponse_create(env);
- AXIS2_SUBRESPONSE_SET_SUBRETURN(sub_res, env, ret_val);
+ axis2_subResponse_set_subReturn(sub_res, env, ret_val);
return sub_res;
}
@@ -114,13 +114,13 @@
int val1 = 0;
int val2 = 0;
- val1 = AXIS2_MUL_GET_IN0(mul, env);
- val2 = AXIS2_MUL_GET_IN1(mul, env);
+ val1 = axis2_mul_get_arg_0_2(mul, env);
+ val2 = axis2_mul_get_arg_1_2(mul, env);
ret_val = val1*val2;
mul_res = axis2_mulResponse_create(env);
- AXIS2_MULRESPONSE_SET_ADDRETURN(mul_res, env, ret_val);
+ axis2_mulResponse_set_mulReturn(mul_res, env, ret_val);
return mul_res;
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/configure.ac?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/configure.ac (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/configure.ac Mon Jul 16 09:42:53 2007
@@ -2,17 +2,19 @@
AC_PREREQ(2.59)
-AC_INIT(axis2c-sample-src, 1.0.0)
+AC_INIT(axis2c-sample-src, 1.1.0)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([tar-ustar])
+dnl AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AC_PREFIX_DEFAULT(/usr/local/axis2c)
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
@@ -56,8 +58,8 @@
AC_C_CONST
dnl Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
+dnl AC_FUNC_MALLOC
+dnl AC_FUNC_REALLOC
PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
@@ -79,12 +81,12 @@
DICLIENT_DIR=""
)
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] Find the AXIOM header files in 'PATH'.
- 'PATH' should point to AXIOM include files location.
+AC_MSG_CHECKING(To Use Axis2 C . This is a compulsory module to build Axis2 C samples)
+AC_ARG_WITH(axis2,
+[ --with-axis2[=PATH] Find the AXIS2 header files in 'PATH'.
+ 'PATH' should point to AXIS2 include files location.
If you omit the '=PATH' part completely, the configure script will search
- '$(AXIS2C_HOME)/include/axis2-1.0' for AXIOM headers.],
+ '$(AXIS2C_HOME)/include/axis2-1.1' for AXIS2 headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -93,54 +95,25 @@
AC_MSG_RESULT(yes)
dnl Find axiom include dir in the path
if test -d $withval; then
- axiominc="-I$withval"
+ axis2inc="-I$withval"
dnl else find the axiom include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include/axis2-1.0"
+ axiominc="-I$(AXIS2C_HOME)/include/axis2-1.1"
else
- AC_MSG_ERROR(could not find axiom. stop)
+ AC_MSG_ERROR(could not find axis2. stop)
fi
;;
esac ],
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] Find the Axis2 util header files in 'PATH'.
- 'PATH' should point to Axis2 util include files location.
- If you omit the '=PATH' part completely, the configure script will search
- '$(AXIS2C_HOME)/include/axis2-1.0' for Axis2 util headers.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include/axis2-1.0"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-
APACHE2INC=$apache2inc
-AXIOMINC=$axiominc
-UTILINC=$axis2_utilinc
+AXIS2INC=$axis2inc
APRINC=$aprinc
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
-AC_SUBST(AXIOMINC)
-AC_SUBST(UTILINC)
+AC_SUBST(AXIS2INC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_DIR)
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,13 +1,9 @@
prglibdir=$(prefix)/services/Calculator
-samplesdir=$(prefix)/samples/server/Calculator
prglib_LTLIBRARIES = libCalculator.la
-samples_DATA=services.xml calc.h calc.c calc_skeleton.c Makefile.am Makefile.in
prglib_DATA=services.xml
-EXTRA_DIST = services.xml Calculator.mk
+EXTRA_DIST = services.xml Calculator.mk calc.h
noinst_HEADERS = calc.h
SUBDIRS =
libCalculator_la_SOURCES = calc.c calc_skeleton.c
libCalculator_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/Calculator/calc_skeleton.c Mon Jul 16 09:42:53 2007
@@ -62,12 +62,6 @@
calc_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "add");
- axutil_array_list_add(svc_skeleton->func_array, env, "sub");
- axutil_array_list_add(svc_skeleton->func_array, env, "mul");
- axutil_array_list_add(svc_skeleton->func_array, env, "div");
-
/* Any initialization stuff of calc goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,5 +1,3 @@
-samplesdir=$(prefix)/samples/server
SUBDIRS = echo math notify sg_math mtom Calculator
EXTRA_DIST = axis2.xml axis2.log
-samples_DATA= axis2.log axis2.xml Makefile.am Makefile.in
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/axis2.xml?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/axis2.xml (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/axis2.xml Mon Jul 16 09:42:53 2007
@@ -99,10 +99,13 @@
<!-- After PostDispatch phase, module or service author can add any phase as required -->
<!-- User defined phases could be added here -->
<!--phase name="userphase1"/-->
+ <!--phase name="RMPhase"/-->
+ <!--phase name="SavanPhase"/-->
</phaseOrder>
<phaseOrder type="outflow">
<!-- User defined phases could be added here -->
<!--phase name="RMPhase"/-->
+ <!--phase name="SavanPhase"/-->
<!--phase name="userphase1"/-->
<!--system predefined phase-->
<phase name="MessageOut"/>
@@ -111,10 +114,12 @@
<!-- User defined phases could be added here -->
<!--phase name="userphase1"/-->
<!--phase name="RMPhase"/-->
+ <!--phase name="SavanPhase"/-->
</phaseOrder>
<phaseOrder type="Outfaultflow">
<!-- User defined phases could be added here -->
<!--phase name="RMPhase"/-->
+ <!--phase name="SavanPhase"/-->
<!--phase name="userphase1"/-->
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo.c Mon Jul 16 09:42:53 2007
@@ -42,11 +42,11 @@
return NULL;
}
- text_parent_node = axiom_node_get_first_child(node, env);
- if (!text_parent_node) /* 'text' node */
+ text_parent_node = axiom_node_get_first_element(node, env);
+ if (!text_parent_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
- printf("Echo client ERROR: invalid XML in request\n");
+ printf("Echo client ERROR 1: invalid XML in request\n");
return NULL;
}
@@ -54,7 +54,7 @@
if (!text_node) /* actual text to echo */
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
- printf("Echo client ERROR: invalid XML in request\n");
+ printf("Echo client ERROR 2: invalid XML in request\n");
return NULL;
}
@@ -71,7 +71,7 @@
else
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
- printf("Echo client ERROR: invalid XML in request\n");
+ printf("Echo client ERROR 3: invalid XML in request\n");
return NULL;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/echo/echo_skeleton.c Mon Jul 16 09:42:53 2007
@@ -70,11 +70,6 @@
echo_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- /* Add the implemented operation names of the service to
- * the array list of functions
- */
- axutil_array_list_add(svc_skeleton->func_array, env, "echoString");
/* Any initialization stuff of echo service should go here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,13 +1,9 @@
prglibdir=$(prefix)/services/math
-samplesdir=$(prefix)/samples/server/math
prglib_LTLIBRARIES = libmath.la
-samples_DATA=services.xml math.h math.c math_skeleton.c Makefile.am Makefile.in
prglib_DATA=services.xml
-EXTRA_DIST = services.xml math.mk
+EXTRA_DIST = services.xml math.mk math.h
noinst_HEADERS = math.h
SUBDIRS =
libmath_la_SOURCES = math.c math_skeleton.c
libmath_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/math_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/math/math_skeleton.c Mon Jul 16 09:42:53 2007
@@ -62,12 +62,6 @@
math_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "add");
- axutil_array_list_add(svc_skeleton->func_array, env, "sub");
- axutil_array_list_add(svc_skeleton->func_array, env, "mul");
- axutil_array_list_add(svc_skeleton->func_array, env, "div");
-
/* Any initialization stuff of math goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,13 +1,9 @@
prglibdir=$(prefix)/services/mtom
-samplesdir=$(prefix)/samples/server/mtom
prglib_LTLIBRARIES = libmtom.la
-samples_DATA=mtom.c mtom_skeleton.c mtom.h services.xml Makefile.am Makefile.in
prglib_DATA= services.xml
-EXTRA_DIST = services.xml mtom.mk
+EXTRA_DIST = services.xml mtom.mk mtom.h
noinst_HEADERS = mtom.h
SUBDIRS =
libmtom_la_SOURCES = mtom.c mtom_skeleton.c
libmtom_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/mtom_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/mtom_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/mtom_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/mtom/mtom_skeleton.c Mon Jul 16 09:42:53 2007
@@ -68,11 +68,6 @@
mtom_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- /* Add the implemented operation names of the service to
- * the array list of functions
- */
- axutil_array_list_add(svc_skeleton->func_array, env, "mtomString");
/* Any initialization stuff of mtom service should go here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,13 +1,9 @@
prglibdir=$(prefix)/services/notify
-samplesdir=$(prefix)/samples/server/notify
prglib_LTLIBRARIES = libnotify.la
-samples_DATA=notify.c notify_skeleton.c notify.h services.xml Makefile.am Makefile.in
prglib_DATA= services.xml
-EXTRA_DIST = services.xml notify.mk
+EXTRA_DIST = services.xml notify.mk notify.h
noinst_HEADERS = notify.h
SUBDIRS =
libnotify_la_SOURCES = notify.c notify_skeleton.c
libnotify_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/notify_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/notify_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/notify_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/notify/notify_skeleton.c Mon Jul 16 09:42:53 2007
@@ -69,11 +69,6 @@
notify_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- /* Add the implemented operation names of the service to
- * the array list of functions
- */
- axutil_array_list_add(svc_skeleton->func_array, env, "notify");
/* Any initialization stuff of notify service should go here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/Makefile.am Mon Jul 16 09:42:53 2007
@@ -1,19 +1,11 @@
prglibdir=$(prefix)/services/sg_math
-samplesdir=$(prefix)/samples/server/sg_math
prglib_LTLIBRARIES = libadd.la libsub.la libmul.la libdiv.la
-samples_DATA=services.xml \
- add.h add.c add_skeleton.c \
- sub.h sub.c sub_skeleton.c \
- mul.h mul.c mul_skeleton.c \
- div.h div.c div_skeleton.c \
- Makefile.am Makefile.in
prglib_DATA=services.xml
-EXTRA_DIST = services.xml sg_math.mk
+EXTRA_DIST = services.xml sg_math.mk add.h div.h mul.h sub.h
+
noinst_HEADERS = add.h sub.h mul.h div.h
libadd_la_SOURCES = add.c add_skeleton.c
libsub_la_SOURCES = sub.c sub_skeleton.c
libmul_la_SOURCES = mul.c mul_skeleton.c
libdiv_la_SOURCES = div.c div_skeleton.c
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/add_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/add_skeleton.c Mon Jul 16 09:42:53 2007
@@ -62,9 +62,6 @@
add_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "add");
-
/* Any initialization stuff of add goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/div_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/div_skeleton.c Mon Jul 16 09:42:53 2007
@@ -62,9 +62,6 @@
div_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "div");
-
/* Any initialization stuff of div goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/mul_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/mul_skeleton.c Mon Jul 16 09:42:53 2007
@@ -62,9 +62,6 @@
mul_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "mul");
-
/* Any initialization stuff of mul goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/sub_skeleton.c?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/samples/server/sg_math/sub_skeleton.c Mon Jul 16 09:42:53 2007
@@ -61,9 +61,6 @@
sub_init(axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env)
{
- svc_skeleton->func_array = axutil_array_list_create(env, 0);
- axutil_array_list_add(svc_skeleton->func_array, env, "sub");
-
/* Any initialization stuff of sub goes here */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/dinesh/602/c/src/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/src/core/addr/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/src/core/addr/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/src/core/addr/Makefile.am Mon Jul 16 09:42:53 2007
@@ -6,6 +6,7 @@
endpoint_ref.c \
msg_info_headers.c
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/engine \
-I$(top_builddir)/util/include \
Modified: webservices/axis2/scratch/c/dinesh/602/c/src/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/src/core/clientapi/Makefile.am?view=diff&rev=556666&r1=556665&r2=556666
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/src/core/clientapi/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/src/core/clientapi/Makefile.am Mon Jul 16 09:42:53 2007
@@ -13,4 +13,5 @@
-I$(top_builddir)/src/core/deployment \
-I$(top_builddir)/util/include \
-I$(top_builddir)/util/include/platforms \
- -I$(top_builddir)/axiom/include
+ -I$(top_builddir)/axiom/include \
+ -I$(top_builddir)/neethi/include
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org