From: Scott Cantor <cantor.2@osu.edu>
Date: Sun, 20 May 2012 21:22:07 +0000 (+0000)
Subject: Config file handling changes
X-Git-Tag: 2.5.0~83
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=7c5fe93e1608b0e052cf12be4f4fbcc09de16631

Config file handling changes
---

diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
index 128dd84..21386e3 100644
--- a/msi/WiX/ShibbolethSP-iis-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-iis-dialog.wxs
@@ -41,7 +41,7 @@
 
         <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
                  Text='This will install the ISAPI filter for IIS, register the specified file extension and create a Web Services Extension entry (IIS 6 and later).'/>
-        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='154' Width='180' Height='14' 
+        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='120' Width='180' Height='14' 
                  Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' 
                  CheckBoxValue='TRUE' TabSkip='yes' />
 
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 78084e2..2fe4dae 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -101,10 +101,10 @@
     </Directory><!--TARGETDIR-->
 
     <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
-      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>
         <File KeyPath='yes' Name='SetService64.bat' />
       </Component>
-      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>
         <File KeyPath='yes' Name='SetService32.bat' />
       </Component>
     </DirectoryRef><!-- etc_shibboleth -->