* Lazarus is no longer needed for the examples

git-svn-id: trunk@17740 -

.gitattributes

@@ -2368,7 +2368,6 @@ packages/fcl-web/examples/combined/users.sql svneol=native#text/plain
 packages/fcl-web/examples/combined/wmlogin.lfm svneol=native#text/plain
 packages/fcl-web/examples/combined/wmlogin.pp svneol=native#text/plain
 packages/fcl-web/examples/combined/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/combined/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/combined/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/httpapp/testhttp.lpi svneol=native#text/plain
 packages/fcl-web/examples/httpapp/testhttp.pp svneol=native#text/plain
@@ -2388,7 +2387,6 @@ packages/fcl-web/examples/jsonrpc/demo1/echobatch.in svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/demo1/extdirect.in svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/demo1/notification.in svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/demo1/wmdemo.lfm svneol=native#text/plain
-packages/fcl-web/examples/jsonrpc/demo1/wmdemo.lrs svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/demo1/wmdemo.pp svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/extdemo.html svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/extdemo.js svneol=native#text/plain
@@ -2396,7 +2394,6 @@ packages/fcl-web/examples/jsonrpc/extdirect/extdemo.lpi svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/extdemo.lpr svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/extdirect.in svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/wmext.lfm svneol=native#text/plain
-packages/fcl-web/examples/jsonrpc/extdirect/wmext.lrs svneol=native#text/plain
 packages/fcl-web/examples/jsonrpc/extdirect/wmext.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/createusers.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/createusers.lpr svneol=native#text/plain
@@ -2409,7 +2406,6 @@ packages/fcl-web/examples/webdata/demo/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/lazwebdata.pas svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/reglazwebdata.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/extgrid-json.html svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/extgrid-json.js svneol=native#text/plain
@@ -2418,7 +2414,6 @@ packages/fcl-web/examples/webdata/demo2/extgrid-xml.js svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/extgrid.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo2/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo2/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/extgrid-json.html svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/extgrid-json.js svneol=native#text/plain
@@ -2427,13 +2422,10 @@ packages/fcl-web/examples/webdata/demo3/extgrid-xml.js svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/extgrid.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/tralala.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo3/tralala.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/tralala.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo3/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo3/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/dmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo4/dmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/dmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/extgrid-json.html svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/extgrid-json.js svneol=native#text/plain
@@ -2442,10 +2434,8 @@ packages/fcl-web/examples/webdata/demo4/extgrid-xml.js svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/extgrid.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/wmjsonusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo4/wmjsonusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/wmjsonusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/wmxmlusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo4/wmxmlusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo4/wmxmlusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/extgrid-json.html svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/extgrid-json.js svneol=native#text/plain
@@ -2454,7 +2444,6 @@ packages/fcl-web/examples/webdata/demo5/extgrid-xml.js svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/extgrid.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo5/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo5/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/extgrid-json.html svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/extgrid-json.js svneol=native#text/plain
@@ -2464,7 +2453,6 @@ packages/fcl-web/examples/webdata/demo6/extgrid.ini svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/extgrid.lpi svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/extgrid.lpr svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/wmusers.lfm svneol=native#text/plain
-packages/fcl-web/examples/webdata/demo6/wmusers.lrs svneol=native#text/plain
 packages/fcl-web/examples/webdata/demo6/wmusers.pp svneol=native#text/plain
 packages/fcl-web/examples/webdata/demos.txt svneol=native#text/plain
 packages/fcl-web/examples/webdata/users.dbf -text

packages/fcl-web/examples/combined/wmlogin.pp

@@ -5,7 +5,7 @@ unit wmlogin;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, HTTPDefs, websession, fpHTTP, fpWeb, fpjsonrpc, 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb, fpjsonrpc, 
   fpjson, IBConnection, sqldb, webjsonrpc, fpextdirect, sqldbwebdata;
 
 type

packages/fcl-web/examples/combined/wmusers.lrs

@@ -1,35 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TCombinedModule','FORMDATA',[
-  'TPF0'#15'TCombinedModule'#14'CombinedModule'#8'OnCreate'#7#16'DataModuleCrea'
-  +'te'#14'OldCreateOrder'#8#12'InputAdaptor'#7#20'ProviderInputAdaptor'#15'Con'
-  +'tentProducer'#7#17'ProviderFormatter'#20'OnGetContentProducer'#7#28'DataMod'
-  +'uleGetContentProducer'#17'OnGetInputAdaptor'#7#25'DataModuleGetInputAdaptor'
-  +#12'OnNewSession'#7#20'DataModuleNewSession'#6'Height'#3','#1#16'HorizontalO'
-  +'ffset'#3'{'#2#14'VerticalOffset'#3#230#0#5'Width'#3#144#1#0#23'TExtJSJSONDa'
-  +'taFormatter'#17'ProviderFormatter'#13'AllowPageSize'#8#16'BeforeDataToJSON'
-  +#7'!ProviderFormatterBeforeDataToJSON'#12'BeforeUpdate'#7#29'ProviderFormatt'
-  +'erBeforeUpdate'#12'BeforeInsert'#7#29'ProviderFormatterBeforeInsert'#12'Bef'
-  +'oreDelete'#7#29'ProviderFormatterBeforeDelete'#4'left'#3#16#1#3'top'#2'H'#0
-  +#0#21'TSQLDBWebDataProvider'#5'Users'#17'SelectSQL.Strings'#1#6'USELECT FIRS'
-  +'T :limit SKIP :start U_ID, U_NAME, U_LOGIN, U_PASSWORD, U_EMAIL FROM USERS'
-  +#0#17'UpdateSQL.Strings'#1#6#16'UPDATE USERS SET'#6#17'  U_NAME=:U_NAME,'#6
-  +#19'  U_LOGIN=:U_LOGIN,'#6#19'  U_EMAIL=:U_EMAIL,'#6#24'  U_PASSWORD=:U_PASS'
-  +'WORD'#6#5'WHERE'#6#14'  (U_ID=:U_ID)'#0#17'DeleteSQL.Strings'#1#6'"DELETE F'
-  +'ROM USERS WHERE (U_ID=:ID)'#0#17'InsertSQL.Strings'#1#6#17'INSERT INTO USER'
-  +'S'#6',(U_ID, U_LOGIN, U_NAME, U_EMAIL, U_PASSWORD)'#6#6'VALUES'#6'1(:U_ID, '
-  +':U_LOGIN, :U_NAME, :U_EMAIL, :U_PASSWORD)'#0#10'Connection'#7#13'IBConnecti'
-  +'on1'#11'IDFieldName'#6#4'U_ID'#10'OnGetNewID'#7#13'UsersGetNewID'#7'Options'
-  +#11#0#6'Params'#14#1#8'DataType'#7#9'ftUnknown'#4'Name'#6#5'limit'#9'ParamTy'
-  +'pe'#7#9'ptUnknown'#0#1#8'DataType'#7#9'ftUnknown'#4'Name'#6#5'start'#9'Para'
-  +'mType'#7#9'ptUnknown'#0#0#4'left'#2' '#3'top'#2'H'#0#0#13'TIBConnection'#13
-  +'IBConnection1'#9'Connected'#8#11'LoginPrompt'#8#14'KeepConnection'#8#11'Tra'
-  +'nsaction'#7#15'SQLTransaction1'#9'LogEvents'#11#0#4'left'#2' '#3'top'#2#16#0
-  +#0#9'TSQLQuery'#6'QGetID'#14'AutoCalcFields'#8#8'Database'#7#13'IBConnection'
-  +'1'#11'Transaction'#7#15'SQLTransaction1'#8'ReadOnly'#8#11'SQL.Strings'#1#6
-  +'6SELECT GEN_ID(GEN_USERS,1) AS THEID  FROM RDB$DATABASE'#0#6'Params'#14#0#4
-  +'left'#2' '#3'top'#3#128#0#0#0#15'TSQLTransaction'#15'SQLTransaction1'#6'Act'
-  +'ive'#8#6'Action'#7#6'caNone'#8'Database'#7#13'IBConnection1'#4'left'#3#144#0
-  +#3'top'#2#16#0#0#29'TExtJSJSonWebdataInputAdaptor'#20'ProviderInputAdaptor'#4
-  +'left'#3#16#1#3'top'#2#16#0#0#0
-]);

packages/fcl-web/examples/combined/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb,
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb,
   IBConnection, sqldb, fpwebdata, fpjson, extjsjson, extjsxml, sqldbwebdata;
 
 type
@@ -43,6 +43,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses inifiles;
 
 { TCombinedModule }
@@ -138,8 +140,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
-
   RegisterHTTPModule('Provider', TCombinedModule);
 end.
 

packages/fcl-web/examples/jsonrpc/demo1/demo.lpi

@@ -1,25 +1,27 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
+        <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <Runnable Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
       <Title Value="FPC JSON-RPC demo "/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -59,21 +61,19 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
-    <Parsing>
-      <SyntaxOptions>
-        <UseAnsiStrings Value="True"/>
-      </SyntaxOptions>
-    </Parsing>
     <Linking>
       <Debugging>
         <UseHeaptrc Value="True"/>
       </Debugging>
     </Linking>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/jsonrpc/demo1/demo.lpr

@@ -8,8 +8,10 @@ uses
 // {$R *.res}
 
 
+{$R *.res}
+
 begin
-  Application.Title:='FPC JSON-RPC demo';
+  Application.Title:='FPC JSON-RPC demo ';
   Application.Initialize;
   Application.Run;
 end.

packages/fcl-web/examples/jsonrpc/demo1/wmdemo.lrs

@@ -1,15 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebModule1','FORMDATA',[
-  'TPF0'#13'TFPWebModule1'#12'FPWebModule1'#8'OnCreate'#7#16'DataModuleCreate'
-  +#14'OldCreateOrder'#8#7'Actions'#14#1#4'Name'#6#6'Manual'#7'Default'#9#9'OnR'
-  +'equest'#7#21'TFPWebActions0Request'#0#1#4'Name'#6#8'Dispatch'#7'Default'#8#9
-  +'OnRequest'#7#21'TFPWebActions1Request'#0#1#4'Name'#6#10'Registered'#7'Defau'
-  +'lt'#8#9'OnRequest'#7#21'TFPWebActions2Request'#0#1#4'Name'#6#9'ExtDirect'#7
-  +'Default'#8#9'OnRequest'#7#21'TFPWebActions3Request'#0#1#4'Name'#6#7'Content'
-  +#7'Default'#8#9'OnRequest'#7#21'TFPWebActions4Request'#0#1#4'Name'#6#12'ExtD'
-  +'irectAPI'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions5Request'#0#1#4'Name'
-  +#6#6'Module'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions6Request'#0#0#9'Act'
-  +'ionVar'#6#6'Action'#13'CreateSession'#8#6'Height'#3#4#1#16'HorizontalOffset'
-  +#3'B'#2#14'VerticalOffset'#3'u'#1#5'Width'#3#186#1#0#0
-]);

packages/fcl-web/examples/jsonrpc/demo1/wmdemo.pp

@@ -5,7 +5,7 @@ unit wmdemo;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb; 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb; 
 
 type
 
@@ -38,6 +38,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 Uses fpjson,jsonparser,fpjsonrpc,webjsonrpc, fpextdirect;
 
 { TFPWebModule1 }
@@ -376,8 +378,6 @@ begin
 end;
 
 initialization
-  {$I wmdemo.lrs}
-
   RegisterHTTPModule('echo', TFPWebModule1);
 end.
 

packages/fcl-web/examples/jsonrpc/extdirect/extdemo.lpi

@@ -1,25 +1,27 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
+        <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <Runnable Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
       <Title Value="Ext.Direct demo application"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -47,201 +49,33 @@
         <PackageName Value="FCL"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="12">
+    <Units Count="2">
       <Unit0>
         <Filename Value="extdemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="extdemo"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="7" Y="6"/>
