Browse Source

* Dotted filenames for package fcl-web

Michaël Van Canneyt 2 years ago
parent
commit
3f78ba87a3
100 changed files with 498 additions and 9 deletions
  1. 1 0
      packages/fcl-web/fpmake.pp
  2. 3 0
      packages/fcl-web/namespaced/FpWeb.Base.pp
  3. 3 0
      packages/fcl-web/namespaced/FpWeb.Cgi.Protocol.pp
  4. 3 0
      packages/fcl-web/namespaced/FpWeb.Client.Http.pp
  5. 3 0
      packages/fcl-web/namespaced/FpWeb.Client.pp
  6. 3 0
      packages/fcl-web/namespaced/FpWeb.Data.Base.pp
  7. 3 0
      packages/fcl-web/namespaced/FpWeb.Data.Extjs.Base.pp
  8. 3 0
      packages/fcl-web/namespaced/FpWeb.Data.Extjs.Json.pp
  9. 3 0
      packages/fcl-web/namespaced/FpWeb.Data.Extjs.Xml.pp
  10. 3 0
      packages/fcl-web/namespaced/FpWeb.Data.SqlDb.pp
  11. 3 0
      packages/fcl-web/namespaced/FpWeb.DatasetForm.pp
  12. 3 0
      packages/fcl-web/namespaced/FpWeb.FcgiGate.pp
  13. 3 0
      packages/fcl-web/namespaced/FpWeb.Handler.pp
  14. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Apache.pp
  15. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Apache24.pp
  16. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Cgi.pp
  17. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Apache.pp
  18. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Apache24.pp
  19. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Cgi.pp
  20. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Fcgi.pp
  21. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.HttpApp.pp
  22. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.HttpSys.pp
  23. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Custom.MicroHttpApp.pp
  24. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.EzCgi.pp
  25. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.Fcgi.pp
  26. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.HttpApp.pp
  27. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.HttpSys.pp
  28. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.MicroHttpApp.pp
  29. 3 0
      packages/fcl-web/namespaced/FpWeb.HostApp.SimpleCgi.pp
  30. 3 0
      packages/fcl-web/namespaced/FpWeb.Html.pp
  31. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Base.pp
  32. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Client.ASyncPool.pas
  33. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Client.Pool.pas
  34. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Client.pp
  35. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Defs.pp
  36. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Json.pp
  37. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Protocol.pp
  38. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Server.pp
  39. 3 0
      packages/fcl-web/namespaced/FpWeb.Http.Status.pas
  40. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Base.pp
  41. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Client.pp
  42. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Codegen.pp
  43. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.DispExtDirect.pp
  44. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.ExtDirect.pp
  45. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Rtti.pp
  46. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Strings.pp
  47. 3 0
      packages/fcl-web/namespaced/FpWeb.JsonRpc.Web.pp
  48. 3 0
      packages/fcl-web/namespaced/FpWeb.MimeTypes.pp
  49. 3 0
      packages/fcl-web/namespaced/FpWeb.Modules.Files.pp
  50. 3 0
      packages/fcl-web/namespaced/FpWeb.Modules.Proxy.pp
  51. 3 0
      packages/fcl-web/namespaced/FpWeb.Rest.Base.pp
  52. 3 0
      packages/fcl-web/namespaced/FpWeb.Rest.Codegen.pp
  53. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Ado.pp
  54. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Auth.pp
  55. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Authini.pp
  56. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Bridge.pp
  57. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Cds.pp
  58. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Consts.pp
  59. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Csv.pp
  60. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Data.pp
  61. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.IO.pp
  62. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Ini.pp
  63. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Json.pp
  64. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Module.pp
  65. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Schema.pp
  66. 3 0
      packages/fcl-web/namespaced/FpWeb.RestBridge.Xml.pp
  67. 3 0
      packages/fcl-web/namespaced/FpWeb.Route.pp
  68. 3 0
      packages/fcl-web/namespaced/FpWeb.Session.Ini.pp
  69. 3 0
      packages/fcl-web/namespaced/FpWeb.Session.pp
  70. 3 0
      packages/fcl-web/namespaced/FpWeb.Tests.Module.pp
  71. 3 0
      packages/fcl-web/namespaced/FpWeb.Uhpack.pp
  72. 3 0
      packages/fcl-web/namespaced/FpWeb.UhpackImp.pp
  73. 3 0
      packages/fcl-web/namespaced/FpWeb.UhpackTables.pp
  74. 3 0
      packages/fcl-web/namespaced/FpWeb.Utils.pp
  75. 3 0
      packages/fcl-web/namespaced/FpWeb.WebPage.pp
  76. 3 0
      packages/fcl-web/namespaced/FpWeb.WebSocket.Client.pp
  77. 3 0
      packages/fcl-web/namespaced/FpWeb.WebSocket.Custom.Server.pp
  78. 3 0
      packages/fcl-web/namespaced/FpWeb.WebSocket.Protocol.pp
  79. 3 0
      packages/fcl-web/namespaced/FpWeb.WebSocket.Server.pp
  80. 3 0
      packages/fcl-web/namespaced/FpWeb.WebSocket.Upgrader.pp
  81. 3 0
      packages/fcl-web/namespaced/Jwt.Jwa.Es256.pp
  82. 3 0
      packages/fcl-web/namespaced/Jwt.Jwa.Rsa.pp
  83. 3 0
      packages/fcl-web/namespaced/Jwt.Jwa.Sha256.pp
  84. 3 0
      packages/fcl-web/namespaced/Jwt.Jwa.Sha384.pp
  85. 3 0
      packages/fcl-web/namespaced/Jwt.Jwa.Sha512.pp
  86. 3 0
      packages/fcl-web/namespaced/Jwt.Oauth2.Ini.pp
  87. 3 0
      packages/fcl-web/namespaced/Jwt.Oauth2.pp
  88. 3 0
      packages/fcl-web/namespaced/Jwt.Types.pp
  89. 101 0
      packages/fcl-web/namespaces.lst
  90. 15 0
      packages/fcl-web/src/base/cgiapp.pp
  91. 6 0
      packages/fcl-web/src/base/cgiprotocol.pp
  92. 11 0
      packages/fcl-web/src/base/custapache.pp
  93. 11 0
      packages/fcl-web/src/base/custapache24.pp
  94. 16 1
      packages/fcl-web/src/base/custcgi.pp
  95. 25 4
      packages/fcl-web/src/base/custfcgi.pp
  96. 7 0
      packages/fcl-web/src/base/custhttpapp.pp
  97. 13 1
      packages/fcl-web/src/base/custhttpsys.pp
  98. 7 0
      packages/fcl-web/src/base/custmicrohttpapp.pp
  99. 18 3
      packages/fcl-web/src/base/custweb.pp
  100. 6 0
      packages/fcl-web/src/base/ezcgi.pp

