From a0c252c6569bf86e8e184ac563976f60a526b7fb Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 20 Apr 2009 13:40:36 +0000
Subject: [PATCH] Add JSON in the http server sample

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@780 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/samples/http_server/http_server.lpi            | 4 ++--
 wst/trunk/samples/http_server/http_server.pas            | 3 ++-
 .../samples/user_client_console/user_client_console.lpi  | 9 +++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/wst/trunk/samples/http_server/http_server.lpi b/wst/trunk/samples/http_server/http_server.lpi
index 496ee4dda..07df5d327 100644
--- a/wst/trunk/samples/http_server/http_server.lpi
+++ b/wst/trunk/samples/http_server/http_server.lpi
@@ -2,16 +2,16 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="\"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
       <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
diff --git a/wst/trunk/samples/http_server/http_server.pas b/wst/trunk/samples/http_server/http_server.pas
index 878712d86..11835ff29 100644
--- a/wst/trunk/samples/http_server/http_server.pas
+++ b/wst/trunk/samples/http_server/http_server.pas
@@ -8,7 +8,7 @@ uses
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
   indy_http_server, metadata_service, logger_extension, server_listener,
-  server_service_soap, server_binary_formatter, server_service_xmlrpc, config_objects,
+  server_service_soap, server_binary_formatter, server_service_xmlrpc, server_service_json, config_objects,
   user_service_intf, user_service_intf_binder, user_service_intf_imp, server_service_intf;
 
 
@@ -18,6 +18,7 @@ begin
   Server_service_RegisterBinaryFormat();
   Server_service_RegisterSoapFormat();
   Server_service_RegisterXmlRpcFormat();
+  Server_service_RegisterJsonFormat();
 
   RegisterUserServiceImplementationFactory();
   Server_service_RegisterUserServiceService();
diff --git a/wst/trunk/samples/user_client_console/user_client_console.lpi b/wst/trunk/samples/user_client_console/user_client_console.lpi
index c341819d0..e0233b079 100644
--- a/wst/trunk/samples/user_client_console/user_client_console.lpi
+++ b/wst/trunk/samples/user_client_console/user_client_console.lpi
@@ -2,16 +2,16 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="\"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
       <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
@@ -42,7 +42,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="user_client_console.exe"/>
@@ -51,9 +51,6 @@
       <OtherUnitFiles Value="..\;..\..\;$(LazarusDir)\others_package\synapse\;$(LazarusDir)\others_package\ics\latest_distr\Delphi\Vc32\;..\..\fcl-units\fcl-json\src\"/>
       <UnitOutputDirectory Value="obj"/>
     </SearchPaths>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Linking>
       <Debugging>
         <GenerateDebugInfo Value="True"/>