Skip to content

Commit 246576f

Browse files
mobius1qwemobius1qwe
committed
* Atualização de servidores de teste Lazarus para versão 0.9.7
1 parent aaa5122 commit 246576f

8 files changed

Lines changed: 101 additions & 113 deletions

‎Lazarus/Console/RALTestServerConsoleLazarus.lpi‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Filename Value="RALTestServerConsoleLazarus"/>
2525
</Target>
2626
<SearchPaths>
27-
<IncludeFiles Value="$(ProjOutDir);..\..\..\PascalRAL\src\base"/>
27+
<IncludeFiles Value="$(ProjOutDir)"/>
2828
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
2929
</SearchPaths>
3030
<CodeGeneration>
@@ -50,7 +50,7 @@
5050
<Filename Value="RALTestServerConsoleLazarus"/>
5151
</Target>
5252
<SearchPaths>
53-
<IncludeFiles Value="$(ProjOutDir);..\..\..\PascalRAL\src\base"/>
53+
<IncludeFiles Value="$(ProjOutDir)"/>
5454
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
5555
</SearchPaths>
5656
<CodeGeneration>
@@ -100,10 +100,6 @@
100100
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
101101
<IsPartOfProject Value="True"/>
102102
</Unit>
103-
<Unit>
104-
<Filename Value="..\..\..\PascalRAL\src\base\PascalRAL.inc"/>
105-
<IsPartOfProject Value="True"/>
106-
</Unit>
107103
</Units>
108104
</ProjectOptions>
109105
<CompilerOptions>
@@ -113,7 +109,7 @@
113109
<Filename Value="RALTestServerConsoleLazarus"/>
114110
</Target>
115111
<SearchPaths>
116-
<IncludeFiles Value="$(ProjOutDir);..\..\..\PascalRAL\src\base"/>
112+
<IncludeFiles Value="$(ProjOutDir)"/>
117113
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
118114
</SearchPaths>
119115
<Parsing>

‎Lazarus/Console/RALTestServerConsoleLazarus.lpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ TRALApplication = class(TCustomApplication)
3636
var
3737
input: string;
3838
begin
39+
input := '';
3940
while not (input = 'exit') do
4041
begin
4142
WriteLn('Server ' + FServer.Engine + ' online on port ' + FServer.Port.ToString);
@@ -52,7 +53,6 @@ TRALApplication = class(TCustomApplication)
5253
constructor TRALApplication.Create(AOwner: TComponent);
5354
var
5455
opt: integer;
55-
test: string;
5656
begin
5757
inherited Create(AOwner);
5858
StopOnException := True;

‎Lazarus/Console/RALTestServerConsoleLazarus.lps‎

