Auto stash before merge of "WIP" and "origin/WIP"

emiMobileServer/Source/Api.Database.dfm

@@ -822,8 +822,7 @@ object ApiDatabaseModule: TApiDatabaseModule
     SpecificOptions.Strings = (
       'PostgreSQL.Schema=lems, avl, entcad')
     Username = 'postgres'
-    Server = '192.168.102.10'
-    Connected = True
+    Server = '192.168.74.10'
     LoginPrompt = False
     Left = 54
     Top = 38

emiMobileServer/Source/Common.Ini.pas

@@ -94,10 +94,10 @@ begin
     FWebClientVersionFromIni := iniFile.ValueExists('Settings', 'webClientVersion');
 
     // [Database]
-    FDatabaseServer := iniFile.ReadString('Database', 'Server', '192.168.102.10');
+    FDatabaseServer := iniFile.ReadString('Database', 'Server', '192.168.74.10');
     FDatabaseServerFromIni := iniFile.ValueExists('Database', 'Server');
 
-    FDatabasePort := iniFile.ReadInteger('Database', 'Port', 5432);
+    FDatabasePort := iniFile.ReadInteger('Database', 'Port', 5433);
     FDatabasePortFromIni := iniFile.ValueExists('Database', 'Port');
 
     FDatabaseName := iniFile.ReadString('Database', 'Database', 'lems_wcso');

emiMobileServer/bin/emiMobileServer.ini

 [Settings]
-LogFileNum=722
+LogFileNum=725
 webClientVersion=0.1.0
 
 [Database]
-Server=192.168.102.10
-Port=5432
+--Server=192.168.102.10
+Server=192.168.74.10
+Port=5433
 Database=lems_wcso
 Username=postgres
 --Password=postgreSQL

webEMIMobile/webEmiMobile.dproj

@@ -512,7 +512,12 @@
                 <Source>
                     <Source Name="MainSource">webEmiMobile.dpr</Source>
                 </Source>
-                <Excluded_Packages/>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k370.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp370.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k370.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp370.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\webCharms.exe" Configuration="Debug" Class="ProjectOutput"/>