+ 1 - 0
packages/fcl-web/fpmake.pp

@@ -39,6 +39,7 @@ begin
     P.Dependencies.Add('fcl-registry',AllWindowsOSes);
     P.Dependencies.Add('openssl',AllUnixOSes+AllWindowsOSes);
     P.Dependencies.Add('fastcgi');
+    P.Dependencies.Add('httpd20', AllOses - [amiga,aros,morphos]);
     P.Dependencies.Add('httpd22', AllOses - [amiga,aros,morphos]);
     P.Dependencies.Add('httpd24', AllOses - [amiga,aros,morphos]);
     P.Dependencies.Add('winunits-base', [Win32,Win64]);

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpweb.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Cgi.Protocol.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Cgi.Protocol;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cgiprotocol.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Client.Http.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Client.Http;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpwebclient.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Client.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Client;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebclient.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Data.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Data.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebdata.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Data.Extjs.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Data.Extjs.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpextjs.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Data.Extjs.Json.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Data.Extjs.Json;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i extjsjson.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Data.Extjs.Xml.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Data.Extjs.Xml;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i extjsxml.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Data.SqlDb.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Data.SqlDb;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbwebdata.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.DatasetForm.pp

@@ -0,0 +1,3 @@
+unit FpWeb.DatasetForm;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpdatasetform.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.FcgiGate.pp