Lines changed: 8 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
<ProjectSession>
44
<PathDelim Value="\"/>
55
<Version Value="12"/>
6-
<BuildModes Active="Release"/>
6+
<BuildModes Active="Linux64"/>
77
<Units>
88
<Unit>
99
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
1010
<IsPartOfProject Value="True"/>
1111
<IsVisibleTab Value="True"/>
12-
<TopLine Value="31"/>
13-
<CursorPos X="30" Y="45"/>
14-
<UsageCount Value="32"/>
12+
<TopLine Value="66"/>
13+
<CursorPos X="54" Y="73"/>
14+
<UsageCount Value="35"/>
1515
<Loaded Value="True"/>
1616
</Unit>
1717
<Unit>
1818
<Filename Value="..\..\..\PascalRAL\src\base\PascalRAL.inc"/>
19-
<IsPartOfProject Value="True"/>
2019
<EditorIndex Value="-1"/>
2120
<WindowIndex Value="-1"/>
2221
<TopLine Value="-1"/>
@@ -39,30 +38,27 @@
3938
</Unit>
4039
<Unit>
4140
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
42-
<EditorIndex Value="1"/>
41+
<EditorIndex Value="-1"/>
4342
<TopLine Value="425"/>
4443
<CursorPos X="17" Y="448"/>
4544
<UsageCount Value="14"/>
4645
<Bookmarks Count="1">
4746
<Item0 X="11" Y="241" ID="1"/>
4847
</Bookmarks>
49-
<Loaded Value="True"/>
5048
</Unit>
5149
<Unit>
5250
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\libsagui.pas"/>
53-
<EditorIndex Value="3"/>
51+
<EditorIndex Value="-1"/>
5452
<TopLine Value="427"/>
5553
<CursorPos X="3" Y="441"/>
5654
<UsageCount Value="14"/>
57-
<Loaded Value="True"/>
5855
</Unit>
5956
<Unit>
6057
<Filename Value="D:\IDE\lazarus\3.0\fpcsrc\rtl\objpas\sysutils\sysutilh.inc"/>
61-
<EditorIndex Value="2"/>
58+
<EditorIndex Value="-1"/>
6259
<TopLine Value="27"/>
6360
<CursorPos X="4" Y="41"/>
6461
<UsageCount Value="14"/>
65-
<Loaded Value="True"/>
6662
</Unit>
6763
<Unit>
6864
<Filename Value="..\..\..\PascalRAL\src\engine\fpHTTP\RALfpHTTPRegister.pas"/>
@@ -78,51 +74,11 @@
7874
<UsageCount Value="9"/>
7975
</Unit>
8076
</Units>
81-
<JumpHistory HistoryIndex="29">
77+
<JumpHistory HistoryIndex="9">
8278
<Position>
8379
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
8480
<Caret Line="75" Column="34" TopLine="59"/>
8581
</Position>
86-
<Position>
87-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
88-
<Caret Line="86" Column="14" TopLine="72"/>
89-
</Position>
90-
<Position>
91-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
92-
<Caret Line="241" Column="11" TopLine="235"/>
93-
</Position>
94-
<Position>
95-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
96-
<Caret Line="316" Column="28" TopLine="295"/>
97-
</Position>
98-
<Position>
99-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
100-
<Caret Line="202" Column="21" TopLine="195"/>
101-
</Position>
102-
<Position>
103-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
104-
<Caret Line="428" Column="10" TopLine="420"/>
105-
</Position>
106-
<Position>
107-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
108-
<Caret Line="435" Column="13" TopLine="419"/>
109-
</Position>
110-
<Position>
111-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
112-
<Caret Line="427" Column="60" TopLine="418"/>
113-
</Position>
114-
<Position>
115-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
116-
<Caret Line="428" TopLine="418"/>
117-
</Position>
118-
<Position>
119-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
120-
<Caret Line="429" TopLine="418"/>
121-
</Position>
122-
<Position>
123-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
124-
<Caret Line="430" TopLine="418"/>
125-
</Position>
12682
<Position>
12783
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
12884
<Caret Line="71" Column="44" TopLine="59"/>
@@ -143,42 +99,6 @@
14399
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
144100
<Caret Line="79" TopLine="60"/>
145101
</Position>
146-
<Position>
147-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
148-
<Caret Line="431" TopLine="418"/>
149-
</Position>
150-
<Position>
151-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
152-
<Caret Line="433" TopLine="418"/>
153-
</Position>
154-
<Position>
155-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
156-
<Caret Line="434" TopLine="418"/>
157-
</Position>
158-
<Position>
159-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
160-
<Caret Line="433" TopLine="418"/>
161-
</Position>
162-
<Position>
163-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
164-
<Caret Line="440" TopLine="420"/>
165-
</Position>
166-
<Position>
167-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
168-
<Caret Line="442" TopLine="432"/>
169-
</Position>
170-
<Position>
171-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
172-
<Caret Line="431" Column="22" TopLine="419"/>
173-
</Position>
174-
<Position>
175-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
176-
<Caret Line="433" TopLine="419"/>
177-
</Position>
178-
<Position>
179-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
180-
<Caret Line="439" Column="16" TopLine="419"/>
181-
</Position>
182102
<Position>
183103
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
184104
<Caret Line="76" TopLine="60"/>
@@ -191,10 +111,6 @@
191111
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
192112
<Caret Line="78" TopLine="60"/>
193113
</Position>
194-
<Position>
195-
<Filename Value="..\..\..\PascalRAL\src\engine\sagui\RALSaguiServer.pas"/>
196-
<Caret Line="442" Column="8" TopLine="435"/>
197-
</Position>
198114
<Position>
199115
<Filename Value="RALTestServerConsoleLazarus.lpr"/>
200116
<Caret Line="75" Column="25" TopLine="60"/>

