Updated sample projects to D12.2; New middleware TMVCShutdownMiddlewa…

…re (useful to create a route which shutdown the server in automated testing environments)
danieleteti · Oct 1, 2024 · 082089f · 082089f
1 parent 7c2a2b2
commit 082089f
Show file tree

Hide file tree

Showing 51 changed files with 1,672 additions and 1,720 deletions.
diff --git a/samples/CustomRoleAuth/CustomRoleAuthClient.dproj b/samples/CustomRoleAuth/CustomRoleAuthClient.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{B42B1969-7408-4E0A-8624-A48DADE46556}</ProjectGuid>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>CustomRoleAuthClient.dpr</MainSource>
         <Base>True</Base>
@@ -137,7 +137,7 @@
                     <Excluded_Packages Name="$(BDSBIN)\vclhie230.bpl">Internet Explorer Hosting Support Package</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
-            <Deployment Version="4">
+            <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\CustomRoleAuthClient.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
@@ -151,16 +151,6 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClasses">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidFileProvider">
                     <Platform Name="Android">
                         <RemoteDir>res\xml</RemoteDir>
@@ -171,12 +161,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidGDBServer">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidLibnativeArmeabiFile">
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi</RemoteDir>

diff --git a/samples/CustomRoleAuth/CustomRoleAuthGroup.groupproj b/samples/CustomRoleAuth/CustomRoleAuthGroup.groupproj
@@ -12,10 +12,7 @@
         <Projects Include="..\jsonwebtoken_roleauth\JWTRoleAuthServer.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="..\serversideviewcustom\ServerSideViewsCustomEngine.dproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="..\serversideviews_lua\ServerSideViewsLua.dproj">
+        <Projects Include="..\avoid_mid_air_collisions_sample\avoid_mid_air_collisions_sample.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -53,32 +50,23 @@
     <Target Name="JWTRoleAuthServer:Make">
         <MSBuild Projects="..\jsonwebtoken_roleauth\JWTRoleAuthServer.dproj" Targets="Make"/>
     </Target>
-    <Target Name="ServerSideViewsCustomEngine">
-        <MSBuild Projects="..\serversideviewcustom\ServerSideViewsCustomEngine.dproj"/>
-    </Target>
-    <Target Name="ServerSideViewsCustomEngine:Clean">
-        <MSBuild Projects="..\serversideviewcustom\ServerSideViewsCustomEngine.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="ServerSideViewsCustomEngine:Make">
-        <MSBuild Projects="..\serversideviewcustom\ServerSideViewsCustomEngine.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="ServerSideViewsLua">
-        <MSBuild Projects="..\serversideviews_lua\ServerSideViewsLua.dproj"/>
+    <Target Name="avoid_mid_air_collisions_sample">
+        <MSBuild Projects="..\avoid_mid_air_collisions_sample\avoid_mid_air_collisions_sample.dproj"/>
     </Target>
-    <Target Name="ServerSideViewsLua:Clean">
-        <MSBuild Projects="..\serversideviews_lua\ServerSideViewsLua.dproj" Targets="Clean"/>
+    <Target Name="avoid_mid_air_collisions_sample:Clean">
+        <MSBuild Projects="..\avoid_mid_air_collisions_sample\avoid_mid_air_collisions_sample.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="ServerSideViewsLua:Make">
-        <MSBuild Projects="..\serversideviews_lua\ServerSideViewsLua.dproj" Targets="Make"/>
+    <Target Name="avoid_mid_air_collisions_sample:Make">
+        <MSBuild Projects="..\avoid_mid_air_collisions_sample\avoid_mid_air_collisions_sample.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="CustomRoleAuthServer;CustomRoleAuthClient;JWTRoleAuthServer;ServerSideViewsCustomEngine;ServerSideViewsLua"/>
+        <CallTarget Targets="CustomRoleAuthServer;CustomRoleAuthClient;JWTRoleAuthServer;avoid_mid_air_collisions_sample"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="CustomRoleAuthServer:Clean;CustomRoleAuthClient:Clean;JWTRoleAuthServer:Clean;ServerSideViewsCustomEngine:Clean;ServerSideViewsLua:Clean"/>
+        <CallTarget Targets="CustomRoleAuthServer:Clean;CustomRoleAuthClient:Clean;JWTRoleAuthServer:Clean;avoid_mid_air_collisions_sample:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="CustomRoleAuthServer:Make;CustomRoleAuthClient:Make;JWTRoleAuthServer:Make;ServerSideViewsCustomEngine:Make;ServerSideViewsLua:Make"/>
+        <CallTarget Targets="CustomRoleAuthServer:Make;CustomRoleAuthClient:Make;JWTRoleAuthServer:Make;avoid_mid_air_collisions_sample:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>
diff --git a/samples/CustomRoleAuth/CustomRoleAuthServer.dproj b/samples/CustomRoleAuth/CustomRoleAuthServer.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{0293A1B2-2793-41CE-9099-8B24A46AA8CF}</ProjectGuid>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>CustomRoleAuthServer.dpr</MainSource>
         <Base>True</Base>
@@ -124,7 +124,7 @@
                     <Excluded_Packages Name="$(BDSBIN)\vclhie230.bpl">Internet Explorer Hosting Support Package</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
-            <Deployment Version="4">
+            <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\CustomRoleAuthServer.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
@@ -134,16 +134,6 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClasses">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidFileProvider">
                     <Platform Name="Android">
                         <RemoteDir>res\xml</RemoteDir>
@@ -154,12 +144,6 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidGDBServer">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidLibnativeArmeabiFile">
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi</RemoteDir>

diff --git a/samples/apachemodule/Apache24/modules/.env b/samples/apachemodule/Apache24/modules/.env
@@ -1,2 +1,2 @@
 ;database.path = C:\DEV\dmvcframework\samples\WineCellarSample\winecellarserver\WINES_FB30.FDB
-database.path = ${__home__}..\..\..\WineCellarSample\winecellarserver\WINES_FB30.FDB
+database.path = ${__home__}..\..\..\wine_cellar_sample\winecellarserver\WINES_FB30.FDB
diff --git a/samples/apachemodule/mod_dmvc.dpr b/samples/apachemodule/mod_dmvc.dpr
@@ -13,10 +13,10 @@ uses
   Web.HTTPDMethods,
   Winapi.Windows,
   System.Classes,
-  MainDataModuleUnit in '..\WineCellarSample\winecellarserver\MainDataModuleUnit.pas' {WineCellarDataModule: TDataModule},
-  MainWebModuleUnit in '..\WineCellarSample\winecellarserver\MainWebModuleUnit.pas' {wm: TWebModule},
-  WineCellarAppControllerU in '..\WineCellarSample\winecellarserver\WineCellarAppControllerU.pas',
-  WinesBO in '..\WineCellarSample\winecellarserver\WinesBO.pas';
+  MainDataModuleUnit in '..\wine_cellar_sample\winecellarserver\MainDataModuleUnit.pas' {WineCellarDataModule: TDataModule},
+  MainWebModuleUnit in '..\wine_cellar_sample\winecellarserver\MainWebModuleUnit.pas' {wm: TWebModule},
+  WineCellarAppControllerU in '..\wine_cellar_sample\winecellarserver\WineCellarAppControllerU.pas',
+  WinesBO in '..\wine_cellar_sample\winecellarserver\WinesBO.pas';
 
 {$R *.res}
 // httpd.conf entries: