Skip to content

Commit fcdf4da

Browse files
carloBarazzettacarloBarazzetta
committed
Version 4.3.0 (2025-06-23)
- Added support form WiRL REST Server - Added Source\WiRLServer units - Added Demos\PrimerWiRLServer - Update License to MPL 2.0
1 parent 5cc294b commit fcdf4da

File tree

183 files changed

+5871
-1099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+5871
-1099
lines changed

‎Demos/PrimerCross/Main.dfm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ object MainForm: TMainForm
104104
object WorkTitleSpacer: TBevel
105105
Left = 0
106106
Top = 27
107-
Width = 976
107+
Width = 972
108108
Height = 4
109109
Align = alTop
110110
Shape = bsSpacer

‎Demos/PrimerCross/Primer_D10_1.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=

‎Demos/PrimerCross/Primer_D10_2.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=

‎Demos/PrimerCross/Primer_D10_3.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=

‎Demos/PrimerCross/Primer_D10_4.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=

‎Demos/PrimerCross/Primer_D11.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=

‎Demos/PrimerCross/Primer_D12.dproj‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
77
<DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
8-
<ProjectVersion>20.2</ProjectVersion>
8+
<ProjectVersion>20.3</ProjectVersion>
99
<Config Condition="'$(Config)'==''">Release</Config>
1010
<Base>True</Base>
1111
<AppType>Application</AppType>
1212
<FrameworkType>VCL</FrameworkType>
13-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
13+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1414
<TargetedPlatforms>3</TargetedPlatforms>
1515
<ProjectName Condition="'$(ProjectName)'==''">Primer_D12</ProjectName>
1616
</PropertyGroup>
@@ -59,6 +59,7 @@
5959
<VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
6060
<DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;..\..\Source\Catalogs\Oracle;..\..\Source\Catalogs\DB2;..\..\Source\Brokers\JSON;..\..\..\ext\delphi-neon\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6161
<DCC_DcuOutput>..\Dcu\$(Platform)</DCC_DcuOutput>
62+
<DCC_Define>DELPHI_NEON;$(DCC_Define)</DCC_Define>
6263
</PropertyGroup>
6364
<PropertyGroup Condition="'$(Base_Win32)'!=''">
6465
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -117,7 +118,28 @@
117118
<Source>
118119
<Source Name="MainSource">Primer_D12.dpr</Source>
119120
</Source>
120-
<Excluded_Packages/>
121+
<Excluded_Packages>
122+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISFLib8_6290.bpl">Ethea InstantSolutions 8.6 Framework Library</Excluded_Packages>
123+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISRtl7_7290.bpl">Ethea InstantSolutions 7.7 Rtl Library</Excluded_Packages>
124+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISVcl7_7290.bpl">Ethea InstantSolutions 7.7 Vcl Library</Excluded_Packages>
125+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISOpenOffice7_7290.bpl">Ethea InstantSolutions 7.7 LibreOffice/OpenOffice Components</Excluded_Packages>
126+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISFLib7_7290.bpl">Ethea InstantSolutions 7.7 Framework Library</Excluded_Packages>
127+
<Excluded_Packages Name="$(BDSBIN)\bcbie290.bpl">Embarcadero C++Builder Internet Explorer Components Package</Excluded_Packages>
128+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
129+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
130+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
131+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclISReportBuilder8_6290.bpl">Ethea InstantSolutions 8.6 ReportBuilder Components</Excluded_Packages>
132+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclLiscorVCL_D12.bpl">*** Liscor VCL Design Package for D12 ***</Excluded_Packages>
133+
<Excluded_Packages Name="D:\ETHEA\FGX Native\Libs\290\Win32\Release\FGXNative.Registration.290.bpl">FGX Native - Designtime Registration</Excluded_Packages>
134+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\QR506DesignDXE12.bpl">QuickReport 5.06 Components</Excluded_Packages>
135+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dclshlctrls290.bpl">Shell Control Property and Component Editors</Excluded_Packages>
136+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\kbmMemDesD120Std.bpl">kbmMemTable Standard Edition - High performance memory table - RAD Studio 12 for Win32 - Designtime - www.Components4Developers.com</Excluded_Packages>
137+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\DCLPsRBD12.bpl">Pragnaan ReportBuilder Export Devices</Excluded_Packages>
138+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\QImport2DTD12.bpl">EMS Advanced Import Component Suite</Excluded_Packages>
139+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\QExport3DTD12.bpl">EMS Advanced Export Component Suite</Excluded_Packages>
140+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\dGXOutD7.bpl">GExperts Outlookbar design time package</Excluded_Packages>
141+
<Excluded_Packages Name="D:\ETHEA\FGX Native\Libs\290\Win32\Release\FGXNative.Extension.Zint.290.bpl">FGX Native Extension - Zint Barcode</Excluded_Packages>
142+
</Excluded_Packages>
121143
</Delphi.Personality>
122144
<ModelSupport>False</ModelSupport>
123145
<Platforms>

‎Demos/PrimerCross/Primer_D12.mdr‎

5.88 KB
Binary file not shown.

‎Demos/PrimerCross/Primer_D12.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Trim Char=False
3434
<BlobStreamFormat>sfXML</BlobStreamFormat>
3535
<LoginPrompt>FALSE</LoginPrompt>
3636
<Database>PRIMERDB</Database>
37-
<HostName>127.0.0.1</HostName>
37+
<HostName>127.0.0.1, 1435</HostName>
3838
<Password>masterkey</Password>
3939
<DriverId>FB</DriverId>
4040
<User_Name>SYSDBA</User_Name>
@@ -47,7 +47,7 @@ Trim Char=False
4747
<LoginPrompt>FALSE</LoginPrompt>
4848
<ReadObjectListWithNoLock>TRUE</ReadObjectListWithNoLock>
4949
<Database>PRIMERDB</Database>
50-
<HostName>.\SQLEXPRESS</HostName>
50+
<HostName>127.0.0.1, 1435</HostName>
5151
<AdditionalParams>MetaDefSchema=dbo</AdditionalParams>
5252
<DriverId>MSSQL</DriverId>
5353
<UseDelimitedIdents>TRUE</UseDelimitedIdents>
@@ -58,7 +58,7 @@ Trim Char=False
5858
<IsBuilt>TRUE</IsBuilt>
5959
<BlobStreamFormat>sfXML</BlobStreamFormat>
6060
<LoginPrompt>FALSE</LoginPrompt>
61-
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=.\SQLEXPRESS</ConnectionString>
61+
<ConnectionString>Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=PRIMERDB;Data Source=127.0.0.1, 1435</ConnectionString>
6262
</TInstantADOConnectionDef>
6363
<TInstantDBXConnectionDef>
6464
<Name>DBX_MSSQL</Name>
@@ -69,7 +69,7 @@ Trim Char=False
6969
<DriverName>MSSQL</DriverName>
7070
<Params>SchemaOverride=sa.dbo
7171
DriverName=MSSQL
72-
HostName=.\SQLEXPRESS
72+
HostName=127.0.0.1, 1435
7373
DataBase=PRIMERDB
7474
BlobSize=-1
7575
ErrorResourceFile=
@@ -80,4 +80,9 @@ Prepare SQL=False
8080
ConnectTimeout=60
8181
Mars_Connection=True</Params>
8282
</TInstantDBXConnectionDef>
83+
<TInstantJSONConnectionDef>
84+
<Name>JSonDB</Name>
85+
<IsBuilt>TRUE</IsBuilt>
86+
<RootFolder>.\JSONDB</RootFolder>
87+
</TInstantJSONConnectionDef>
8388
</TInstantConnectionDefs>

‎Demos/PrimerRESTServer/Primer.MARS.Console.dpr‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ begin
7575
RunServer();
7676
except
7777
on E:Exception do
78+
begin
79+
{$IFDEF LOGGERPRO}
7880
Log.ErrorFmt('%s (%s)',[E.Message, E.Classname], '');
81+
{$ENDIF}
82+
Halt(1);
83+
end;
7984
end;
8085
end.

0 commit comments

Comments
 (0)