‎Lazarus/Server/TestServer.lpi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</Linking>
6161
<Other>
6262
<Verbosity>
63-
<ShoLineNum Value="True"/>
63+
<ShowLineNum Value="True"/>
6464
</Verbosity>
6565
</Other>
6666
</CompilerOptions>

‎Lazarus/Server/TestServer.lpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
program TestServer;
1+
program RALTestServerLazarus;
22

33
{$mode objfpc}{$H+}
44

‎Lazarus/Server/TestServer.lps‎

Lines changed: 83 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<ProjectSession>
44
<PathDelim Value="\"/>
55
<Version Value="12"/>
6-
<BuildModes Active="Linux64"/>
6+
<BuildModes Active="Release"/>
77
<Units>
88
<Unit>
99
<Filename Value="TestServer.lpr"/>
1010
<IsPartOfProject Value="True"/>
11-
<CursorPos X="45" Y="21"/>
11+
<CursorPos X="38" Y="9"/>
1212
<UsageCount Value="112"/>
1313
<Loaded Value="True"/>
1414
</Unit>
@@ -21,8 +21,7 @@
2121
<UnitName Value="Main"/>
2222
<IsVisibleTab Value="True"/>
2323
<EditorIndex Value="1"/>
24-
<TopLine Value="159"/>
25-
<CursorPos X="28" Y="159"/>
24+
<CursorPos X="17" Y="7"/>
2625
<UsageCount Value="112"/>
2726
<Loaded Value="True"/>
2827
<LoadedDesigner Value="True"/>
@@ -31,10 +30,10 @@
3130
<Filename Value="uroutes.pas"/>
3231
<IsPartOfProject Value="True"/>
3332
<UnitName Value="uRoutes"/>
34-
<EditorIndex Value="-1"/>
35-
<TopLine Value="2"/>
36-
<CursorPos X="25" Y="19"/>
33+
<EditorIndex Value="2"/>
34+
<TopLine Value="54"/>
3735
<UsageCount Value="83"/>
36+
<Loaded Value="True"/>
3837
</Unit>
3938
<Unit>
4039
<Filename Value="..\..\..\src\engine\indy\RALIndyServer.pas"/>
@@ -361,8 +360,24 @@
361360
<CursorPos X="3" Y="28"/>
362361
<UsageCount Value="16"/>
363362
</Unit>
363+
<Unit>
364+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALServer.pas"/>
365+
<EditorIndex Value="3"/>
366+
<TopLine Value="234"/>
367+
<CursorPos X="14" Y="246"/>
368+
<UsageCount Value="10"/>
369+
<Loaded Value="True"/>
370+
</Unit>
371+
<Unit>
372+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
373+
<EditorIndex Value="4"/>
374+
<TopLine Value="337"/>
375+
<CursorPos X="24" Y="351"/>
376+
<UsageCount Value="10"/>
377+
<Loaded Value="True"/>
378+
</Unit>
364379
</Units>
365-
<JumpHistory HistoryIndex="11">
380+
<JumpHistory HistoryIndex="26">
366381
<Position>
367382
<Filename Value="main.pas"/>
368383
<Caret Line="202" Column="49" TopLine="184"/>
@@ -411,6 +426,66 @@
411426
<Filename Value="main.pas"/>
412427
<Caret Line="171" Column="38" TopLine="153"/>
413428
</Position>
429+
<Position>
430+
<Filename Value="main.pas"/>
431+
<Caret Line="164" Column="37" TopLine="159"/>
432+
</Position>
433+
<Position>
434+
<Filename Value="main.pas"/>
435+
<Caret Line="196" Column="69" TopLine="183"/>
436+
</Position>
437+
<Position>
438+
<Filename Value="main.pas"/>
439+
<Caret Line="195" Column="21" TopLine="183"/>
440+
</Position>
441+
<Position>
442+
<Filename Value="main.pas"/>
443+
<Caret Line="196" Column="23" TopLine="183"/>
444+
</Position>
445+
<Position>
446+
<Filename Value="main.pas"/>
447+
<Caret Line="195" Column="22" TopLine="183"/>
448+
</Position>
449+
<Position>
450+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALServer.pas"/>
451+
<Caret Line="246" Column="14" TopLine="234"/>
452+
</Position>
453+
<Position>
454+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
455+
<Caret Line="90" Column="49" TopLine="76"/>
456+
</Position>
457+
<Position>
458+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
459+
<Caret Line="344" Column="23" TopLine="332"/>
460+
</Position>
461+
<Position>
462+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
463+
<Caret Line="97" Column="59" TopLine="79"/>
464+
</Position>
465+
<Position>
466+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
467+
<Caret Line="90" Column="18" TopLine="79"/>
468+
</Position>
469+
<Position>
470+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
471+
<Caret Line="346" Column="3" TopLine="344"/>
472+
</Position>
473+
<Position>
474+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
475+
<Caret Line="97" Column="43" TopLine="76"/>
476+
</Position>
477+
<Position>
478+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
479+
<Caret Line="346" Column="14" TopLine="330"/>
480+
</Position>
481+
<Position>
482+
<Filename Value="..\..\..\PascalRAL-dev\src\base\RALRoutes.pas"/>
483+
<Caret Line="351" Column="24" TopLine="337"/>
484+
</Position>
485+
<Position>
486+
<Filename Value="main.pas"/>
487+
<Caret Line="12" Column="10"/>
488+
</Position>
414489
</JumpHistory>
415490
<RunParams>
416491
<FormatVersion Value="2"/>