-        <UsageCount Value="24"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="wmdemo.pp"/>
-        <ComponentName Value="FPWebModule1"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="wmdemo"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="21" Y="28"/>
-        <UsageCount Value="24"/>
-        <Loaded Value="True"/>
-      </Unit1>
-      <Unit2>
         <Filename Value="wmext.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="DemoClass"/>
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="wmext"/>
-        <EditorIndex Value="6"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="3"/>
-        <CursorPos X="22" Y="48"/>
-        <UsageCount Value="24"/>
-        <Loaded Value="True"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <UnitName Value="fpextdirect"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="7"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="185"/>
-        <CursorPos X="49" Y="196"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="../../../src/jsonrpc/fpjsonrpc.pp"/>
-        <UnitName Value="fpjsonrpc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="432"/>
-        <CursorPos X="6" Y="441"/>
-        <UsageCount Value="10"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="../../../../../lazarus/components/fpweb/reglazwebextra.pp"/>
-        <UnitName Value="reglazwebextra"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="67"/>
-        <CursorPos X="56" Y="81"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="wmext.lrs"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="9"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="../../../src/base/fpcgi.pp"/>
-        <UnitName Value="fpcgi"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="26" Y="20"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="../../../src/base/custcgi.pp"/>
-        <UnitName Value="custcgi"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="24"/>
-        <CursorPos X="33" Y="24"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="../../../src/base/httpdefs.pp"/>
-        <UnitName Value="HTTPDefs"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="26" Y="38"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="../../../src/base/custweb.pp"/>
-        <UnitName Value="custweb"/>
-        <EditorIndex Value="5"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="221"/>
-        <CursorPos X="17" Y="265"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="../../../src/jsonrpc/webjsonrpc.pp"/>
-        <UnitName Value="webjsonrpc"/>
-        <EditorIndex Value="8"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="29"/>
-        <CursorPos X="27" Y="29"/>
-        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
-      </Unit11>
+      </Unit1>
     </Units>
-    <JumpHistory Count="13" HistoryIndex="12">
-      <Position1>
-        <Filename Value="../../../../../lazarus/components/fpweb/reglazwebextra.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position1>
-      <Position2>
-        <Filename Value="extdemo.lpr"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position2>
-      <Position3>
-        <Filename Value="extdemo.lpr"/>
-        <Caret Line="11" Column="1" TopLine="1"/>
-      </Position3>
-      <Position4>
-        <Filename Value="wmext.pp"/>
-        <Caret Line="6" Column="18" TopLine="2"/>
-      </Position4>
-      <Position5>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <Caret Line="376" Column="36" TopLine="370"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../../src/base/httpdefs.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position6>
-      <Position7>
-        <Filename Value="../../../src/base/httpdefs.pp"/>
-        <Caret Line="936" Column="3" TopLine="929"/>
-      </Position7>
-      <Position8>
-        <Filename Value="../../../src/base/custweb.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position8>
-      <Position9>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <Caret Line="397" Column="17" TopLine="368"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <Caret Line="29" Column="1" TopLine="26"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <Caret Line="398" Column="16" TopLine="373"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../../src/jsonrpc/fpextdirect.pp"/>
-        <Caret Line="413" Column="21" TopLine="379"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../../src/jsonrpc/webjsonrpc.pp"/>
-        <Caret Line="66" Column="14" TopLine="41"/>
-      </Position13>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="extdemo.cgi"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
-    <Parsing>
-      <SyntaxOptions>
-        <UseAnsiStrings Value="True"/>
-      </SyntaxOptions>
-    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/jsonrpc/extdirect/wmext.lrs

@@ -1,10 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TDemoClass','FORMDATA',[
-  'TPF0'#10'TDemoClass'#9'DemoClass'#14'OldCreateOrder'#8#7'APIPath'#6#3'API'#10
-  +'RouterPath'#6#6'Router'#6'Height'#3'9'#1#16'HorizontalOffset'#3'$'#2#14'Ver'
-  +'ticalOffset'#3#230#0#5'Width'#3'g'#1#0#15'TJSONRPCHandler'#3'Add'#9'OnExecu'
-  +'te'#7#10'AddExecute'#7'Options'#11#0#9'ParamDefs'#14#1#4'Name'#6#1'A'#8'Dat'
-  +'aType'#7#8'jtNumber'#0#1#4'Name'#6#1'B'#8'DataType'#7#8'jtNumber'#0#0#4'lef'
-  +'t'#2'8'#3'top'#2' '#0#0#0
-]);

packages/fcl-web/examples/jsonrpc/extdirect/wmext.pp

@@ -5,7 +5,7 @@ unit wmext;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb, 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb, 
     fpjsonrpc, webjsonrpc, fpextdirect, fpjson;
 
 type
@@ -27,6 +27,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 { TDemoClass }
 
 procedure TDemoClass.AddExecute(Sender: TObject;
@@ -45,8 +47,6 @@ begin
 end;
 
 initialization
-  {$I wmext.lrs}
-
   RegisterHTTPModule('demo', TDemoClass);
 end.
 

packages/fcl-web/examples/webdata/demo/createusers.lpi

@@ -1,22 +1,25 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
+        <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <Icon Value="0"/>
       <UseXPManifest Value="True"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
       <Language Value=""/>
       <CharSet Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -29,35 +32,32 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="2">
+    <Units Count="1">
       <Unit0>
         <Filename Value="createusers.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="createusers"/>
-        <CursorPos X="16" Y="35"/>
-        <TopLine Value="15"/>
-        <UsageCount Value="20"/>
       </Unit0>
-      <Unit1>
-        <Filename Value="../../fpc/packages/fcl-db/src/dbase/dbf.pas"/>
-        <UnitName Value="dbf"/>
-        <CursorPos X="3" Y="1477"/>
-        <TopLine Value="1436"/>
-        <UsageCount Value="10"/>
-      </Unit1>
     </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="createusers"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/webdata/demo/createusers.lpr

@@ -127,6 +127,8 @@ var
 
 {$IFDEF WINDOWS}{$R createusers.rc}{$ENDIF}
 
+{$R *.res}
+
 begin
   Application:=TMyApplication.Create(nil);
   Application.Title:='My Application';

packages/fcl-web/examples/webdata/demo/wmusers.lrs

@@ -1,12 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebModule1','FORMDATA',[
-  'TPF0'#13'TFPWebModule1'#12'FPWebModule1'#14'OldCreateOrder'#8#7'Actions'#14#1
-  +#4'Name'#6#4'Read'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions0Request'#0#1
-  +#4'Name'#6#6'Insert'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions1Request'#0
-  +#1#4'Name'#6#6'Update'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions2Request'
-  +#0#1#4'Name'#6#6'Delete'#7'Default'#8#9'OnRequest'#7#21'TFPWebActions3Reques'
-  +'t'#0#0#13'CreateSession'#8#6'Height'#3','#1#16'HorizontalOffset'#3#184#2#14
-  +'VerticalOffset'#3'n'#1#5'Width'#3#144#1#0#4'TDbf'#4'Dbf1'#9'IndexDefs'#14#0
-  +#10'TableLevel'#2#4#13'FilterOptions'#11#0#4'left'#2#23#3'top'#2'5'#0#0#0
-]);

packages/fcl-web/examples/webdata/demo/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb,
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb,
   db, dbf, fpwebdata, fpextjs,extjsjson,extjsxml;
 
 type
