Fixed #133

coolOrangeLabs · Jul 24, 2020 · 7368c1d · 7368c1d
1 parent b43fad5
commit 7368c1d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/Files/harvest.cmd b/Files/harvest.cmd
@@ -1,5 +1,5 @@
-xcopy /Y /E /I "C:\ProgramData\Autodesk\Vault 2020\Extensions\DataStandard\CAD.Custom" "DataStandard\CAD.Custom" /EXCLUDE:harvest.exclude
-xcopy /Y /E /I "C:\ProgramData\Autodesk\Vault 2020\Extensions\DataStandard\Vault.Custom" "DataStandard\Vault.Custom" 
+xcopy /Y /E /I "C:\ProgramData\Autodesk\Vault 2021\Extensions\DataStandard\CAD.Custom" "DataStandard\CAD.Custom" /EXCLUDE:harvest.exclude
+xcopy /Y /E /I "C:\ProgramData\Autodesk\Vault 2021\Extensions\DataStandard\Vault.Custom" "DataStandard\Vault.Custom" 
 
 xcopy /Y /E /I "C:\ProgramData\coolOrange\powerGate" "powerGate"
 

diff --git a/Files/make.cmd b/Files/make.cmd
@@ -1,5 +1,5 @@
-xcopy /Y /E /I "DataStandard\CAD.Custom" "C:\ProgramData\Autodesk\Vault 2020\Extensions\DataStandard\CAD.Custom"
-xcopy /Y /E /I "DataStandard\Vault.Custom" "C:\ProgramData\Autodesk\Vault 2020\Extensions\DataStandard\Vault.Custom"
+xcopy /Y /E /I "DataStandard\CAD.Custom" "C:\ProgramData\Autodesk\Vault 2021\Extensions\DataStandard\CAD.Custom"
+xcopy /Y /E /I "DataStandard\Vault.Custom" "C:\ProgramData\Autodesk\Vault 2021\Extensions\DataStandard\Vault.Custom"
 
 xcopy /Y /E /I "powerGate" "C:\ProgramData\coolOrange\powerGate"
 

diff --git a/Files/powerEvents/Modules/Import.Modules.psm1 b/Files/powerEvents/Modules/Import.Modules.psm1
@@ -1,8 +1,7 @@
-
-Import-module "C:\ProgramData\coolOrange\powerGate\Modules\Logging.psm1" -Force
+$global:ErrorActionPreference = "Stop"
+$commonModulePath = "C:\ProgramData\coolOrange\powerGate\Modules"
+$modules = Get-ChildItem -path $commonModulePath -Recurse -Filter *.ps* 
+$modules | ForEach-Object { Import-Module -Name $_.FullName -Global }
 $global:loggingSettings.LogFile = Join-Path $env:LOCALAPPDATA "coolOrange\Projects\powerEvents.txt"
-$Global:ErrorActionPreference = "STOP"
 
-#TODO: This could be improved
-Import-module "C:\ProgramData\Autodesk\Vault 2020\Extensions\DataStandard\Vault.Custom\addinVault\powerGateMain.ps1" -Force
-Import-module "C:\ProgramData\coolOrange\powerGate\Modules\BomFunctions.psm1" -Force
+ConnectToErpServer
diff --git a/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/coolOrange.Logging.dll b/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/coolOrange.Logging.dll
diff --git a/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/powerGateServer.SDK.dll b/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/powerGateServer.SDK.dll
diff --git a/Files/powerGatePlugin/ErpServices/WebService.cs b/Files/powerGatePlugin/ErpServices/WebService.cs
@@ -2,6 +2,8 @@
 using System.Configuration;
 using System.IO;
 using System.Reflection;
+using System.ServiceModel;
+using System.ServiceModel.Discovery;
 using ErpServices.ErpManager.Interfaces;
 using ErpServices.Services;
 using log4net;
@@ -14,7 +16,7 @@ public class WebService : powerGateServer.SDK.WebService
     {
         static readonly ILog Log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        
         public WebService()
         {
             var erpStorageConfiguration = GetErpStorageConfiguration();
@@ -38,6 +40,12 @@ public WebService()
             AddMethod(new BomHeaders(erpManager));
             AddMethod(new BomRows(erpManager));
             AddMethod(new Documents(erpManager));
+
+            if (OperationContext.Current != null)
+            {
+                OperationContext.Current.Host.Description.Behaviors.Add(new ServiceDiscoveryBehavior());
+                OperationContext.Current.Host.AddServiceEndpoint(new UdpDiscoveryEndpoint());
+            }
         }
 
         AppSettingsSection GetErpStorageConfiguration()

diff --git a/Installer/ClientSetup/Includes/ProductVariables.wxi b/Installer/ClientSetup/Includes/ProductVariables.wxi
@@ -4,8 +4,8 @@
 	<?define WikiLink="https://github.com/coolOrangeLabs/powerGateTemplate/wiki"?>
 	<?define IconName="..\Resources\coolOrange.ico"?>
 	<?define PVersion="$(var.Major).$(var.Minor).$(var.Build).$(var.Revision)"?>
-	<?define VaultYear="Vault 2020"?>
-	<?define PName="powerGate Standard - Client integration for Vault $(var.VaultYear)"?>
+	<?define VaultYear="Vault 2021"?>
+	<?define PName="powerGate Standard - Client integration for $(var.VaultYear)"?>
 	<?define PShortVersion="$(var.Major).$(var.Minor)"?>
 	<?define CompanyDirectory="coolOrange"?>