Merge remote-tracking branch 'origin/master'

ArchiveMetricData/App.config

@@ -12,8 +12,8 @@
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <connectionStrings>
-    <!--<add name="SPM" connectionString="Data Source=spmserver;Initial Catalog=MOEAgg;Persist Security Info=True;integrated security=True;MultipleActiveResultSets=True;Connection Timeout=500;App=EntityFramework" providerName="System.Data.SqlClient" />-->
-    <add name="SPM" connectionString="data source=SPMServer;initial catalog=MOE;Persist Security Info=True;User ID=spm;Password=password;MultipleActiveResultSets=True;App=EntityFramework;Connection Timeout=500" providerName="System.Data.SqlClient" />
+    <add name="SPM" connectionString="data source=SPMServer;initial catalog=MOE;Persist Security Info=True;User ID=spm;Password=SpmPassword;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+    <add name="ADConnectionString" connectionString="LDAP://itwcap1" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />

ConvertDBForHistoricalConfigurations/App.config

@@ -4,8 +4,7 @@
         <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     </configSections>
   <connectionStrings>
-    <add name="SPM" connectionString="Data Source=SPMServer;Initial Catalog=MOE ;Persist Security Info=True;integrated security=True;MultipleActiveResultSets=True;Connection Timeout=500;App=EntityFramework" providerName="System.Data.SqlClient" />
-    <!--<add name="SPM" connectionString="data source=SPMServer;initial catalog=MOE3;Persist Security Info=True;User ID=SPM;Password=spm;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
+    <add name="SPM" connectionString="Data Source=AtspmServer;Initial Catalog=MOE ;Persist Security Info=True;integrated security=True;MultipleActiveResultSets=True;Connection Timeout=500;App=EntityFramework" providerName="System.Data.SqlClient" />
     <add name="ADConnectionString" connectionString="LDAP://itwcap1" />
   </connectionStrings>
     <startup> 

ConvertDBForHistoricalConfigurations/ConvertDBForHistoricalConfigurations.csproj

@@ -60,7 +60,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

ConvertDBForHistoricalConfigurationsTests/CreateDBAndTransferRecordsForMOE4_1.sql

@@ -1238,17 +1238,17 @@ GO
 USE [MOE_ORIG]
 
 
-insert into __MigrationHistory select * from spmserver.MOE.dbo.__MigrationHistory
+insert into __MigrationHistory select * from srwtcmoe.MOE.dbo.__MigrationHistory
 
-insert into ControllerTypes select* from spmserver.MOE.dbo.ControllerTypes
+insert into ControllerTypes select* from srwtcmoe.MOE.dbo.ControllerTypes
 
-insert into DirectionTypes select* from spmserver.MOE.dbo.DirectionTypes
+insert into DirectionTypes select* from srwtcmoe.MOE.dbo.DirectionTypes
 
-insert into DetectionHardwares select * from spmserver.MOE.dbo.DetectionHardwares
+insert into DetectionHardwares select * from srwtcmoe.MOE.dbo.DetectionHardwares
 
-insert into DetectionTypes select * from spmserver.MOE.dbo.DetectionTypes
+insert into DetectionTypes select * from srwtcmoe.MOE.dbo.DetectionTypes
 
-insert into LaneTypes select * from spmserver.MOE.dbo.LaneTypes
+insert into LaneTypes select * from srwtcmoe.MOE.dbo.LaneTypes
 
 SET IDENTITY_INSERT dbo.MetricTypes ON
 
