[cpp-sp] branch master updated: Add generic message catalog to registry for SP-wide use.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=143cbc83454921a037a539c1f1bafee3d1736ede

The following commit(s) were added to refs/heads/master by this push:
       new  143cbc8   Add generic message catalog to registry for SP-wide use.
143cbc8 is described below

commit 143cbc83454921a037a539c1f1bafee3d1736ede
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 17 20:51:59 2018 -0400

    Add generic message catalog to registry for SP-wide use.
---
 msi/WiX/ShibbolethSP-main-x64.wxs | 12 +++++++++---
 msi/WiX/ShibbolethSP-main-x86.wxs | 14 ++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 388e2eb..b00484a 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -188,16 +188,22 @@
         -->
       <Component Id="messageFile" Guid="{3FF89632-9F39-4B1B-AA3E-3AF6C8155B92}" Win64="yes" Directory="bin64">
         <File Id="Messages" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\Messages.dll" />
+        <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
+          <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+          <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
+          <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
+        </RegistryKey>
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
         </RegistryKey>
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
@@ -206,7 +212,7 @@
       <Component Id="messageIIS7" Guid="{1CC5CF4A-6203-4ab8-9743-4A79C95D30CE}" Win64="yes" Directory="bin64">
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index a155ef9..3fbcefd 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -102,16 +102,22 @@
         -->
       <Component Id="messageFile" Guid="{7B81ACC5-B79C-426B-ACB8-346A52E5FF60}" Win64="no" Directory="bin">
         <File Id="Messages" KeyPath="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\Messages.dll" />
+        <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
+          <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+          <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
+          <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
+        </RegistryKey>
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
         </RegistryKey>
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
@@ -120,12 +126,12 @@
       <Component Id="messageIIS7" Guid="{FDEB81BA-4935-49c2-84FE-E58F674F5FF3}" Win64="no" Directory="bin">
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth NATIVE Filter">
           <RegistryValue Name="CategoryCount" Type="integer" Value="2" />
-          <RegistryValue Name="TypeSupported" Type="integer" Value="15" />
+          <RegistryValue Name="TypesSupported" Type="integer" Value="15" />
           <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="EventMessageFile" Type="string" Value="[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
         </RegistryKey>
-      </Component>
+      </Component>      
 
       <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
         <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.