Merge pull request #3 from nsip/release-3-2-1

Support for SIF Infrastructure 3.2.1.

Author: joerghuber

Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]

Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Sif.Framework.EnvironmentProvider.csproj

@@ -57,9 +57,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Sif.Specification.Infrastructure, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Sif.Specification.Infrastructure, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
+      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SQLite, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

Code/Sif3Framework/Sif.Framework.Tests/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]

Code/Sif3Framework/Sif.Framework.Tests/Sif.Framework.Tests.csproj

@@ -43,9 +43,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Sif.Specification.Infrastructure, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Sif.Specification.Infrastructure, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
+      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

Code/Sif3Framework/Sif.Framework/Model/Infrastructure/Initialization.cs

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Systemic Pty Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+namespace Sif.Framework.Model.Infrastructure
+{
+
+    /// <summary>
+    /// Job initialisation object.
+    /// </summary>
+    public class Initialization
+    {
+
+        /// <summary>
+        /// Payload.
+        /// </summary>
+        public virtual object Payload { get; set; }
+
+        /// <summary>
+        /// Phase name.
+        /// </summary>
+        public virtual string PhaseName { get; set; }
+
+    }
+
+}

Code/Sif3Framework/Sif.Framework/Model/Infrastructure/Job.cs

@@ -1,5 +1,6 @@
 /*
  * Crown Copyright © Department for Education (UK) 2016
+ * Copyright 2017 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +15,10 @@
  * limitations under the License.
  */
 
-using Sif.Framework.Model.DataModels;
 using Sif.Framework.Model.Persistence;
 using Sif.Framework.Utils;
 using System;
 using System.Collections.Generic;
-using System.Xml.Serialization;
 
 namespace Sif.Framework.Model.Infrastructure
 {
@@ -76,6 +75,11 @@ public class Job : IPersistable<Guid>
         /// </summary>
         public virtual IDictionary<string, Phase> Phases { get; set; }
 
+        /// <summary>
+        /// Initialisation object associated with the job.
+        /// </summary>
+        public virtual Initialization Initialization { get; set; }
+
         /// <summary>
         /// Basic constructor that sets logical default values
         /// </summary>

Code/Sif3Framework/Sif.Framework/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Sif.Framework")]
-[assembly: AssemblyDescription("Core library of the SIF3 Framework based on SIF Infrastructure 3.2.")]
+[assembly: AssemblyDescription("Core library of the SIF3 Framework based on SIF Infrastructure 3.2.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Systemic Pty Ltd")]
 [assembly: AssemblyProduct("Sif.Framework")]
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]

Code/Sif3Framework/Sif.Framework/Service/Mapper/MapperFactory.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Systemic Pty Ltd
+ * Copyright 2017 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 using Sif.Framework.Model.Requests;
 using Sif.Framework.Model.Responses;
 using Sif.Specification.Infrastructure;
-using System;
 using System.Collections.Generic;
 using System.Xml;
 using Environment = Sif.Framework.Model.Infrastructure.Environment;
@@ -165,7 +164,8 @@ static MapperFactory()
             AutoMapper.Mapper.CreateMap<Environment, environmentType>()
                 .ForMember(dest => dest.infrastructureServices, opt => opt.MapFrom(src => src.InfrastructureServices.Values))
                 .ForMember(dest => dest.provisionedZones, opt => opt.MapFrom(src => src.ProvisionedZones.Values))
-                .ForMember(dest => dest.typeSpecified, opt => opt.UseValue<bool>(true));
+                .ForMember(dest => dest.typeSpecified, opt => opt.UseValue<bool>(true))
+                .ForMember(dest => dest.fingerprint, opt => opt.Ignore());
             AutoMapper.Mapper.CreateMap<environmentType, Environment>();
 
             AutoMapper.Mapper.CreateMap<ProductIdentity, productIdentityType>();
@@ -220,6 +220,9 @@ static MapperFactory()
             AutoMapper.Mapper.CreateMap<phaseType[], IDictionary<string, Phase>>()
                 .ConvertUsing<PhasesConverter>();
 
+            AutoMapper.Mapper.CreateMap<Initialization, initializationType>();
+            AutoMapper.Mapper.CreateMap<initializationType, Initialization>();
+
             AutoMapper.Mapper.CreateMap<Job, jobType>()
                 .ForMember(dest => dest.phases, opt => opt.MapFrom(src => src.Phases.Values))
                 .ForMember(dest => dest.createdSpecified, opt => opt.MapFrom(src => src.Created != null))

Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj

@@ -57,8 +57,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Sif.Specification.Infrastructure">
-      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
+    <Reference Include="Sif.Specification.Infrastructure, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -89,6 +90,7 @@
     <Compile Include="Model\Authentication\AuthenticationMethod.cs" />
     <Compile Include="Model\Authentication\AuthorisationToken.cs" />
     <Compile Include="Model\Exceptions\InvalidAuthorisationTokenException.cs" />
+    <Compile Include="Model\Infrastructure\Initialization.cs" />
     <Compile Include="Model\Infrastructure\SifObjectBinding.cs" />
     <Compile Include="Providers\FunctionalServiceProvider.cs" />
     <Compile Include="Model\DataModels\ServiceClassInfo.cs" />

Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Properties/AssemblyInfo.cs

@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]