@@ -1259,27 +1259,27 @@ insert into MetricTypes([MetricID]
 	   select [MetricID]
       ,[ChartName]
       ,[Abbreviation]
-      ,[ShowOnWebsite] from spmserver.MOE.dbo.MetricTypes
+      ,[ShowOnWebsite] from srwtcmoe.MOE.dbo.MetricTypes
 
 SET IDENTITY_INSERT dbo.MetricTypes OFF
 
-insert into MovementTypes select * from spmserver.MOE.dbo.MovementTypes
+insert into MovementTypes select * from srwtcmoe.MOE.dbo.MovementTypes
 
-insert into DetectionTypeMetricTypes select * from spmserver.MOE.dbo.DetectionTypeMetricTypes
+insert into DetectionTypeMetricTypes select * from srwtcmoe.MOE.dbo.DetectionTypeMetricTypes
 
 
-insert into Region (id, Description) select ID, Description from spmserver.MOE.dbo.Region
+insert into Region (id, Description) select ID, Description from srwtcmoe.MOE.dbo.Region
 
 
 Insert Into Signals(SignalID, PrimaryName, SecondaryName, IPAddress, ControllerTypeID, Enabled, Latitude, Longitude, RegionID)
-Select SignalID, PrimaryName, SecondaryName, IPAddress, ControllerTypeID, Enabled, Latitude, Longitude, RegionID From [spmserver].[moe].dbo.Signals
+Select SignalID, PrimaryName, SecondaryName, IPAddress, ControllerTypeID, Enabled, Latitude, Longitude, RegionID From [srwtcmoe].[moe].dbo.Signals
 
 Go
 
 SET IDENTITY_INSERT dbo.Approaches ON
 Go
 Insert into Approaches(ApproachID,SignalId, DirectionTypeID, Description, MPH, ProtectedPhaseNumber, IsProtectedPhaseOverlap, PermissivePhaseNumber)
-Select ApproachID,SignalId, DirectionTypeID, Description, MPH, ProtectedPhaseNumber, IsProtectedPhaseOverlap, PermissivePhaseNumber From [spmserver].[moe].dbo.Approaches
+Select ApproachID,SignalId, DirectionTypeID, Description, MPH, ProtectedPhaseNumber, IsProtectedPhaseOverlap, PermissivePhaseNumber From [srwtcmoe].[moe].dbo.Approaches
 
 
 SET IDENTITY_INSERT dbo.Approaches OFF
@@ -1290,36 +1290,36 @@ SET IDENTITY_INSERT dbo.Detectors ON
 Go
 
 Insert Into Detectors (ID, DetectorID, DetChannel, DistanceFromStopBar, MinSpeedFilter, DateAdded, DateDisabled, LaneNumber, MovementTypeID, LaneTypeID, DecisionPoint, MovementDelay, ApproachID, DetectionHardwareID)
-Select * From [spmserver].[moe].dbo.Detectors
+Select * From [srwtcmoe].[moe].dbo.Detectors
 
 Go
 
 SET IDENTITY_INSERT dbo.Detectors OFF
 Go
 
-insert into Accordian select AccHeader, AccContent, AccOrder, Application from spmserver.MOE.dbo.Accordian
+insert into Accordian select AccHeader, AccContent, AccOrder, Application from srwtcmoe.MOE.dbo.Accordian
 
 SET IDENTITY_INSERT dbo.Agencies ON
 insert into Agencies([AgencyID]
       ,[Description])
 	   select [AgencyID]
-      ,[Description] from spmserver.MOE.dbo.Agencies
+      ,[Description] from srwtcmoe.MOE.dbo.Agencies
 
 SET IDENTITY_INSERT dbo.Agencies OFF
 
 SET IDENTITY_INSERT ActionLogs ON 
-insert into ActionLogs(ActionLogID, DATE, AgencyID, Comment, signalID, Name) select ActionLogID, DATE, AgencyID, Comment, signalID, Name from spmserver.MOE.dbo.ActionLogs
+insert into ActionLogs(ActionLogID, DATE, AgencyID, Comment, signalID, Name) select ActionLogID, DATE, AgencyID, Comment, signalID, Name from srwtcmoe.MOE.dbo.ActionLogs
 SET IDENTITY_INSERT ActionLogs OFF
 
-insert into ActionLogMetricTypes select * from spmserver.MOE.dbo.ActionLogMetricTypes
+insert into ActionLogMetricTypes select * from srwtcmoe.MOE.dbo.ActionLogMetricTypes
 
 
 
-insert into Alert_Day_Types select * from spmserver.MOE.dbo.Alert_Day_Types
+insert into Alert_Day_Types select * from srwtcmoe.MOE.dbo.Alert_Day_Types
 
 
 SET IDENTITY_INSERT ApproachRoute ON 
-insert into ApproachRoute(ApproachRouteId, RouteName) select ApproachRouteId, RouteName from spmserver.MOE.dbo.ApproachRoute
+insert into ApproachRoute(ApproachRouteId, RouteName) select ApproachRouteId, RouteName from srwtcmoe.MOE.dbo.ApproachRoute
 SET IDENTITY_INSERT ApproachRoute Off
 
 
@@ -1331,38 +1331,38 @@ insert into ApproachRouteDetail([ApproachRouteId]
 	  select [ApproachRouteId]
       ,[ApproachOrder]
       ,[RouteDetailID]
-      ,[ApproachID] from spmserver.MOE.dbo.ApproachRouteDetail
+      ,[ApproachID] from srwtcmoe.MOE.dbo.ApproachRouteDetail
 SET IDENTITY_INSERT ApproachRouteDetail OFF 
 
 
 
-insert into Archived_Metrics select top 10000 * from spmserver.MOE.dbo.Archived_Metrics
+insert into Archived_Metrics select top 10000 * from srwtcmoe.MOE.dbo.Archived_Metrics
 
 
 
-insert into Controller_Event_Log select  top 10000 * from spmserver.MOE.dbo.Controller_Event_Log
+insert into Controller_Event_Log select  top 10000 * from srwtcmoe.MOE.dbo.Controller_Event_Log
 
 
 
-insert into DetectorComments select ID,Timestamp, CommentText from spmserver.MOE.dbo.DetectorComments
-insert into DetectionTypeDetector select ID,DetectionTypeID from spmserver.MOE.dbo.DetectionTypeDetector
+insert into DetectorComments select ID,Timestamp, CommentText from srwtcmoe.MOE.dbo.DetectorComments
+insert into DetectionTypeDetector select ID,DetectionTypeID from srwtcmoe.MOE.dbo.DetectionTypeDetector
 
-insert into DownloadAgreements select CompanyName, Address, PhoneNumber, EmailAddress, Acknowledged, AgreementDate from spmserver.MOE.dbo.DownloadAgreements
+insert into DownloadAgreements select CompanyName, Address, PhoneNumber, EmailAddress, Acknowledged, AgreementDate from srwtcmoe.MOE.dbo.DownloadAgreements
 
-insert into Menu(MenuId, MenuName, ParentId, Application, DisplayOrder) select MenuId, MenuName, ParentId, Application, DisplayOrder from spmserver.MOE.dbo.Menu
+insert into Menu(MenuId, MenuName, ParentId, Application, DisplayOrder) select MenuId, MenuName, ParentId, Application, DisplayOrder from srwtcmoe.MOE.dbo.Menu
 
-insert into Program_Message select top 10000 Priority, Program, Message, Timestamp from spmserver.MOE.dbo.Program_Message
+insert into Program_Message select top 10000 Priority, Program, Message, Timestamp from srwtcmoe.MOE.dbo.Program_Message
 
 
-insert into Program_Settings select top 10000 * from spmserver.MOE.dbo.Program_Settings
+insert into Program_Settings select top 10000 * from srwtcmoe.MOE.dbo.Program_Settings
 
 
 SET IDENTITY_INSERT Route ON
-insert into Route (RouteID, Description, Region, Name) select  RouteID, Description, Region, Name from spmserver.MOE.dbo.Route
+insert into Route (RouteID, Description, Region, Name) select  RouteID, Description, Region, Name from srwtcmoe.MOE.dbo.Route
 SET IDENTITY_INSERT Route OFF
 
 
-insert into Route_Detectors (DetectorID, RouteID, RouteOrder) select DetectorID, RouteID, RouteOrder from spmserver.MOE.dbo.Route_Detectors
+insert into Route_Detectors (DetectorID, RouteID, RouteOrder) select DetectorID, RouteID, RouteOrder from srwtcmoe.MOE.dbo.Route_Detectors
 
 
-insert into Speed_Events select  top 10000 * from spmserver.MOE.dbo.Speed_Events
+insert into Speed_Events select  top 10000 * from srwtcmoe.MOE.dbo.Speed_Events

ConvertDBForHistoricalConfigurationsTests/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="SPM" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SPMServer;Initial Catalog=MOE1;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=AtspmServer;Initial Catalog=MOE1;Integrated Security=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SPMServer;Initial Catalog=MOE1;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=AtspmServer;Initial Catalog=MOE1;Integrated Security=True</Value>
     </Setting>
   </Settings>
 </SettingsFile>

ConvertDBForHistoricalConfigurationsTests/app.config

@@ -6,7 +6,7 @@
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <connectionStrings>
     <!--<add name="SPM" connectionString="Data Source=MOE;Initial Catalog=MOETest;Persist Security Info=True;integrated security=True;MultipleActiveResultSets=True;Connection Timeout=500;App=EntityFramework" providerName="System.Data.SqlClient" />-->
-    <add name="SPM" connectionString="data source=SPMServer;initial catalog=MOE1;Persist Security Info=True;User ID=SPM;Password=SPM;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+    <add name="SPM" connectionString="data source=AtspmServer;initial catalog=MOE1;Persist Security Info=True;User ID=SPM;Password=SPM;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
     <add name="ADConnectionString" connectionString="LDAP://itwcap1" />
   </connectionStrings>
   <entityFramework>