@@ -36,6 +36,9 @@ Var
   ResponseFileName : String; // Set to non empty to write request responses to a file.
 
 implementation
+
+{$R *.lfm}
+
 {$define wmdebug}
 
 {$ifdef wmdebug}
@@ -294,8 +297,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
-
   RegisterHTTPModule('Provider', TFPWebModule1);
 end.
 

packages/fcl-web/examples/webdata/demo2/wmusers.lrs

@@ -1,18 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebModule1','FORMDATA',[
-  'TPF0'#13'TFPWebModule1'#12'FPWebModule1'#8'OnCreate'#7#16'DataModuleCreate'
-  +#14'OldCreateOrder'#8#7'Actions'#14#0#9'OnRequest'#7#17'DataModuleRequest'#13
-  +'CreateSession'#8#6'Height'#3','#1#16'HorizontalOffset'#3#221#1#14'VerticalO'
-  +'ffset'#3'.'#1#5'Width'#3#144#1#0#4'TDbf'#4'Dbf1'#8'FilePath'#6'&/home/micha'
-  +'el/public_html/extjs/demo2/'#9'IndexDefs'#14#0#9'TableName'#6#9'users.dbf'
-  +#10'TableLevel'#2#4#13'FilterOptions'#11#0#4'left'#2'3'#3'top'#2'@'#0#0#29'T'
-  +'ExtJSJSonWebdataInputAdaptor'#29'ExtJSJSonWebdataInputAdaptor1'#4'left'#3
-  +#146#0#3'top'#2'?'#0#0#23'TExtJSJSONDataFormatter'#23'ExtJSJSONDataFormatter'
-  +'1'#4'left'#3#207#0#3'top'#2'='#0#0#28'TExtJSXMLWebdataInputAdaptor'#28'ExtJ'
-  +'SXMLWebdataInputAdaptor1'#4'left'#3#151#0#3'top'#2'e'#0#0#22'TExtJSXMLDataF'
-  +'ormatter'#22'ExtJSXMLDataFormatter1'#4'left'#3#211#0#3'top'#2'd'#0#0#18'TFP'
-  +'WebDataProvider'#18'FPWebDataProvider1'#10'DataSource'#7#11'Datasource1'#4
-  +'left'#2'i'#3'top'#2'Y'#0#0#11'TDatasource'#11'Datasource1'#7'DataSet'#7#4'D'
-  +'bf1'#4'left'#2'0'#3'top'#2'h'#0#0#0
-]);

packages/fcl-web/examples/webdata/demo2/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, fpwebdata, extjsjson, extjsxml,
+  Classes, SysUtils, fpwebdata, extjsjson, extjsxml,
   HTTPDefs, websession, fpHTTP, fpWeb, dbf, db;
 
 type
@@ -34,6 +34,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses dbugintf;
 
 { TFPWebModule1 }
@@ -80,7 +82,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
   RegisterHTTPModule('Provider', TFPWebModule1);
 end.
 

packages/fcl-web/examples/webdata/demo3/extgrid.lpi

@@ -1,21 +1,23 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
+        <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <Runnable Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <Icon Value="0"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="3"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -47,16 +49,11 @@
         <PackageName Value="FCL"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="16">
+    <Units Count="2">
       <Unit0>
         <Filename Value="extgrid.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="extgrid"/>
-        <CursorPos X="24" Y="6"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="21"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="wmusers.pp"/>
@@ -64,257 +61,26 @@
         <ComponentName Value="FPWebProviderDataModule1"/>
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="wmusers"/>
-        <CursorPos X="33" Y="60"/>
-        <TopLine Value="27"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="21"/>
-        <Loaded Value="True"/>
       </Unit1>
-      <Unit2>
-        <Filename Value="../demo2/wmusers.pp"/>
-        <ComponentName Value="FPWebModule1"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="wmusers"/>
-        <CursorPos X="1" Y="80"/>
-        <TopLine Value="45"/>
-        <UsageCount Value="10"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="../fpwebdata.pp"/>
-        <ComponentName Value="FPWebProviderDataModule"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="fpwebdata"/>
-        <CursorPos X="26" Y="1530"/>
-        <TopLine Value="1526"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="wmusers.lfm"/>
-        <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="../demo/reglazwebextra.pp"/>
-        <UnitName Value="reglazwebextra"/>
-        <CursorPos X="53" Y="50"/>
-        <TopLine Value="34"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="../../../fpc/rtl/objpas/classes/classesh.inc"/>
-        <CursorPos X="17" Y="1833"/>
-        <TopLine Value="1812"/>
-        <UsageCount Value="10"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="../../../fpc/rtl/objpas/classes/dm.inc"/>
-        <CursorPos X="3" Y="18"/>
-        <TopLine Value="16"/>
-        <UsageCount Value="10"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="../../../fpc/packages/fcl-web/src/fphttp.pp"/>
-        <UnitName Value="fphttp"/>
-        <CursorPos X="3" Y="105"/>
-        <TopLine Value="108"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="../../../fpc/packages/fcl-web/src/fpweb.pp"/>
-        <UnitName Value="fpWeb"/>
-        <CursorPos X="3" Y="421"/>
-        <TopLine Value="419"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="../../../fpc/lazarus/components/fpweb/weblazideintf.pp"/>
-        <UnitName Value="WebLazIDEIntf"/>
-        <CursorPos X="52" Y="173"/>
-        <TopLine Value="145"/>
-        <UsageCount Value="10"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="../../../fpc/lazarus/components/fpweb/lazweb.pp"/>
-        <UnitName Value="lazweb"/>
-        <CursorPos X="12" Y="7"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="tralala.pp"/>
-        <ComponentName Value="FPWebModule1"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="tralala"/>
-        <CursorPos X="7" Y="11"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="20"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="../fpwebdata.lfm"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="LFM"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="../../../fpc/packages/fcl-web/src/websession.pp"/>
-        <UnitName Value="websession"/>
-        <CursorPos X="20" Y="40"/>
-        <TopLine Value="20"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="../../../fpc/packages/fcl-xml/src/xmliconv.pas"/>
-        <UnitName Value="xmliconv"/>
-        <CursorPos X="1" Y="64"/>
-        <TopLine Value="37"/>
-        <UsageCount Value="10"/>
-      </Unit15>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="385" Column="53" TopLine="364"/>
-      </Position1>
-      <Position2>
-        <Filename Value="../../../fpc/packages/fcl-web/src/websession.pp"/>
-        <Caret Line="381" Column="25" TopLine="345"/>
-      </Position2>
-      <Position3>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="385" Column="51" TopLine="364"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../../fpc/packages/fcl-web/src/websession.pp"/>
-        <Caret Line="27" Column="39" TopLine="20"/>
-      </Position4>
-      <Position5>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="34" Column="29" TopLine="3"/>
-      </Position5>
-      <Position6>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="48" Column="45" TopLine="15"/>
-      </Position6>
-      <Position7>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="49" Column="45" TopLine="14"/>
-      </Position7>
-      <Position8>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="50" Column="45" TopLine="14"/>
-      </Position8>
-      <Position9>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="17" Column="18" TopLine="14"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="395" Column="32" TopLine="387"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1066" Column="1" TopLine="1039"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1624" Column="20" TopLine="1606"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="955" Column="46" TopLine="933"/>
-      </Position13>
-      <Position14>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="956" Column="19" TopLine="933"/>
-      </Position14>
-      <Position15>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="957" Column="16" TopLine="933"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="971" Column="38" TopLine="933"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="975" Column="77" TopLine="954"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="985" Column="43" TopLine="954"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1013" Column="66" TopLine="992"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1017" Column="77" TopLine="992"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1042" Column="62" TopLine="1013"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1066" Column="35" TopLine="1055"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1646" Column="22" TopLine="1630"/>
-      </Position23>
-      <Position24>
-        <Filename Value="wmusers.pp"/>
-        <Caret Line="15" Column="41" TopLine="1"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1655" Column="28" TopLine="1632"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1587" Column="17" TopLine="1565"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="414" Column="15" TopLine="393"/>
-      </Position27>
-      <Position28>
-        <Filename Value="extgrid.lpr"/>
-        <Caret Line="6" Column="36" TopLine="1"/>
-      </Position28>
-      <Position29>
-        <Filename Value="extgrid.lpr"/>
-        <Caret Line="11" Column="17" TopLine="1"/>
-      </Position29>
-      <Position30>
-        <Filename Value="extgrid.lpr"/>
-        <Caret Line="6" Column="33" TopLine="1"/>
-      </Position30>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="extgrid.cgi"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/webdata/demo3/extgrid.lpr

@@ -9,6 +9,8 @@ uses
 
 {$IFDEF WINDOWS}{$R extgrid.rc}{$ENDIF}
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.Run;

packages/fcl-web/examples/webdata/demo3/tralala.lrs

@@ -1,7 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebModule1','FORMDATA',[
-  'TPF0'#13'TFPWebModule1'#12'FPWebModule1'#14'OldCreateOrder'#8#7'Actions'#14#0
-  +#13'CreateSession'#8#6'Height'#3','#1#16'HorizontalOffset'#3'I'#2#14'Vertica'
-  +'lOffset'#3#230#0#5'Width'#3#144#1#0#0
-]);

packages/fcl-web/examples/webdata/demo3/wmusers.lrs

@@ -1,21 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebProviderDataModule1','FORMDATA',[
-  'TPF0'#25'TFPWebProviderDataModule1'#24'FPWebProviderDataModule1'#8'OnCreate'
-  +#7#16'DataModuleCreate'#14'OldCreateOrder'#8#12'InputAdaptor'#7#29'ExtJSJSon'
-  +'WebdataInputAdaptor1'#15'ContentProducer'#7#23'ExtJSJSONDataFormatter1'#20
-  +'OnGetContentProducer'#7#28'DataModuleGetContentProducer'#17'OnGetInputAdapt'
-  +'or'#7#25'DataModuleGetInputAdaptor'#6'Height'#3','#1#16'HorizontalOffset'#3
-  +#27#2#14'VerticalOffset'#3#191#1#5'Width'#3#144#1#0#29'TExtJSJSonWebdataInpu'
-  +'tAdaptor'#29'ExtJSJSonWebdataInputAdaptor1'#4'left'#3#176#0#3'top'#2'`'#0#0
-  +#23'TExtJSJSONDataFormatter'#23'ExtJSJSONDataFormatter1'#13'AllowPageSize'#8
-  +#4'left'#3#176#0#3'top'#3#136#0#0#0#28'TExtJSXMLWebdataInputAdaptor'#28'ExtJ'
-  +'SXMLWebdataInputAdaptor1'#4'left'#3#216#0#3'top'#2'`'#0#0#22'TExtJSXMLDataF'
-  +'ormatter'#22'ExtJSXMLDataFormatter1'#13'AllowPageSize'#8#4'left'#3#216#0#3
-  +'top'#3#136#0#0#0#4'TDbf'#4'Dbf1'#8'FilePath'#6'&/home/michael/public_html/e'
-  +'xtjs/demo2/'#9'IndexDefs'#14#0#9'TableName'#6#9'users.dbf'#10'TableLevel'#2
-  +#7#13'FilterOptions'#11#0#4'left'#2'O'#3'top'#2'\'#0#0#11'TDatasource'#11'Da'
-  +'tasource1'#7'DataSet'#7#4'Dbf1'#4'left'#2'L'#3'top'#3#132#0#0#0#18'TFPWebDa'
-  +'taProvider'#5'AName'#10'DataSource'#7#11'Datasource1'#4'left'#3#133#0#3'top'
-  +#2'u'#0#0#0
-]);

packages/fcl-web/examples/webdata/demo3/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb,
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb,
   dbf, db, fpwebdata, extjsjson, extjsxml;
 
 type
@@ -36,6 +36,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 { TFPWebProviderDataModule1 }
 
 procedure TFPWebProviderDataModule1.DataModuleGetInputAdaptor(Sender: TObject;
@@ -61,8 +63,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
-
   RegisterHTTPModule('Provider', TFPWebProviderDataModule1);
 end.
 

packages/fcl-web/examples/webdata/demo4/dmusers.lrs

@@ -1,12 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TDataModule1','FORMDATA',[
-  'TPF0'#12'TDataModule1'#11'DataModule1'#8'OnCreate'#7#16'DataModuleCreate'#14
-  +'OldCreateOrder'#8#6'Height'#3','#1#16'HorizontalOffset'#3'd'#1#14'VerticalO'
-  +'ffset'#3'h'#1#5'Width'#3#144#1#0#18'TFPWebDataProvider'#5'AName'#10'DataSou'
-  +'rce'#7#11'Datasource1'#4'left'#3#161#0#3'top'#3#145#0#0#0#11'TDatasource'#11
-  +'Datasource1'#7'DataSet'#7#4'Dbf1'#4'left'#2'h'#3'top'#3#160#0#0#0#4'TDbf'#4
-  +'Dbf1'#8'FilePath'#6'&/home/michael/public_html/extjs/demo2/'#9'IndexDefs'#14
-  +#0#9'TableName'#6#9'users.dbf'#10'TableLevel'#2#7#13'FilterOptions'#11#0#4'l'
-  +'eft'#2'k'#3'top'#2'x'#0#0#0
-]);

packages/fcl-web/examples/webdata/demo4/dmusers.pp

@@ -5,8 +5,7 @@ unit dmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, db, dbf,
-  fpwebdata;
+  Classes, SysUtils, db, dbf, fpwebdata;
 
 type
 
@@ -28,12 +27,12 @@ var
 
 implementation
 
-uses dbugintf;
+{$R *.lfm}
+
 { TDataModule1 }
 
 procedure TDataModule1.DataModuleCreate(Sender: TObject);
 begin
-  senddebug('Creating datamodule 1 '+InTToStr(Ord(WebDataProviderManager.Registering)));
   If not WebDataProviderManager.Registering then
     begin
     DBF1.TableName:=ExtractFilePath(ParamStr(0))+'users.dbf';
@@ -45,7 +44,6 @@ begin
 end;
 
 initialization
-  {$I dmusers.lrs}
   WebDataProviderManager.RegisterDatamodule(TDataModule1)
 
 end.

packages/fcl-web/examples/webdata/demo4/extgrid.lpi

@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
-        <SaveClosedFiles Value="False"/>
         <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <Runnable Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <Icon Value="0"/>
       <UseXPManifest Value="True"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -79,14 +79,22 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="extgrid.cgi"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/webdata/demo4/extgrid.lpr

@@ -8,6 +8,8 @@ uses
 
 {$IFDEF WINDOWS}{$R extgrid.rc}{$ENDIF}
 
+{$R *.res}
+
 begin
   Application.Initialize;
   Application.Run;

packages/fcl-web/examples/webdata/demo4/wmjsonusers.lrs

@@ -1,11 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebProviderDataModule1','FORMDATA',[
-  'TPF0'#25'TFPWebProviderDataModule1'#24'FPWebProviderDataModule1'#14'OldCreat'
-  +'eOrder'#8#12'InputAdaptor'#7#29'ExtJSJSonWebdataInputAdaptor1'#15'ContentPr'
-  +'oducer'#7#23'ExtJSJSONDataFormatter1'#6'Height'#3','#1#16'HorizontalOffset'
-  +#3'{'#2#14'VerticalOffset'#3#230#0#5'Width'#3#144#1#0#29'TExtJSJSonWebdataIn'
-  +'putAdaptor'#29'ExtJSJSonWebdataInputAdaptor1'#4'left'#3#204#0#3'top'#2'|'#0
-  +#0#23'TExtJSJSONDataFormatter'#23'ExtJSJSONDataFormatter1'#13'AllowPageSize'
-  +#8#4'left'#3#204#0#3'top'#3#164#0#0#0#0
-]);

packages/fcl-web/examples/webdata/demo4/wmjsonusers.pp

@@ -5,7 +5,7 @@ unit wmjsonusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb, 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb, 
     fpwebdata, extjsjson;
 
 type
@@ -26,9 +26,9 @@ var
 
 implementation
 
-initialization
-  {$I wmjsonusers.lrs}
+{$R *.lfm}
 
+initialization
   RegisterHTTPModule('JSONProvider', TFPWebProviderDataModule1);
 end.
 

packages/fcl-web/examples/webdata/demo4/wmxmlusers.lrs

@@ -1,11 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebProviderDataModule2','FORMDATA',[
-  'TPF0'#25'TFPWebProviderDataModule2'#24'FPWebProviderDataModule2'#14'OldCreat'
-  +'eOrder'#8#12'InputAdaptor'#7#28'ExtJSXMLWebdataInputAdaptor1'#15'ContentPro'
-  +'ducer'#7#22'ExtJSXMLDataFormatter1'#6'Height'#3','#1#16'HorizontalOffset'#3
-  +'!'#2#14'VerticalOffset'#3#143#1#5'Width'#3#144#1#0#28'TExtJSXMLWebdataInput'
-  +'Adaptor'#28'ExtJSXMLWebdataInputAdaptor1'#4'left'#3#244#0#3'top'#2'|'#0#0#22
-  +'TExtJSXMLDataFormatter'#22'ExtJSXMLDataFormatter1'#13'AllowPageSize'#8#4'le'
-  +'ft'#3#244#0#3'top'#3#164#0#0#0#0
-]);

packages/fcl-web/examples/webdata/demo4/wmxmlusers.pp

@@ -5,7 +5,7 @@ unit wmxmlusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb, 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb, 
     fpwebdata, extjsxml;
 
 type
@@ -26,9 +26,9 @@ var
 
 implementation
 
-initialization
-  {$I wmxmlusers.lrs}
+{$R *.lfm}
 
+initialization
   RegisterHTTPModule('XMLProvider', TFPWebProviderDataModule2);
 end.
 

packages/fcl-web/examples/webdata/demo5/wmusers.lrs

@@ -1,15 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebProviderDataModule2','FORMDATA',[
-  'TPF0'#25'TFPWebProviderDataModule2'#24'FPWebProviderDataModule2'#14'OldCreat'
-  +'eOrder'#8#12'InputAdaptor'#7#29'ExtJSJSonWebdataInputAdaptor1'#15'ContentPr'
-  +'oducer'#7#23'ExtJSJSONDataFormatter1'#20'OnGetContentProducer'#7#28'DataMod'
-  +'uleGetContentProducer'#17'OnGetInputAdaptor'#7#25'DataModuleGetInputAdaptor'
-  +#6'Height'#3','#1#16'HorizontalOffset'#3#26#2#14'VerticalOffset'#3#204#1#5'W'
-  +'idth'#3#144#1#0#29'TExtJSJSonWebdataInputAdaptor'#29'ExtJSJSonWebdataInputA'
-  +'daptor1'#4'left'#3#204#0#3'top'#2'|'#0#0#28'TExtJSXMLWebdataInputAdaptor'#28
-  +'ExtJSXMLWebdataInputAdaptor1'#4'left'#3#244#0#3'top'#2'|'#0#0#22'TExtJSXMLD'
-  +'ataFormatter'#22'ExtJSXMLDataFormatter1'#13'AllowPageSize'#8#4'left'#3#244#0
-  +#3'top'#3#164#0#0#0#23'TExtJSJSONDataFormatter'#23'ExtJSJSONDataFormatter1'
-  +#13'AllowPageSize'#8#4'left'#3#204#0#3'top'#3#164#0#0#0#0
-]);

