Author: nandika
Date: Thu Jan 25 23:11:31 2007
New Revision: 500159
URL: http://svn.apache.org/viewvc?view=rev&rev=500159
Log:
compile errors fixed, make file updated , vc project updated
Modified:
webservices/sandesha/trunk/c/build/win32/makefile
webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln
webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.vcproj
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
Modified: webservices/sandesha/trunk/c/build/win32/makefile
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build/win32/makefile?view=diff&rev=500159&r1=500158&r2=500159
==============================================================================
--- webservices/sandesha/trunk/c/build/win32/makefile (original)
+++ webservices/sandesha/trunk/c/build/win32/makefile Thu Jan 25 23:11:31 2007
@@ -37,7 +37,7 @@
#linker options
LD = link.exe
LDFLAGS = /nologo /LIBPATH:$(AXIS2_INSTALL_DIR)\lib /LIBPATH:$(SQLITE_SRC_DIR)
/LIBPATH:$(SANDESHADISTDIR)\sandesha2
-LIBS = axis2_util.lib axiom.lib axis2_parser.lib axis2_engine.lib sqlite.lib
axis2_http_receiver.lib axis2_http_sender.lib
+LIBS = axis2_util.lib axiom.lib axis2_parser.lib axis2_engine.lib sqlite3.lib
axis2_http_receiver.lib axis2_http_sender.lib
#debug symbols
!if "$(DEBUG)" == "1"
@@ -74,11 +74,11 @@
sandesha2:
$(CC) $(CFLAGS) $(SANDESHA2_CODE) /c
$(LD) $(LDFLAGS) $(LIBS) *.obj /DLL /OUT:$(SANDESHA_DLL).dll
/IMPLIB:$(SANDESHA_DLL).lib
- copy $(SANDESHA_DLL).dll $(SANDESHADISTDIR)\sandesha2
- copy $(SANDESHA_DLL).lib $(SANDESHADISTDIR)\sandesha2
- copy *.pdb $(SANDESHADISTDIR)\sandesha2
del *.obj
+
+ copy $(SANDESHA_DLL).* $(SANDESHADISTDIR)\sandesha2
+
del *.dll
del *.exp
del *.lib
Modified: webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln?view=diff&rev=500159&r1=500158&r2=500159
==============================================================================
--- webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln (original)
+++ webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln Thu Jan 25
23:11:31 2007
@@ -3,6 +3,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandesha2",
"sandesha2.vcproj", "{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RMSampleService",
"..\RMSampleService\RMSampleService.vcproj",
"{5B609C8F-D6DA-42CF-A9B1-5DB83E61E27B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -13,6 +15,10 @@
{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Debug|Win32.Build.0 =
Debug|Win32
{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.ActiveCfg
= Release|Win32
{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}.Release|Win32.Build.0 =
Release|Win32
+ {5B609C8F-D6DA-42CF-A9B1-5DB83E61E27B}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {5B609C8F-D6DA-42CF-A9B1-5DB83E61E27B}.Debug|Win32.Build.0 =
Debug|Win32
+ {5B609C8F-D6DA-42CF-A9B1-5DB83E61E27B}.Release|Win32.ActiveCfg
= Release|Win32
+ {5B609C8F-D6DA-42CF-A9B1-5DB83E61E27B}.Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.vcproj
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.vcproj?view=diff&rev=500159&r1=500158&r2=500159
==============================================================================
--- webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.vcproj (original)
+++ webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.vcproj Thu Jan 25
23:11:31 2007
@@ -17,16 +17,19 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ OutputDirectory="$(AXIS2C_HOME)\modules\sandesha2"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="copy .\..\..\..\config\axis2.xml
$(AXIS2C_HOME)"
/>
<Tool
Name="VCCustomBuildTool"
+ CommandLine="copy
.\..\..\..\config\sandesha2_schema.bat $(AXIS2C_HOME)"
+ Outputs="$(AXIS2C_HOME)"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -58,14 +61,18 @@
/>
<Tool
Name="VCPreLinkEventTool"
+ CommandLine=""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="axis2_util.lib
axiom.lib axis2_engine.lib sqlite.lib"
+ LinkLibraryDependencies="false"
+ UseLibraryDependencyInputs="true"
+ AdditionalDependencies="axis2_util.lib
axiom.lib axis2_engine.lib axis2_parser.lib sqlite.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="E:\sqlitedll"
- ModuleDefinitionFile="sqlite3.def"
+ AdditionalLibraryDirectories=""
+ ModuleDefinitionFile=""
GenerateDebugInformation="true"
+ MapExports="false"
SubSystem="2"
TargetMachine="1"
/>
@@ -74,6 +81,7 @@
/>
<Tool
Name="VCManifestTool"
+ UseFAT32Workaround="true"
/>
<Tool
Name="VCXDCMakeTool"
@@ -92,6 +100,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy .\..\..\..\config\module.xml
$(AXIS2C_HOME)\modules\sandesha2"
/>
</Configuration>
<Configuration
@@ -613,6 +622,10 @@
Name="client"
>
<File
+
RelativePath="..\..\..\src\client\client.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\client\report.c"
>
</File>
@@ -632,6 +645,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
+ <File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource1.h"
+ >
+ </File>
<File
RelativePath="..\..\..\include\sandesha2_accept.h"
>
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=500159&r1=500158&r2=500159
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
Thu Jan 25 23:11:31 2007
@@ -46,6 +46,9 @@
#include <axis2_transport_out_desc.h>
#include <axis2_http_transport.h>
#include <axis2_rand.h>
+#include <sandesha2_msg_retrans_adjuster.h>
+#include <sandesha2_terminate_mgr.h>
+
/**
* @brief Make Connection Message Processor struct impl
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=500159&r1=500158&r2=500159
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
Thu Jan 25 23:11:31 2007
@@ -368,7 +368,7 @@
}
}
- thread_id_key = AXIS2_MALLOC(env->allocator, 128);
+ thread_id_key = AXIS2_MALLOC(env->allocator, sizeof(char)*128);
sprintf(thread_id_key, "%lu", thread_id);
transaction = (sandesha2_transaction_t *) axis2_hash_get(
storage_mgr_impl->transactions, thread_id_key, AXIS2_HASH_KEY_STRING);
@@ -940,9 +940,10 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if(op)
{
+ axis2_op_ctx_t *op_ctx = NULL;
axis2_svc_ctx_t *svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env);
axis2_allocator_switch_to_global_pool(env->allocator);
- axis2_op_ctx_t *op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
+ op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
if(op_ctx)
{
axis2_char_t *msg_id = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