@@ -0,0 +1,3 @@
+unit FpWeb.FcgiGate;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fcgigate.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Handler.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Handler;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custweb.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Apache.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Apache;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpapache.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Apache24.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Apache24;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpapache24.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Cgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Cgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcgi.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Apache.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.Apache;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custapache.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Apache24.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.Apache24;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custapache24.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Cgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.Cgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custcgi.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.Fcgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.Fcgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custfcgi.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.HttpApp.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.HttpApp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custhttpapp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.HttpSys.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.HttpSys;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custhttpsys.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Custom.MicroHttpApp.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Custom.MicroHttpApp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i custmicrohttpapp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.EzCgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.EzCgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ezcgi.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.Fcgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.Fcgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpfcgi.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.HttpApp.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.HttpApp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpapp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.HttpSys.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.HttpSys;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpsys.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.MicroHttpApp.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.MicroHttpApp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i microhttpapp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.HostApp.SimpleCgi.pp

@@ -0,0 +1,3 @@
+unit FpWeb.HostApp.SimpleCgi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cgiapp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Html.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Html;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphtml.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Client.ASyncPool.pas

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Client.ASyncPool;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpclientasyncpool.pas}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Client.Pool.pas

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Client.Pool;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpclientpool.pas}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Client.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Client;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpclient.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Defs.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Defs;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i httpdefs.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Json.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Json;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i httpjson.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Protocol.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Protocol;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i httpprotocol.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Server.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Server;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpserver.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Http.Status.pas

@@ -0,0 +1,3 @@
+unit FpWeb.Http.Status;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fphttpstatus.pas}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjsonrpc.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Client.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Client;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprpcclient.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Codegen.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Codegen;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprpccodegen.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.DispExtDirect.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.DispExtDirect;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpdispextdirect.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.ExtDirect.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.ExtDirect;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpextdirect.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Rtti.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Rtti;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprpcrtti.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Strings.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Strings;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fprpcstrings.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.JsonRpc.Web.pp

@@ -0,0 +1,3 @@
+unit FpWeb.JsonRpc.Web;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i webjsonrpc.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.MimeTypes.pp

@@ -0,0 +1,3 @@
+unit FpWeb.MimeTypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpmimetypes.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Modules.Files.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Modules.Files;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebfile.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Modules.Proxy.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Modules.Proxy;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebproxy.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Rest.Base.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Rest.Base;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i restbase.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Rest.Codegen.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Rest.Codegen;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i restcodegen.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Ado.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Ado;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestado.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Auth.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Auth;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestauth.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Authini.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Authini;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestauthini.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Bridge.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Bridge;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestbridge.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Cds.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Cds;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestcds.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Consts.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Consts;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestconst.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Csv.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Csv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestcsv.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Data.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Data;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestdata.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.IO.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.IO;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestio.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Ini.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Ini;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestini.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Json.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Json;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestjson.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Module.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Module;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestmodule.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Schema.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Schema;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestschema.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.RestBridge.Xml.pp

@@ -0,0 +1,3 @@
+unit FpWeb.RestBridge.Xml;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sqldbrestxml.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Route.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Route;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i httproute.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Session.Ini.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Session.Ini;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i iniwebsession.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Session.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Session;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i websession.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Tests.Module.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Tests.Module;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tcwebmodule.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Uhpack.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Uhpack;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i uhpack.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.UhpackImp.pp

@@ -0,0 +1,3 @@
+unit FpWeb.UhpackImp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i uhpackimp.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.UhpackTables.pp

@@ -0,0 +1,3 @@
+unit FpWeb.UhpackTables;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i uhpacktables.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.Utils.pp

@@ -0,0 +1,3 @@
+unit FpWeb.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i webutil.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebPage.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebPage;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i webpage.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebSocket.Client.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebSocket.Client;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebsocketclient.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebSocket.Custom.Server.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebSocket.Custom.Server;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcustwsserver.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebSocket.Protocol.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebSocket.Protocol;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebsocket.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebSocket.Server.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebSocket.Server;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwebsocketserver.pp}

