From 3e36a3389b99a1655ec800b6a128fe07a3e8efc7 Mon Sep 17 00:00:00 2001 From: Daniele Teti Date: Fri, 24 Mar 2023 17:16:03 +0100 Subject: [PATCH] Preparing for 3.3.0-fluorine release --- lib/swagdoc/Source/SwagDoc.dproj | 11 +++-- packages/common_contains.inc | 40 ----------------- packages/common_defines.inc | 27 ------------ packages/common_defines_design.inc | 28 ------------ packages/d100/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d100/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d101/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d101/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d102/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d102/dmvcframeworkRT.dpk | 48 ++++++++++++++++++--- packages/d103/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d103/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d104/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d104/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d110/dmvcframeworkDT.dpk | 29 ++++++++++++- packages/d110/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d111/dmvcframeworkDT.dpk | 30 ++++++++++++- packages/d111/dmvcframeworkRT.dpk | 46 ++++++++++++++++++-- packages/d112/dmvcframeworkRT.dpk | 18 ++++++-- packages/d113/dmvcframeworkRT.dpk | 12 +++++- packages/d113/dmvcframeworkRT.dproj | 5 ++- packages/d113/dmvcframework_group.groupproj | 8 ++-- sources/MVCFramework.ActiveRecord.pas | 28 ++++++++++++ 23 files changed, 556 insertions(+), 149 deletions(-) delete mode 100644 packages/common_contains.inc delete mode 100644 packages/common_defines.inc delete mode 100644 packages/common_defines_design.inc diff --git a/lib/swagdoc/Source/SwagDoc.dproj b/lib/swagdoc/Source/SwagDoc.dproj index 94482f03..c82c5463 100644 --- a/lib/swagdoc/Source/SwagDoc.dproj +++ b/lib/swagdoc/Source/SwagDoc.dproj @@ -45,7 +45,6 @@ true - ..\Lib .\$(Platform)\$(Config) false false @@ -57,8 +56,6 @@ System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) All SwagDoc - ..\Lib - ..\Lib true 3 1046 @@ -82,8 +79,8 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug - true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 0 1033 @@ -159,8 +156,10 @@ - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components SwagDoc.dpk diff --git a/packages/common_contains.inc b/packages/common_contains.inc deleted file mode 100644 index 5ba3ae37..00000000 --- a/packages/common_contains.inc +++ /dev/null @@ -1,40 +0,0 @@ - Web.HTTPDImpl, - Web.ApacheConst, - Web.ApacheHTTP, - Web.Win.IsapiHTTP, - Web.HTTPDMethods, - JsonDataObjects in '..\..\sources\JsonDataObjects.pas', - Json.Common.Helpers in '..\..\lib\swagdoc\Source\Json.Common.Helpers.pas', - Json.Schema.Common.Types in '..\..\lib\swagdoc\Source\Json.Schema.Common.Types.pas', - Json.Schema.Field.Arrays in '..\..\lib\swagdoc\Source\Json.Schema.Field.Arrays.pas', - Json.Schema.Field.Booleans in '..\..\lib\swagdoc\Source\Json.Schema.Field.Booleans.pas', - Json.Schema.Field.DateTimes in '..\..\lib\swagdoc\Source\Json.Schema.Field.DateTimes.pas', - Json.Schema.Field.Enums in '..\..\lib\swagdoc\Source\Json.Schema.Field.Enums.pas', - Json.Schema.Field.Numbers in '..\..\lib\swagdoc\Source\Json.Schema.Field.Numbers.pas', - Json.Schema.Field.Objects in '..\..\lib\swagdoc\Source\Json.Schema.Field.Objects.pas', - Json.Schema.Field in '..\..\lib\swagdoc\Source\Json.Schema.Field.pas', - Json.Schema.Field.Strings in '..\..\lib\swagdoc\Source\Json.Schema.Field.Strings.pas', - Json.Schema in '..\..\lib\swagdoc\Source\Json.Schema.pas', - Swag.Common.Consts in '..\..\lib\swagdoc\Source\Swag.Common.Consts.pas', - Swag.Common.Types.Helpers in '..\..\lib\swagdoc\Source\Swag.Common.Types.Helpers.pas', - Swag.Common.Types in '..\..\lib\swagdoc\Source\Swag.Common.Types.pas', - Swag.Doc.Definition in '..\..\lib\swagdoc\Source\Swag.Doc.Definition.pas', - Swag.Doc.FileLoader in '..\..\lib\swagdoc\Source\Swag.Doc.FileLoader.pas', - Swag.Doc.Info.Contact in '..\..\lib\swagdoc\Source\Swag.Doc.Info.Contact.pas', - Swag.Doc.Info.License in '..\..\lib\swagdoc\Source\Swag.Doc.Info.License.pas', - Swag.Doc.Info in '..\..\lib\swagdoc\Source\Swag.Doc.Info.pas', - Swag.Doc in '..\..\lib\swagdoc\Source\Swag.Doc.pas', - Swag.Doc.Path.Operation in '..\..\lib\swagdoc\Source\Swag.Doc.Path.Operation.pas', - Swag.Doc.Path.Operation.RequestParameter in '..\..\lib\swagdoc\Source\Swag.Doc.Path.Operation.RequestParameter.pas', - Swag.Doc.Path.Operation.Response in '..\..\lib\swagdoc\Source\Swag.Doc.Path.Operation.Response.pas', - Swag.Doc.Path.Operation.ResponseHeaders in '..\..\lib\swagdoc\Source\Swag.Doc.Path.Operation.ResponseHeaders.pas', - Swag.Doc.Path in '..\..\lib\swagdoc\Source\Swag.Doc.Path.pas', - Swag.Doc.SecurityDefinition in '..\..\lib\swagdoc\Source\Swag.Doc.SecurityDefinition.pas', - Swag.Doc.SecurityDefinitionApiKey in '..\..\lib\swagdoc\Source\Swag.Doc.SecurityDefinitionApiKey.pas', - Swag.Doc.SecurityDefinitionBasic in '..\..\lib\swagdoc\Source\Swag.Doc.SecurityDefinitionBasic.pas', - Swag.Doc.SecurityDefinitionOAuth2 in '..\..\lib\swagdoc\Source\Swag.Doc.SecurityDefinitionOAuth2.pas', - Swag.Doc.Tags in '..\..\lib\swagdoc\Source\Swag.Doc.Tags.pas', - MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', - MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', - MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', - MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', diff --git a/packages/common_defines.inc b/packages/common_defines.inc deleted file mode 100644 index a4c92d1b..00000000 --- a/packages/common_defines.inc +++ /dev/null @@ -1,27 +0,0 @@ -{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} -{$ALIGN 8} -{$ASSERTIONS ON} -{$BOOLEVAL OFF} -{$DEBUGINFO OFF} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS ON} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION OFF} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS OFF} -{$REFERENCEINFO ON} -{$SAFEDIVIDE OFF} -{$STACKFRAMES ON} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $400000} -{$DEFINE DEBUG} -{$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'DMVCFramework - Copyright (2010-2022) Daniele Teti and the DMVCFramework Team'} -{$RUNONLY} -{$IMPLICITBUILD ON} diff --git a/packages/common_defines_design.inc b/packages/common_defines_design.inc deleted file mode 100644 index d6d622d2..00000000 --- a/packages/common_defines_design.inc +++ /dev/null @@ -1,28 +0,0 @@ -{$R *.res} -{$R *.dres} -{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} -{$ALIGN 8} -{$ASSERTIONS ON} -{$BOOLEVAL OFF} -{$DEBUGINFO OFF} -{$EXTENDEDSYNTAX ON} -{$IMPORTEDDATA ON} -{$IOCHECKS ON} -{$LOCALSYMBOLS ON} -{$LONGSTRINGS ON} -{$OPENSTRINGS ON} -{$OPTIMIZATION OFF} -{$OVERFLOWCHECKS OFF} -{$RANGECHECKS OFF} -{$REFERENCEINFO ON} -{$SAFEDIVIDE OFF} -{$STACKFRAMES ON} -{$TYPEDADDRESS OFF} -{$VARSTRINGCHECKS ON} -{$WRITEABLECONST OFF} -{$MINENUMSIZE 1} -{$IMAGEBASE $400000} -{$DEFINE DEBUG} -{$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'DelphiMVCFramework 3.2.2-nitrogen - Design Time Support'} -{$IMPLICITBUILD ON} \ No newline at end of file diff --git a/packages/d100/dmvcframeworkDT.dpk b/packages/d100/dmvcframeworkDT.dpk index 61c910fe..ca3378d4 100644 --- a/packages/d100/dmvcframeworkDT.dpk +++ b/packages/d100/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '100'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d100/dmvcframeworkRT.dpk b/packages/d100/dmvcframeworkRT.dpk index 73869d08..d774b691 100644 --- a/packages/d100/dmvcframeworkRT.dpk +++ b/packages/d100/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '100'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d101/dmvcframeworkDT.dpk b/packages/d101/dmvcframeworkDT.dpk index a53de20f..ac7cfb63 100644 --- a/packages/d101/dmvcframeworkDT.dpk +++ b/packages/d101/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '101'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d101/dmvcframeworkRT.dpk b/packages/d101/dmvcframeworkRT.dpk index d2885c50..6bdc3282 100644 --- a/packages/d101/dmvcframeworkRT.dpk +++ b/packages/d101/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '101'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d102/dmvcframeworkDT.dpk b/packages/d102/dmvcframeworkDT.dpk index 57ea31bc..909903ee 100644 --- a/packages/d102/dmvcframeworkDT.dpk +++ b/packages/d102/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '102'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d102/dmvcframeworkRT.dpk b/packages/d102/dmvcframeworkRT.dpk index 690d4de5..f6040332 100644 --- a/packages/d102/dmvcframeworkRT.dpk +++ b/packages/d102/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} -{$LIBSUFFIX '102'} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} +{$LIBSUFFIX '113'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d103/dmvcframeworkDT.dpk b/packages/d103/dmvcframeworkDT.dpk index 0025f651..098193a1 100644 --- a/packages/d103/dmvcframeworkDT.dpk +++ b/packages/d103/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '103'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d103/dmvcframeworkRT.dpk b/packages/d103/dmvcframeworkRT.dpk index 1f89c7ff..7b307df3 100644 --- a/packages/d103/dmvcframeworkRT.dpk +++ b/packages/d103/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '103'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d104/dmvcframeworkDT.dpk b/packages/d104/dmvcframeworkDT.dpk index 78ca9891..63064847 100644 --- a/packages/d104/dmvcframeworkDT.dpk +++ b/packages/d104/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '104'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d104/dmvcframeworkRT.dpk b/packages/d104/dmvcframeworkRT.dpk index 82961adc..8d9a4c70 100644 --- a/packages/d104/dmvcframeworkRT.dpk +++ b/packages/d104/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '104'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d110/dmvcframeworkDT.dpk b/packages/d110/dmvcframeworkDT.dpk index fcef1047..f3dd1072 100644 --- a/packages/d110/dmvcframeworkDT.dpk +++ b/packages/d110/dmvcframeworkDT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '110'} +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d110/dmvcframeworkRT.dpk b/packages/d110/dmvcframeworkRT.dpk index 1a828585..6299183e 100644 --- a/packages/d110/dmvcframeworkRT.dpk +++ b/packages/d110/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '110'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains -{$I ..\common_contains.inc} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d111/dmvcframeworkDT.dpk b/packages/d111/dmvcframeworkDT.dpk index 01fcc8c5..12457b25 100644 --- a/packages/d111/dmvcframeworkDT.dpk +++ b/packages/d111/dmvcframeworkDT.dpk @@ -1,8 +1,34 @@ package dmvcframeworkDT; -{$I ..\common_defines_design.inc} +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DelphiMVCFramework 3.x - Design Time Support'} {$LIBSUFFIX '111'} - +{$IMPLICITBUILD ON} requires rtl, diff --git a/packages/d111/dmvcframeworkRT.dpk b/packages/d111/dmvcframeworkRT.dpk index ba720757..3f9d64df 100644 --- a/packages/d111/dmvcframeworkRT.dpk +++ b/packages/d111/dmvcframeworkRT.dpk @@ -1,7 +1,34 @@ package dmvcframeworkRT; -{$I ..\common_defines.inc} +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '111'} +{$RUNONLY} +{$IMPLICITBUILD ON} requires rtl, @@ -13,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains - {$I '..\common_contains.inc'} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -74,9 +110,11 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. + diff --git a/packages/d112/dmvcframeworkRT.dpk b/packages/d112/dmvcframeworkRT.dpk index 27e81176..49a16eef 100644 --- a/packages/d112/dmvcframeworkRT.dpk +++ b/packages/d112/dmvcframeworkRT.dpk @@ -25,7 +25,7 @@ package dmvcframeworkRT; {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2022) Daniele Teti and the DMVCFramework Team'} +{$DESCRIPTION 'DMVCFramework - CopyRight (2010-2023) Daniele Teti and the DMVCFramework Team'} {$LIBSUFFIX '112'} {$RUNONLY} {$IMPLICITBUILD ON} @@ -40,11 +40,20 @@ requires FireDACMySQLDriver, loggerproRT, FireDACPgDriver, - FireDACSqliteDriver; + FireDACSqliteDriver, + SwagDoc; contains - {$I '..\common_contains.inc'} + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -101,7 +110,8 @@ contains MVCFramework.RESTClient.Indy in '..\..\sources\MVCFramework.RESTClient.Indy.pas', MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', - MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas'; + MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. diff --git a/packages/d113/dmvcframeworkRT.dpk b/packages/d113/dmvcframeworkRT.dpk index 1c572117..f6040332 100644 --- a/packages/d113/dmvcframeworkRT.dpk +++ b/packages/d113/dmvcframeworkRT.dpk @@ -44,7 +44,16 @@ requires SwagDoc; contains + Web.HTTPDImpl, + Web.ApacheConst, + Web.ApacheHTTP, + Web.Win.IsapiHTTP, + Web.HTTPDMethods, MVCFramework in '..\..\sources\MVCFramework.pas', + MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas', + MVCFramework.Middleware.Swagger in '..\..\sources\MVCFramework.Middleware.Swagger.pas', + MVCFramework.Middleware.Trace in '..\..\sources\MVCFramework.Middleware.Trace.pas', + MVCFramework.Middleware.ETag in '..\..\sources\MVCFramework.Middleware.ETag.pas', MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas', MVCFramework.ActiveRecordController in '..\..\sources\MVCFramework.ActiveRecordController.pas', MVCFramework.ApplicationSession in '..\..\sources\MVCFramework.ApplicationSession.pas', @@ -102,8 +111,7 @@ contains MVCFramework.RESTClient.Intf in '..\..\sources\MVCFramework.RESTClient.Intf.pas', MVCFramework.RESTClient in '..\..\sources\MVCFramework.RESTClient.pas', MVCFramework.Utils in '..\..\sources\MVCFramework.Utils.pas', - JsonDataObjects in '..\..\sources\JsonDataObjects.pas', - MVCFramework.AsyncTask in '..\..\sources\MVCFramework.AsyncTask.pas'; + JsonDataObjects in '..\..\sources\JsonDataObjects.pas'; end. diff --git a/packages/d113/dmvcframeworkRT.dproj b/packages/d113/dmvcframeworkRT.dproj index 1e3e1056..8b302be1 100644 --- a/packages/d113/dmvcframeworkRT.dproj +++ b/packages/d113/dmvcframeworkRT.dproj @@ -133,6 +133,10 @@ + + + + @@ -191,7 +195,6 @@ - Base diff --git a/packages/d113/dmvcframework_group.groupproj b/packages/d113/dmvcframework_group.groupproj index 8fd11db1..54349cfd 100644 --- a/packages/d113/dmvcframework_group.groupproj +++ b/packages/d113/dmvcframework_group.groupproj @@ -10,7 +10,7 @@ - ..\..\lib\loggerpro\packages\d113\loggerproRT.dproj + ..\..\lib\swagdoc\Source\SwagDoc.dproj;..\..\lib\loggerpro\packages\d113\loggerproRT.dproj dmvcframeworkRT.dproj @@ -41,13 +41,13 @@ - + - + - + diff --git a/sources/MVCFramework.ActiveRecord.pas b/sources/MVCFramework.ActiveRecord.pas index e03bb5da..7a5df090 100644 --- a/sources/MVCFramework.ActiveRecord.pas +++ b/sources/MVCFramework.ActiveRecord.pas @@ -545,6 +545,7 @@ type procedure RemoveDefaultConnection(const RaiseExceptionIfNotAvailable: Boolean = True); procedure SetCurrent(const aName: string); function GetCurrent(const RaiseExceptionIfNotAvailable: Boolean = True): TFDConnection; + function GetCurrentConnectionName(const RaiseExceptionIfNotAvailable: Boolean = False): String; function GetCurrentBackend: string; procedure SetDefault; end; @@ -574,6 +575,7 @@ type procedure RemoveDefaultConnection(const RaiseExceptionIfNotAvailable: Boolean = True); procedure SetCurrent(const aName: string); function GetCurrent(const RaiseExceptionIfNotAvailable: Boolean = True): TFDConnection; + function GetCurrentConnectionName(const RaiseExceptionIfNotAvailable: Boolean = False): String; function GetByName(const aName: string): TFDConnection; function GetCurrentBackend: string; procedure SetDefault; @@ -939,6 +941,32 @@ begin end; end; +function TMVCConnectionsRepository.GetCurrentConnectionName( + const RaiseExceptionIfNotAvailable: Boolean): String; +var + lName: string; +begin +{$IF not Defined(TokyoOrBetter)} + Result := ''; +{$ENDIF} + fMREW.BeginRead; + try + if fCurrentConnectionsByThread.TryGetValue(TThread.CurrentThread.ThreadID, lName) then + begin + Result := lName; + end + else + begin + if RaiseExceptionIfNotAvailable then + raise EMVCActiveRecord.Create('No current connection for thread') + else + Result := ''; + end; + finally + fMREW.EndRead; + end; +end; + function TMVCConnectionsRepository.GetCurrent(const RaiseExceptionIfNotAvailable: Boolean): TFDConnection; var lName: string;