Merge pull request #5 from nsip/develop

Applied updates to the SIF AU 3.4.1 Data Model.
nsip · Jun 10, 2017 · 083cf0b · 083cf0b
2 parents 50e71dc + cc469fa
commit 083cf0b
Show file tree

Hide file tree

Showing 21 changed files with 605 additions and 584 deletions.
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/StudentPersonal.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Models/StudentPersonal.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.
@@ -21,8 +21,8 @@
 namespace Sif.Framework.Demo.Au.Consumer.Models
 {
 
-    [XmlRoot("StudentPersonal", Namespace = "http://www.sifassociation.org/au/datamodel/3.4", IsNullable = false)]
-    [XmlType(Namespace = "http://www.sifassociation.org/au/datamodel/3.4")]
+    [XmlRoot("StudentPersonal", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)]
+    [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")]
     public class StudentPersonal : StudentPersonalType, IDataModel
     {
     }

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Properties/AssemblyInfo.cs b/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.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
+[assembly: AssemblyVersion("3.2.1.1")]
+[assembly: AssemblyFileVersion("3.2.1.1")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/SifFramework.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/SifFramework.config
@@ -13,7 +13,7 @@
     <add key="consumer.environment.template.applicationKey" value="Sif3DemoApp"/>
     <add key="consumer.environment.template.authenticationMethod" value="SIF_HMACSHA256"/>
     <add key="consumer.environment.template.consumerName" value="DemoConsumer"/>
-    <add key="consumer.environment.template.dataModelNamespace" value="http://www.sifassociation.org/au/datamodel/3.4"/>
+    <add key="consumer.environment.template.dataModelNamespace" value="http://www.sifassociation.org/datamodel/au/3.4"/>
     <add key="consumer.environment.template.solutionId" value="Sif3Framework"/>
     <add key="consumer.environment.template.supportedInfrastructureVersion" value="3.2"/>
     <add key="consumer.paging.navigationPageSize" value="5"/>

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/SchoolInfo.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/SchoolInfo.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.
@@ -21,8 +21,8 @@
 namespace Sif.Framework.Demo.Au.Provider.Models
 {
 
-    [XmlRoot("SchoolInfo", Namespace = "http://www.sifassociation.org/au/datamodel/3.4", IsNullable = false)]
-    [XmlType(Namespace = "http://www.sifassociation.org/au/datamodel/3.4")]
+    [XmlRoot("SchoolInfo", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)]
+    [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")]
     public class SchoolInfo : SchoolInfoType, IDataModel
     {
     }

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/StudentPersonal.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Models/StudentPersonal.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.
@@ -21,8 +21,8 @@
 namespace Sif.Framework.Demo.Au.Provider.Models
 {
 
-    [XmlRoot("StudentPersonal", Namespace = "http://www.sifassociation.org/au/datamodel/3.4", IsNullable = false)]
-    [XmlType(Namespace = "http://www.sifassociation.org/au/datamodel/3.4")]
+    [XmlRoot("StudentPersonal", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)]
+    [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")]
     public class StudentPersonal : StudentPersonalType, IDataModel
     {
     }

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Properties/AssemblyInfo.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/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.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
+[assembly: AssemblyVersion("3.2.1.1")]
+[assembly: AssemblyFileVersion("3.2.1.1")]
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/SifFramework.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/SifFramework.config
@@ -13,7 +13,7 @@
     <add key="provider.environment.template.applicationKey" value="Sif3DemoApp"/>
     <add key="provider.environment.template.authenticationMethod" value="Basic"/>
     <add key="provider.environment.template.consumerName" value="DemoProvider"/>
-    <add key="provider.environment.template.dataModelNamespace" value="http://www.sifassociation.org/au/datamodel/3.4"/>
+    <add key="provider.environment.template.dataModelNamespace" value="http://www.sifassociation.org/datamodel/au/3.4"/>
     <add key="provider.environment.template.supportedInfrastructureVersion" value="3.2"/>
   </appSettings>
   <sifFramework>

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/ConsumerApp.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/ConsumerApp.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.
@@ -51,12 +51,17 @@ void RunSchoolInfoConsumer()
                 // Query all schools.
                 IEnumerable<SchoolInfo> allSchools = schoolInfoConsumer.Query();
 
-                foreach (SchoolInfo school in allSchools)
+                if (log.IsInfoEnabled) log.Info("School count is " + (allSchools == null ? 0 : allSchools.Count()));
+
+                if (allSchools != null)
                 {
-                    if (log.IsInfoEnabled) log.Info("School " + school.SchoolName + " has a RefId of " + school.RefId + ".");
-                }
 
-                if (log.IsInfoEnabled) log.Info("School count is " + allSchools.Count());
+                    foreach (SchoolInfo school in allSchools)
+                    {
+                        if (log.IsInfoEnabled) log.Info("School " + school.SchoolName + " has a RefId of " + school.RefId + ".");
+                    }
+
+                }
 
                 // Create multiple schools.
                 MultipleCreateResponse createResponse = schoolInfoConsumer.Create(CreateSchools());
@@ -130,12 +135,18 @@ void RunStaffPersonalConsumer()
                 conditions.Add(condition);
                 IEnumerable<StaffPersonal> staffPersonals = staffPersonalConsumer.QueryByServicePath(conditions);
 
-                foreach (StaffPersonal staffPersonal in staffPersonals)
+                if (log.IsInfoEnabled) log.Info("Staff count is " + (staffPersonals == null ? 0 : staffPersonals.Count()));
+
+                if (staffPersonals != null)
                 {
-                    if (log.IsInfoEnabled) log.Info("Staff name is " + staffPersonal.PersonInfo.Name.GivenName + " " + staffPersonal.PersonInfo.Name.FamilyName);
+
+                    foreach (StaffPersonal staffPersonal in staffPersonals)
+                    {
+                        if (log.IsInfoEnabled) log.Info("Staff name is " + staffPersonal.PersonInfo.Name.GivenName + " " + staffPersonal.PersonInfo.Name.FamilyName);
+                    }
+
                 }
 
-                if (log.IsInfoEnabled) log.Info("Staff count is " + staffPersonals.Count());
             }
             finally
             {

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Models/SchoolInfo.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Models/SchoolInfo.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.
@@ -21,8 +21,8 @@
 namespace Sif.Framework.Demo.Hits.Consumer.Models
 {
 
-    [XmlRoot("SchoolInfo", Namespace = "http://www.sifassociation.org/au/datamodel/3.4", IsNullable = false)]
-    [XmlType(Namespace = "http://www.sifassociation.org/au/datamodel/3.4")]
+    [XmlRoot("SchoolInfo", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)]
+    [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")]
     public class SchoolInfo : SchoolInfoType, IDataModel
     {
     }

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Models/StaffPersonal.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Models/StaffPersonal.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.
@@ -21,8 +21,8 @@
 namespace Sif.Framework.Demo.Hits.Consumer.Models
 {
 
-    [XmlRoot("StaffPersonal", Namespace = "http://www.sifassociation.org/au/datamodel/3.4", IsNullable = false)]
-    [XmlType(Namespace = "http://www.sifassociation.org/au/datamodel/3.4")]
+    [XmlRoot("StaffPersonal", Namespace = "http://www.sifassociation.org/datamodel/au/3.4", IsNullable = false)]
+    [XmlType(Namespace = "http://www.sifassociation.org/datamodel/au/3.4")]
     public class StaffPersonal : StaffPersonalType, IDataModel
     {
     }

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/Properties/AssemblyInfo.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.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.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
+[assembly: AssemblyVersion("3.2.1.1")]
+[assembly: AssemblyFileVersion("3.2.1.1")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/SifFramework.config b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Hits.Consumer/SifFramework.config
@@ -8,24 +8,24 @@
   <appSettings>
     <!-- Settings used to register this Consumer with the HITS EnvironmentProvider. -->
     <add key="consumer.environment.deleteOnUnregister" value="false"/>
-    <add key="consumer.environment.sharedSecret" value="bcbb4c5d-3338-4785-a63c-7add2194894c"/>
-    <add key="consumer.environment.url" value="http://hits.dev.nsip.edu.au/SIF3InfraREST/hits/environments/environment"/>
-    <add key="consumer.environment.template.applicationKey" value="614bebe2-c529-4ef8-8a10-d04e18facc40"/>
+    <add key="consumer.environment.sharedSecret" value="9b42738b5999484eb750b34a36357c74"/>
+    <add key="consumer.environment.url" value="http://hits.nsip.edu.au/SIF3InfraREST/hits/environments/environment"/>
+    <add key="consumer.environment.template.applicationKey" value="9b42738b5999484eb750b34a36357c74"/>
     <add key="consumer.environment.template.authenticationMethod" value="Basic"/>
     <add key="consumer.environment.template.consumerName" value=""/>
-    <add key="consumer.environment.template.dataModelNamespace" value="http://www.sifassociation.org/au/datamodel/3.4"/>
+    <add key="consumer.environment.template.dataModelNamespace" value="http://www.sifassociation.org/datamodel/au/3.4"/>
     <add key="consumer.environment.template.solutionId" value="HITS"/>
-    <add key="consumer.environment.template.supportedInfrastructureVersion" value="3.1"/>
-    <add key="consumer.environment.template.userToken" value="6dd11373-95fd-44d0-84b5-f6a238d78a6a"/>
+    <add key="consumer.environment.template.supportedInfrastructureVersion" value="3.2"/>
+    <add key="consumer.environment.template.userToken" value="9b42738b5999484eb750b34a36357c74"/>
     <add key="consumer.paging.navigationPageSize" value="5"/>
     <add key="consumer.payload.compress" value="false"/>
   </appSettings>
   <sifFramework>
     <consumer>
       <sessions>
         <!-- Pre-defined authorisation values required for Consumer requests where an Environment in HITS already exists. -->
-        <session applicationKey="614bebe2-c529-4ef8-8a10-d04e18facc40" environmentUrl="http://hits.dev.nsip.edu.au/SIF3InfraREST/hits/environments/cbde5abb-bef7-4132-bc3a-58db4d023178"
-          sessionToken="04fea921-a651-4fa6-98ba-8d7684835367" solutionId="HITS" userToken="6dd11373-95fd-44d0-84b5-f6a238d78a6a" />
+        <session applicationKey="9b42738b5999484eb750b34a36357c74" environmentUrl="http://hits.nsip.edu.au/SIF3InfraREST/hits/environments/2cc9ca81-e8c7-4af2-90b5-7bd55697ed6a"
+          sessionToken="7f320d7b-9703-4658-9719-f1c7a1806723" solutionId="HITS" userToken="9b42738b5999484eb750b34a36357c74" />
       </sessions>
     </consumer>
   </sifFramework>

diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/EnvironmentRequest.xml b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Data files/AU/EnvironmentRequest.xml
@@ -8,7 +8,7 @@
   <applicationInfo>
     <applicationKey>Sif3DemoApp</applicationKey>
     <supportedInfrastructureVersion>3.2.1</supportedInfrastructureVersion>
-    <dataModelNamespace>http://www.sifassociation.org/au/datamodel/3.4.1</dataModelNamespace>
+    <dataModelNamespace>http://www.sifassociation.org/datamodel/au/3.4</dataModelNamespace>
     <transport>REST</transport>
   </applicationInfo>
 </environment>
diff --git a/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/Properties/AssemblyInfo.cs b/Code/Sif3FrameworkDemo/Sif.Framework.Demo.Setup/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.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
+[assembly: AssemblyVersion("3.2.1.1")]
+[assembly: AssemblyFileVersion("3.2.1.1")]