+ 3 - 0
packages/fcl-web/namespaced/FpWeb.WebSocket.Upgrader.pp

@@ -0,0 +1,3 @@
+unit FpWeb.WebSocket.Upgrader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wsupgrader.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Jwa.Es256.pp

@@ -0,0 +1,3 @@
+unit Jwt.Jwa.Es256;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwaes256.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Jwa.Rsa.pp

@@ -0,0 +1,3 @@
+unit Jwt.Jwa.Rsa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwarsa.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Jwa.Sha256.pp

@@ -0,0 +1,3 @@
+unit Jwt.Jwa.Sha256;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwasha256.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Jwa.Sha384.pp

@@ -0,0 +1,3 @@
+unit Jwt.Jwa.Sha384;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwasha384.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Jwa.Sha512.pp

@@ -0,0 +1,3 @@
+unit Jwt.Jwa.Sha512;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwasha512.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Oauth2.Ini.pp

@@ -0,0 +1,3 @@
+unit Jwt.Oauth2.Ini;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpoauth2ini.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Oauth2.pp

@@ -0,0 +1,3 @@
+unit Jwt.Oauth2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpoauth2.pp}

+ 3 - 0
packages/fcl-web/namespaced/Jwt.Types.pp

@@ -0,0 +1,3 @@
+unit Jwt.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpjwt.pp}

+ 101 - 0
packages/fcl-web/namespaces.lst

