[mapguide-commits] r9682 - sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-07-23 08:30:14 -0700 (Thu, 23 Jul 2020)
New Revision: 9682

Modified:
   sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/DevHttpServer.vcxproj
   sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/main.cpp
Log:
Re-structure base wwwroot so we can easily drop a custom viewer application (eg. mapguide-react-layout) and be usable in this dev http server.

Modified: sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/DevHttpServer.vcxproj
===================================================================
--- sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/DevHttpServer.vcxproj	2020-07-23 15:19:15 UTC (rev 9681)
+++ sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/DevHttpServer.vcxproj	2020-07-23 15:30:14 UTC (rev 9682)
@@ -122,8 +122,8 @@
 echo Copy webconfig.ini
 xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
 echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)mapagent" mkdir "$(TargetDir)mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)mapagent"
+IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
+xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
 echo Copy web tier dlls
 xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
 echo Copy web tier pdbs
@@ -161,8 +161,8 @@
 echo Copy webconfig.ini
 xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
 echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)mapagent" mkdir "$(TargetDir)mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)mapagent"
+IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
+xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
 echo Copy web tier dlls
 xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
 echo Copy web tier pdbs
@@ -201,8 +201,8 @@
 echo Copy webconfig.ini
 xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
 echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)mapagent" mkdir "$(TargetDir)mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)mapagent"
+IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
+xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
 echo Copy web tier dlls
 xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
 echo Copy web tier pdbs
@@ -241,8 +241,8 @@
 echo Copy webconfig.ini
 xcopy /r /d /y "$(SolutionDir)webconfig.ini" "$(TargetDir)"
 echo Copy mapagent test pages
-IF NOT EXIST "$(TargetDir)mapagent" mkdir "$(TargetDir)mapagent"
-xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)mapagent"
+IF NOT EXIST "$(TargetDir)wwwroot\mapagent" mkdir "$(TargetDir)wwwroot\mapagent"
+xcopy /r /d /y "$(SolutionDir)..\..\UnitTest\WebTier\MapAgent\MapAgentForms\*.*" "$(TargetDir)wwwroot\mapagent"
 echo Copy web tier dlls
 xcopy /r /d /y "$(TargetDir)..\*.dll" "$(TargetDir)"
 echo Copy web tier pdbs

Modified: sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/main.cpp
===================================================================
--- sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/main.cpp	2020-07-23 15:19:15 UTC (rev 9681)
+++ sandbox/jng/ogc_viewer_representation/Web/src/DevHttpServer/main.cpp	2020-07-23 15:30:14 UTC (rev 9682)
@@ -357,12 +357,13 @@
 
     httplib::Server server;
 
-    server.set_mount_point("/mapguide/mapagent", "./mapagent");
+    server.set_mount_point("/mapguide", "./wwwroot");
 
     server.Post("/mapguide/mapagent/mapagent.fcgi", MapAgentHandler);
     server.Get("/mapguide/mapagent/mapagent.fcgi", MapAgentHandler);
 
     printf("Listening on port %d\n", port);
+    //TODO: Gracefully handle Ctrl-C shutdown
     server.listen("localhost", port);
 
     {