‎Lazarus/Server/main.lfm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ object Form1: TForm1
88
ClientWidth = 485
99
OnCreate = FormCreate
1010
OnDestroy = FormDestroy
11+
LCLVersion = '3.5.0.0'
1112
object PageControl1: TPageControl
1213
Left = 0
1314
Height = 433

‎Lazarus/Server/main.pas‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface
99
StdCtrls, Grids, LazUTF8,
1010
RALServer, RALIndyServer, RALFpHttpServer, RALSynopseServer, RALResponse,
1111
RALRequest, RALRoutes, RALAuthentication, RALConsts, RALTools, RALSaguiServer,
12-
uroutes;
12+
uRoutes;
1313

1414
type
1515

@@ -192,8 +192,8 @@ procedure TForm1.SetupServer;
192192
begin
193193
SkipMethods.DelimitedText := sgRoutes.Cells[2, I];
194194
for J := 0 to pred(SkipMethods.Count) do
195-
FServer.Routes.RouteAddress[sgRoutes.Cells[0, I]].SkipAuthMethods :=
196-
FServer.Routes.RouteAddress[sgRoutes.Cells[0, I]].SkipAuthMethods +
195+
FServer.Routes.Find[sgRoutes.Cells[0, I]].SkipAuthMethods :=
196+
FServer.Routes.Find[sgRoutes.Cells[0, I]].SkipAuthMethods +
197197
[HTTPMethodToRALMethod(SkipMethods.Strings[J])];
198198
SkipMethods.Clear;
199199
end;

0 commit comments

Comments
 (0)