@@ -0,0 +1,101 @@
+src/hpack/uhpackimp.pp=namespaced/FpWeb.UhpackImp.pp
+{s*:src/hpack/}=namespaced/
+{i+:src/hpack/}
+src/hpack/uhpacktables.pp=namespaced/FpWeb.UhpackTables.pp
+src/hpack/uhpack.pp=namespaced/FpWeb.Uhpack.pp
+src/base/custfcgi.pp=namespaced/FpWeb.HostApp.Custom.Fcgi.pp
+{s*:src/base/}=namespaced/
+{i+:src/base/}
+src/base/fpwebclient.pp=namespaced/FpWeb.Client.pp
+src/base/fcgigate.pp=namespaced/FpWeb.FcgiGate.pp
+src/base/custapache.pp=namespaced/FpWeb.HostApp.Custom.Apache.pp
+src/base/fphttpsys.pp=namespaced/FpWeb.HostApp.HttpSys.pp
+src/base/fpweb.pp=namespaced/FpWeb.Base.pp
+src/base/microhttpapp.pp=namespaced/FpWeb.HostApp.MicroHttpApp.pp
+src/base/webutil.pp=namespaced/FpWeb.Utils.pp
+src/base/custhttpapp.pp=namespaced/FpWeb.HostApp.Custom.HttpApp.pp
+src/base/ezcgi.pp=namespaced/FpWeb.HostApp.EzCgi.pp
+src/base/fpmimetypes.pp=namespaced/FpWeb.MimeTypes.pp
+src/base/iniwebsession.pp=namespaced/FpWeb.Session.Ini.pp
+src/base/httpprotocol.pp=namespaced/FpWeb.Http.Protocol.pp
+src/base/custapache24.pp=namespaced/FpWeb.HostApp.Custom.Apache24.pp
+src/base/custmicrohttpapp.pp=namespaced/FpWeb.HostApp.Custom.MicroHttpApp.pp
+src/base/fpcgi.pp=namespaced/FpWeb.HostApp.Cgi.pp
+src/base/fpdatasetform.pp=namespaced/FpWeb.DatasetForm.pp
+src/base/fpwebproxy.pp=namespaced/FpWeb.Modules.Proxy.pp
+src/base/fphttpclientpool.pas=namespaced/FpWeb.Http.Client.Pool.pas
+src/base/fphttpstatus.pas=namespaced/FpWeb.Http.Status.pas
+src/base/fphtml.pp=namespaced/FpWeb.Html.pp
+src/base/fphttpclient.pp=namespaced/FpWeb.Http.Client.pp
+src/base/cgiprotocol.pp=namespaced/FpWeb.Cgi.Protocol.pp
+src/base/custweb.pp=namespaced/FpWeb.Handler.pp
+src/base/httpjson.pp=namespaced/FpWeb.Http.Json.pp
+src/base/fphttpapp.pp=namespaced/FpWeb.HostApp.HttpApp.pp
+src/base/restcodegen.pp=namespaced/FpWeb.Rest.Codegen.pp
+src/base/fphttpwebclient.pp=namespaced/FpWeb.Client.Http.pp
+src/base/fpapache.pp=namespaced/FpWeb.HostApp.Apache.pp
+src/base/restbase.pp=namespaced/FpWeb.Rest.Base.pp
+src/base/httpdefs.pp=namespaced/FpWeb.Http.Defs.pp
+src/base/fphttpclientasyncpool.pas=namespaced/FpWeb.Http.Client.ASyncPool.pas
+src/base/tcwebmodule.pp=namespaced/FpWeb.Tests.Tcwebmodule.pp
+src/base/fpapache24.pp=namespaced/FpWeb.HostApp.Apache24.pp
+src/base/httproute.pp=namespaced/FpWeb.Route.pp
+src/base/cgiapp.pp=namespaced/FpWeb.HostApp.SimpleCgi.pp
+src/base/fpwebfile.pp=namespaced/FpWeb.Modules.Files.pp
+src/base/fpfcgi.pp=namespaced/FpWeb.HostApp.Fcgi.pp
+src/base/custhttpsys.pp=namespaced/FpWeb.HostApp.Custom.HttpSys.pp
+src/base/fphttpserver.pp=namespaced/FpWeb.Http.Server.pp
+src/base/custcgi.pp=namespaced/FpWeb.HostApp.Custom.Cgi.pp
+src/base/websession.pp=namespaced/FpWeb.Session.pp
+src/base/fphttp.pp=namespaced/FpWeb.Http.Base.pp
+src/base/webpage.pp=namespaced/FpWeb.WebPage.pp
+src/webdata/sqldbwebdata.pp=namespaced/FpWeb.Data.SqlDb.pp
+{s*:src/webdata/}=namespaced/
+{i+:src/webdata/}
+src/webdata/extjsjson.pp=namespaced/FpWeb.Data.Extjs.Json.pp
+src/webdata/fpextjs.pp=namespaced/FpWeb.Data.Extjs.Base.pp
+src/webdata/extjsxml.pp=namespaced/FpWeb.Data.Extjs.Xml.pp
+src/webdata/fpwebdata.pp=namespaced/FpWeb.Data.Base.pp
+src/jsonrpc/webjsonrpc.pp=namespaced/FpWeb.JsonRpc.Web.pp
+{s*:src/jsonrpc/}=namespaced/
+{i+:src/jsonrpc/}
+src/jsonrpc/fpextdirect.pp=namespaced/FpWeb.JsonRpc.ExtDirect.pp
+src/jsonrpc/fprpcrtti.pp=namespaced/FpWeb.JsonRpc.Rtti.pp
+src/jsonrpc/fpdispextdirect.pp=namespaced/FpWeb.JsonRpc.DispExtDirect.pp
+src/jsonrpc/fprpcstrings.pp=namespaced/FpWeb.JsonRpc.Strings.pp
+src/jsonrpc/fpjsonrpc.pp=namespaced/FpWeb.JsonRpc.Base.pp
+src/jsonrpc/fprpccodegen.pp=namespaced/FpWeb.JsonRpc.Codegen.pp
+src/jsonrpc/fprpcclient.pp=namespaced/FpWeb.JsonRpc.Client.pp
+src/restbridge/sqldbrestbridge.pp=namespaced/FpWeb.RestBridge.Bridge.pp
+{s*:src/restbridge/}=namespaced/
+{i+:src/restbridge/}
+src/restbridge/sqldbrestjson.pp=namespaced/FpWeb.RestBridge.Json.pp
+src/restbridge/sqldbrestconst.pp=namespaced/FpWeb.RestBridge.Consts.pp
+src/restbridge/sqldbrestauth.pp=namespaced/FpWeb.RestBridge.Auth.pp
+src/restbridge/sqldbrestxml.pp=namespaced/FpWeb.RestBridge.Xml.pp
+src/restbridge/sqldbrestschema.pp=namespaced/FpWeb.RestBridge.Schema.pp
+src/restbridge/sqldbrestcds.pp=namespaced/FpWeb.RestBridge.Cds.pp
+src/restbridge/sqldbrestmodule.pp=namespaced/FpWeb.RestBridge.Module.pp
+src/restbridge/sqldbrestdata.pp=namespaced/FpWeb.RestBridge.Data.pp
+src/restbridge/sqldbrestado.pp=namespaced/FpWeb.RestBridge.Ado.pp
+src/restbridge/sqldbrestio.pp=namespaced/FpWeb.RestBridge.IO.pp
+src/restbridge/sqldbrestini.pp=namespaced/FpWeb.RestBridge.Ini.pp
+src/restbridge/sqldbrestauthini.pp=namespaced/FpWeb.RestBridge.Authini.pp
+src/restbridge/sqldbrestcsv.pp=namespaced/FpWeb.RestBridge.Csv.pp
+src/websocket/fpwebsocket.pp=namespaced/FpWeb.WebSocket.Protocol.pp
+{s*:src/websocket/}=namespaced/
+{i+:src/websocket/}
+src/websocket/fpwebsocketserver.pp=namespaced/FpWeb.WebSocket.Server.pp
+src/websocket/fpcustwsserver.pp=namespaced/FpWeb.WebSocket.Custom.Server.pp
+src/websocket/wsupgrader.pp=namespaced/FpWeb.WebSocket.Upgrader.pp
+src/websocket/fpwebsocketclient.pp=namespaced/FpWeb.WebSocket.Client.pp
+src/jwt/fpoauth2ini.pp=namespaced/Jwt.Oauth2.Ini.pp
+{s*:src/jwt/}=namespaced/
+{i+:src/jwt/}
+src/jwt/fpjwarsa.pp=namespaced/Jwt.Jwa.Rsa.pp
+src/jwt/fpjwasha512.pp=namespaced/Jwt.Jwa.Sha512.pp
+src/jwt/fpjwasha384.pp=namespaced/Jwt.Jwa.Sha384.pp
+src/jwt/fpjwaes256.pp=namespaced/Jwt.Jwa.Es256.pp
+src/jwt/fpjwasha256.pp=namespaced/Jwt.Jwa.Sha256.pp
+src/jwt/fpjwt.pp=namespaced/Jwt.Types.pp
+src/jwt/fpoauth2.pp=namespaced/Jwt.Oauth2.pp

+ 15 - 0
packages/fcl-web/src/base/cgiapp.pp

@@ -16,15 +16,25 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cgiapp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$ifdef Unix}
+  UnixApi.CWString,
+  {$endif}
+  Fcl.CustApp,System.Classes, System.SysUtils, FpWeb.Http.Defs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$ifdef unix}
   cwstring,
   {$endif}
   CustApp,Classes, SysUtils, httpdefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   CGIVarCount = 23 deprecated;
@@ -146,8 +156,13 @@ ResourceString
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.Streams.IO;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   iostream;
+{$ENDIF FPC_DOTTEDUNITS}
   
 Type
   TFormFile = Class(TObject)

+ 6 - 0
packages/fcl-web/src/base/cgiprotocol.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cgiprotocol;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
@@ -79,7 +81,11 @@ Function IndexOfCGIVar(const AVarName: String): Integer;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function IndexOfCGIVar(const AVarName: String): Integer;
 

+ 11 - 0
packages/fcl-web/src/base/custapache.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custapache;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils,System.Classes,FpWeb.Handler,FpWeb.Http.Defs,FpWeb.Http.Base,Api.Httpd22,FpWeb.Http.Protocol, Api.Httpd22.Apr, System.SyncObjs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils,Classes,CustWeb,httpDefs,fpHTTP,httpd,httpprotocol, apr, SyncObjs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TApacheHandler = Class;
@@ -155,7 +162,11 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.CustApp;
+{$ELSE FPC_DOTTEDUNITS}
 uses CustApp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SErrNoModuleNameForRequest = 'Could not determine HTTP module name for request';

+ 11 - 0
packages/fcl-web/src/base/custapache24.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custapache24;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, FpWeb.Handler, FpWeb.Http.Defs, FpWeb.Http.Base, Api.Httpd24, Api.Httpd24.Apr, System.SyncObjs, FpWeb.Http.Protocol;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, CustWeb, httpDefs, fpHTTP, httpd24, apr24, SyncObjs, httpprotocol;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -156,7 +163,11 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.CustApp;
+{$ELSE FPC_DOTTEDUNITS}
 uses CustApp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SErrNoModuleNameForRequest = 'Could not determine HTTP module name for request';

+ 16 - 1
packages/fcl-web/src/base/custcgi.pp

@@ -16,12 +16,19 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custcgi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpWeb.Handler, System.Classes,System.SysUtils, FpWeb.Http.Defs, FpWeb.Cgi.Protocol, FpWeb.Http.Protocol;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   CustWeb, Classes,SysUtils, httpdefs, cgiprotocol, httpprotocol;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TCGIRequest }
@@ -133,7 +140,7 @@ Type
     Property RequestVariableCount : Integer Read GetRequestVariableCount;
   end;
 
-  ECGI = Class(EFPWebError);
+  ECGI = Class(EFpWebError);
 
 Var
   CGIRequestClass : TCGIRequestClass = TCGIRequest;
@@ -148,11 +155,19 @@ ResourceString
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$ifdef CGIDEBUG}
+  dbugintf,
+{$endif}
+  Fcl.Streams.IO;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$ifdef CGIDEBUG}
   dbugintf,
 {$endif}
   iostream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TMap = record

+ 25 - 4
packages/fcl-web/src/base/custfcgi.pp

@@ -21,7 +21,9 @@
 
 {$RANGECHECKS OFF}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custfcgi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
@@ -29,6 +31,16 @@ Interface
 {$define windowspipe}
 {$ifend}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,System.SysUtils, FpWeb.Http.Defs, 
+{$ifdef Unix}
+  UnixApi.Base,
+{$else}
+  WinApi.Winsock2, WinApi.Windows,
+{$endif}
+  System.Net.Sockets, FpWeb.Handler, FpWeb.Cgi.Protocol, FpWeb.Http.Protocol, FpWeb.HostApp.Custom.Cgi, Api.Fastcgi;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,SysUtils, httpdefs, 
 {$ifdef unix}
@@ -37,6 +49,7 @@ uses
   winsock2, windows,
 {$endif}
   Sockets, custweb, cgiprotocol, httpprotocol, custcgi, fastcgi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TFCGIRequest }
@@ -197,11 +210,19 @@ ResourceString
   
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$ifdef CGIDEBUG}
+  dbugintf,
+{$endif}
+  System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$ifdef CGIDEBUG}
   dbugintf,
 {$endif}
   strutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$undef nosignal}
 
@@ -618,7 +639,7 @@ Var
 begin
   // This is normally only used in mod_fastcgi.
   // mod_fcgid just kills off the process...