packages/fcl-web/examples/webdata/demo5/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb, 
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb, 
   db, dbf, fpwebdata, extjsjson, extjsxml;
 
 type
@@ -32,6 +32,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 Type
 
     { TDBFWebDataProvider }
@@ -77,8 +79,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
-
   RegisterHTTPModule('Provider', TFPWebProviderDataModule2);
   WebDataProviderManager.RegisterProvider('AName',TDBFWebDataProvider);
 end.

packages/fcl-web/examples/webdata/demo6/extgrid.lpi

@@ -1,22 +1,24 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
+        <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <Runnable Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
       <Title Value="SQLDBWebDataProvider demo using ExtJS"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -48,17 +50,11 @@
         <PackageName Value="FCL"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="16">
+    <Units Count="2">
       <Unit0>
         <Filename Value="extgrid.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="extgrid"/>
-        <EditorIndex Value="12"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="33" Y="8"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="wmusers.pp"/>
@@ -66,283 +62,26 @@
         <ComponentName Value="FPWebProviderDataModule1"/>
         <ResourceBaseClass Value="DataModule"/>
         <UnitName Value="wmusers"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="78"/>
-        <CursorPos X="29" Y="86"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
       </Unit1>
-      <Unit2>
-        <Filename Value="../demo5/wmusers.pp"/>
-        <ComponentName Value="FPWebProviderDataModule2"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="wmusers"/>
-        <TopLine Value="44"/>
-        <CursorPos X="1" Y="70"/>
-        <UsageCount Value="10"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="../fpwebdata.pp"/>
-        <ComponentName Value="FPWebProviderDataModule"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="DataModule"/>
-        <UnitName Value="fpwebdata"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1584"/>
-        <CursorPos X="8" Y="1600"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="../sqldbwebdata.pp"/>
-        <UnitName Value="sqldbwebdata"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="49"/>
-        <CursorPos X="2" Y="70"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="../extjsjson.pp"/>
-        <UnitName Value="extjsjson"/>
-        <EditorIndex Value="11"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="25"/>
-        <CursorPos X="3" Y="45"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="../extjsxml.pp"/>
-        <UnitName Value="extjsxml"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="49"/>
-        <CursorPos X="13" Y="54"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <UnitName Value="wstmodule"/>
-        <EditorIndex Value="5"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="25"/>
-        <CursorPos X="48" Y="22"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="../../../fpc/packages/fcl-web/src/fphttp.pp"/>
-        <UnitName Value="fphttp"/>
-        <EditorIndex Value="8"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="109"/>
-        <CursorPos X="92" Y="100"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="../../../fpc/packages/fcl-web/src/websession.pp"/>
-        <UnitName Value="websession"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="3" Y="27"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="../../../fpc/packages/fcl-web/src/httpdefs.pp"/>
-        <UnitName Value="HTTPDefs"/>
-        <EditorIndex Value="7"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="264"/>
-        <CursorPos X="18" Y="285"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="../../../source/wst/tests/apache_module/wst_apache_binding.pas"/>
-        <UnitName Value="wst_apache_binding"/>
-        <TopLine Value="142"/>
-        <CursorPos X="1" Y="178"/>
-        <UsageCount Value="10"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="../../../fpc/packages/fcl-web/src/fpweb.pp"/>
-        <UnitName Value="fpWeb"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="412"/>
-        <CursorPos X="18" Y="452"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="../../../Documents/source/wst/wst_global.inc"/>
-        <TopLine Value="1"/>
-        <CursorPos X="30" Y="19"/>
-        <UsageCount Value="10"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="../../wst/regwstmodule.pp"/>
-        <UnitName Value="regwstmodule"/>
-        <EditorIndex Value="6"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="2" Y="1"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="../demo/reglazwebextra.pp"/>
-        <UnitName Value="reglazwebextra"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="37"/>
-        <CursorPos X="1" Y="73"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit15>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="135" Column="3" TopLine="115"/>
-      </Position1>
-      <Position2>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="130" Column="16" TopLine="109"/>
-      </Position2>
-      <Position3>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="148" Column="1" TopLine="127"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="122" Column="92" TopLine="121"/>
-      </Position4>
-      <Position5>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="137" Column="1" TopLine="122"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="169" Column="26" TopLine="135"/>
-      </Position6>
-      <Position7>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="34" Column="1" TopLine="1"/>
-      </Position7>
-      <Position8>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="123" Column="17" TopLine="92"/>
-      </Position8>
-      <Position9>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="128" Column="36" TopLine="104"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="46" Column="48" TopLine="25"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="147" Column="1" TopLine="126"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="138" Column="6" TopLine="115"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="150" Column="1" TopLine="137"/>
-      </Position13>
-      <Position14>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="151" Column="3" TopLine="130"/>
-      </Position14>
-      <Position15>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="15" Column="1" TopLine="1"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="177" Column="37" TopLine="145"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../../wst/wstmodule.pas"/>
-        <Caret Line="58" Column="1" TopLine="22"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../demo/reglazwebextra.pp"/>
-        <Caret Line="17" Column="15" TopLine="1"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../../wst/regwstmodule.pp"/>
-        <Caret Line="55" Column="79" TopLine="16"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../../wst/regwstmodule.pp"/>
-        <Caret Line="26" Column="3" TopLine="1"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="446" Column="14" TopLine="433"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="969" Column="79" TopLine="954"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1171" Column="41" TopLine="1154"/>
-      </Position23>
-      <Position24>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1281" Column="32" TopLine="1280"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1296" Column="30" TopLine="1282"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="327" Column="14" TopLine="324"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1296" Column="51" TopLine="1280"/>
-      </Position27>
-      <Position28>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1594" Column="19" TopLine="1579"/>
-      </Position28>
-      <Position29>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1606" Column="58" TopLine="1591"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../fpwebdata.pp"/>
-        <Caret Line="1607" Column="1" TopLine="1592"/>
-      </Position30>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="extgrid.cgi"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>

packages/fcl-web/examples/webdata/demo6/extgrid.lpr

@@ -8,6 +8,8 @@ uses
 
 {$IFDEF WINDOWS}{$R extgrid.rc}{$ENDIF}
 
+{$R *.res}
+
 begin
   Application.Title:='SQLDBWebDataProvider demo using ExtJS';
   Application.Initialize;

packages/fcl-web/examples/webdata/demo6/wmusers.lrs

