From 2466c0ab1a012de9a4cc028bfec01d28fc6cf4da Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 6 Aug 2011 17:01:02 +0000
Subject: [PATCH] Updated to use FPC's servers (TCP and HTTP) implementation

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1780 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/samples/tcp_server/tcp_server.lpi   | 25 +++++++++----------
 wst/trunk/samples/tcp_server/tcp_server.pas   |  6 +++--
 .../user_client_console.pas                   | 10 +++++---
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/wst/trunk/samples/tcp_server/tcp_server.lpi b/wst/trunk/samples/tcp_server/tcp_server.lpi
index 1c50c8704..ab3e9468d 100644
--- a/wst/trunk/samples/tcp_server/tcp_server.lpi
+++ b/wst/trunk/samples/tcp_server/tcp_server.lpi
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
@@ -12,11 +12,13 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@@ -28,11 +30,6 @@
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="1">
-      <Item1>
-        <PackageName Value="wst_indy"/>
-      </Item1>
-    </RequiredPackages>
     <Units Count="4">
       <Unit0>
         <Filename Value="tcp_server.pas"/>
@@ -57,24 +54,26 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="tcp_server.exe"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="..\..\;..\"/>
-      <OtherUnitFiles Value="..\;..\..\;..\..\wst_rtti_filter\;$(LazarusDir)\others_package\synapse\"/>
+      <IncludeFiles Value="..\..;.."/>
+      <OtherUnitFiles Value="..;..\..;..\..\wst_rtti_filter;$(LazarusDir)\others_package\synapse"/>
       <UnitOutputDirectory Value="obj"/>
-      <SrcPath Value="$(LazarusDir)\others_package\synapse\"/>
+      <SrcPath Value="$(LazarusDir)\others_package\synapse"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
-        <UseAnsiStrings Value="True"/>
       </SyntaxOptions>
     </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CustomOptions Value="-dINDY_10"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/wst/trunk/samples/tcp_server/tcp_server.pas b/wst/trunk/samples/tcp_server/tcp_server.pas
index 144ffb87d..a695c3600 100644
--- a/wst/trunk/samples/tcp_server/tcp_server.pas
+++ b/wst/trunk/samples/tcp_server/tcp_server.pas
@@ -28,8 +28,9 @@ uses
   base_binary_formatter, server_binary_formatter,
   metadata_service, metadata_service_imp, metadata_service_binder,
   server_listener ,
+  fpc_tcp_server,
   //synapse_tcp_server,
-  indy_tcp_server,
+  //indy_tcp_server,
 
   user_service_intf, user_service_intf_binder, user_service_intf_imp , imp_helper,
   server_service_xmlrpc;
@@ -53,7 +54,8 @@ begin
   WriteLn(Format('WST sample TCP Server listning on "%d"',[sSERVER_PORT]));
   WriteLn('Hit <enter> to stop.');
   //listener := TwstSynapseTcpListener.Create();
-  listener := TwstIndyTcpListener.Create();
+  //listener := TwstIndyTcpListener.Create();
+  listener := TwstFPCTcpListener.Create();
   listener.Start();
   ReadLn;
 end.
diff --git a/wst/trunk/samples/user_client_console/user_client_console.pas b/wst/trunk/samples/user_client_console/user_client_console.pas
index 5851e8a71..21342bff9 100644
--- a/wst/trunk/samples/user_client_console/user_client_console.pas
+++ b/wst/trunk/samples/user_client_console/user_client_console.pas
@@ -8,8 +8,9 @@ uses
   Classes, SysUtils, TypInfo, {$IFDEF WINDOWS}ActiveX,{$ENDIF}
   user_service_intf_proxy,
   //same_process_protocol, synapse_tcp_protocol, synapse_http_protocol, library_protocol,
-  same_process_protocol, indy_tcp_protocol, indy_http_protocol, library_protocol,
+  //same_process_protocol, indy_tcp_protocol, indy_http_protocol, library_protocol,
 //  same_process_protocol, ics_tcp_protocol, ics_http_protocol, library_protocol,
+  same_process_protocol, fpc_tcp_protocol, fpc_http_protocol, library_protocol,
   soap_formatter, binary_formatter, json_formatter,
   user_service_intf, xmlrpc_formatter, service_intf;
 
@@ -244,10 +245,13 @@ begin
 {$IFEND}
 //    SYNAPSE_RegisterTCP_Transport();
 //    SYNAPSE_RegisterHTTP_Transport();
-    INDY_RegisterTCP_Transport();
-    INDY_RegisterHTTP_Transport();
+//    INDY_RegisterTCP_Transport();
+//    INDY_RegisterHTTP_Transport();
 //    ICS_RegisterTCP_Transport();
 //    ICS_RegisterHTTP_Transport();
+    FPC_RegisterTCP_Transport();
+    FPC_RegisterHTTP_Transport();
+
     LIB_Register_Transport();
     WriteLn('Sample Application using Web Services Toolkit');
     ReadFormatType();