-  H:=THandle(StrToIntDef(sysutils.GetEnvironmentVariable('_FCGI_SHUTDOWN_EVENT_'),0));
+  H:=THandle(StrToIntDef({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.GetEnvironmentVariable('_FCGI_SHUTDOWN_EVENT_'),0));
   If (H<>0) then
     FShutDownThread:=TShutdownThread.CreateWithEvent(H,@HandleShutDownEvent);
 end;
@@ -900,7 +921,7 @@ begin
     Result:=FileRead(AHandle,ABuf,ACount)
   else
 {$endif}
-    Result:=sockets.fpRecv(AHandle, @Abuf, ACount, NoSignalAttr);
+    Result:={$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}sockets.fpRecv(AHandle, @Abuf, ACount, NoSignalAttr);
 end;
 
 function TFCgiHandler.DoFastCGIWrite(AHandle: THandle; const ABuf;
@@ -919,9 +940,9 @@ begin
     begin
     Repeat
       ExtendedErrorCode:=0;
-      Result:=sockets.fpsend(AHandle, @ABuf, ACount, NoSignalAttr);
+      Result:={$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}sockets.fpsend(AHandle, @ABuf, ACount, NoSignalAttr);
       if (Result<0) then
-        ExtendedErrorCode:=sockets.socketerror;
+        ExtendedErrorCode:={$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}sockets.socketerror;
     until (Result>=0) {$ifdef unix} or (ExtendedErrorCode<>ESysEINTR);{$endif}
     end;
 end;

+ 7 - 0
packages/fcl-web/src/base/custhttpapp.pp

@@ -16,12 +16,19 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custhttpapp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpWeb.Http.Defs, FpWeb.Handler, System.Net.Ssockets,  FpWeb.Http.Server, System.Net.Sslbase;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, httpdefs, custweb, ssockets,  fphttpserver, sslbase;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCustomHTTPApplication = Class;

+ 13 - 1
packages/fcl-web/src/base/custhttpsys.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custHTTPSys;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, WinApi.Httpapi, FpWeb.Handler, FpWeb.Http.Defs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, HttpApi, custWeb, HTTPDefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -89,7 +96,7 @@ type
     property Urls: TStrings read fUrls;
   end;
 
-  EHTTPSys = class(EFPWebError);
+  EHTTPSys = class(EFpWebError);
 
 var
   HTTPSysRequestClass: THTTPSysRequestClass = THTTPSysRequest;
@@ -98,8 +105,13 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows, FpWeb.Http.Protocol, WinApi.Winsock2;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Windows, httpprotocol, WinSock2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SErrReceiveRequest = 'Failed to receive HTTP request (Errorcode: 0x%x)';

+ 7 - 0
packages/fcl-web/src/base/custmicrohttpapp.pp

@@ -16,12 +16,19 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custmicrohttpapp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpWeb.Http.Protocol, FpWeb.Http.Defs, FpWeb.Handler, Api.Microhttpd;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, httpprotocol, httpdefs, custweb, libmicrohttpd;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TCustomMicroHTTPApplication = Class;

+ 18 - 3
packages/fcl-web/src/base/custweb.pp

@@ -16,12 +16,19 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit custweb;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.CustApp,System.Classes,System.SysUtils, FpWeb.Http.Defs, FpWeb.Http.Base, Fcl.EventLog;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   CustApp,Classes,SysUtils, httpdefs, fphttp, eventlog;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   { TCustomWebApplication }
@@ -167,18 +174,26 @@ Type
     Property LegacyRouting : Boolean Read GetLegacyRouting Write SetLegacyRouting;
   end;
 
-  EFPWebError = Class(EFPHTTPError);
+  EFpWebError = Class(EFPHTTPError);
 
 procedure ExceptionToHTML(S: TStrings; const E: Exception; const Title, Email, Administrator: string);
 
 Implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$ifdef CGIDEBUG}
+  dbugintf,
+  {$endif}
+  FpWeb.Route;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$ifdef CGIDEBUG}
   dbugintf,
   {$endif}
   httproute;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SErrNoModuleNameForRequest = 'Could not determine HTTP module name for request';
@@ -409,10 +424,10 @@ end;
 Class Procedure TWebHandler.DoError(Const Msg : String;AStatusCode : Integer = 0; const AStatusText : String = '');
 
 Var
-  E : EFPWebError;
+  E : EFpWebError;
 
 begin
-  E:=EFPWebError.Create(Msg);
+  E:=EFpWebError.Create(Msg);
   E.StatusCode:=AStatusCode;
   E.StatusText:=AStatusText;
   Raise E;

+ 6 - 0
packages/fcl-web/src/base/ezcgi.pp

@@ -10,14 +10,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ezcgi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode delphi}
 {$H+ }
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
    hexTable = '0123456789ABCDEF';

Some files were not shown because too many files changed in this diff