@@ -1,43 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TFPWebProviderDataModule1','FORMDATA',[
-  'TPF0'#25'TFPWebProviderDataModule1'#24'FPWebProviderDataModule1'#8'OnCreate'
-  +#7#16'DataModuleCreate'#14'OldCreateOrder'#8#12'InputAdaptor'#7#29'ExtJSJSon'
-  +'WebdataInputAdaptor1'#15'ContentProducer'#7#23'ExtJSJSONDataFormatter1'#20
-  +'OnGetContentProducer'#7#28'DataModuleGetContentProducer'#17'OnGetInputAdapt'
-  +'or'#7#25'DataModuleGetInputAdaptor'#6'Height'#3','#1#16'HorizontalOffset'#3
-  +'{'#2#14'VerticalOffset'#3#230#0#5'Width'#3#144#1#0#29'TExtJSJSonWebdataInpu'
-  +'tAdaptor'#29'ExtJSJSonWebdataInputAdaptor1'#4'left'#3#232#0#3'top'#3#152#0#0
-  +#0#28'TExtJSXMLWebdataInputAdaptor'#28'ExtJSXMLWebdataInputAdaptor1'#4'left'
-  +#3#16#1#3'top'#3#152#0#0#0#22'TExtJSXMLDataFormatter'#22'ExtJSXMLDataFormatt'
-  +'er1'#13'AllowPageSize'#8#4'left'#3#16#1#3'top'#3#192#0#0#0#23'TExtJSJSONDat'
-  +'aFormatter'#23'ExtJSJSONDataFormatter1'#13'AllowPageSize'#8#4'left'#3#232#0
-  +#3'top'#3#192#0#0#0#21'TSQLDBWebDataProvider'#5'ANAME'#17'SelectSQL.Strings'
-  +#1#6#22'SELECT * FROM FPCUSERS'#0#17'UpdateSQL.Strings'#1#6#19'UPDATE FPCUSE'
-  +'RS SET'#6#13'  NAME=:NAME,'#6#15'  LOGIN=:LOGIN,'#6#15'  EMAIL=:EMAIL,'#6#22
-  +'  LASTLOGIN=:LASTLOGIN'#6#5'WHERE'#6#10'  (ID=:ID)'#0#17'DeleteSQL.Strings'
-  +#1#6'#DELETE FROM FPCUSERS WHERE (ID=:ID)'#0#17'InsertSQL.Strings'#1#6#21'IN'
-  +'SERT INTO FPCUSERS '#6'#(ID, LOGIN, NAME, EMAIL, LASTLOGIN)'#6#6'VALUES'#6
-  +'((:ID, :LOGIN, :NAME, :EMAIL, :LASTLOGIN)'#0#10'Connection'#7#13'IBConnecti'
-  +'on1'#11'IDFieldName'#6#2'ID'#10'OnGetNewID'#7#13'ANAMEGetNewID'#4'left'#2'q'
-  +#3'top'#2'x'#0#0#13'TIBConnection'#13'IBConnection1'#9'Connected'#8#11'Login'
-  +'Prompt'#8#12'DatabaseName'#6#26'/wisa/firebird/fpcusers.fb'#14'KeepConnecti'
-  +'on'#8#8'Password'#6#8'SysteemD'#11'Transaction'#7#15'SQLTransaction1'#8'Use'
-  +'rName'#6#8'WISASOFT'#4'left'#2'H'#3'top'#2'x'#0#0#9'TSQLQuery'#6'QGetID'#9
-  +'IndexName'#6#13'DEFAULT_ORDER'#14'AutoCalcFields'#8#8'Database'#7#13'IBConn'
-  +'ection1'#11'Transaction'#7#15'SQLTransaction1'#8'ReadOnly'#8#11'SQL.Strings'
-  +#1#6'9SELECT GEN_ID(GEN_FPCUSERS,1) AS THEID  FROM RDB$DATABASE'#0#6'Params'
-  +#14#0#4'left'#3#155#0#3'top'#2'?'#0#0#15'TSQLTransaction'#15'SQLTransaction1'
-  +#6'Active'#8#6'Action'#7#6'caNone'#8'Database'#7#13'IBConnection1'#4'left'#2
-  +'J'#3'top'#2'@'#0#0#9'TSQLQuery'#9'SQLQuery1'#9'IndexName'#6#13'DEFAULT_ORDE'
-  +'R'#14'AutoCalcFields'#8#8'Database'#7#13'IBConnection1'#11'Transaction'#7#15
-  +'SQLTransaction1'#8'ReadOnly'#8#11'SQL.Strings'#1#6#20'INSERT INTO FPCUSERS'
-  +#6'#(ID, LOGIN, NAME, EMAIL, LASTLOGIN)'#6#6'VALUES'#6'((:ID, :LOGIN, :NAME,'
-  +' :EMAIL, :LASTLOGIN)'#6#0#0#6'Params'#14#1#8'DataType'#7#9'ftUnknown'#4'Nam'
-  +'e'#6#2'ID'#9'ParamType'#7#9'ptUnknown'#0#1#8'DataType'#7#9'ftUnknown'#4'Nam'
-  +'e'#6#5'LOGIN'#9'ParamType'#7#9'ptUnknown'#0#1#8'DataType'#7#9'ftUnknown'#4
-  +'Name'#6#4'NAME'#9'ParamType'#7#9'ptUnknown'#0#1#8'DataType'#7#9'ftUnknown'#4
-  +'Name'#6#5'EMAIL'#9'ParamType'#7#9'ptUnknown'#0#1#8'DataType'#7#9'ftUnknown'
-  +#4'Name'#6#9'LASTLOGIN'#9'ParamType'#7#9'ptUnknown'#0#0#4'left'#3#174#0#3'to'
-  +'p'#2'o'#0#0#0
-]);

packages/fcl-web/examples/webdata/demo6/wmusers.pp

@@ -5,7 +5,7 @@ unit wmusers;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, HTTPDefs, websession, fpHTTP, fpWeb,
+  Classes, SysUtils, HTTPDefs, websession, fpHTTP, fpWeb,
   IBConnection, sqldb, fpwebdata, extjsjson, extjsxml, sqldbwebdata;
 
 type
@@ -39,6 +39,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses inifiles;
 
 { TFPWebProviderDataModule1 }
@@ -100,8 +102,6 @@ begin
 end;
 
 initialization
-  {$I wmusers.lrs}
-
   RegisterHTTPModule('Provider', TFPWebProviderDataModule1);
 end.