From 2089c6cbf71382731645da383ed28d070f069c4a Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Tue, 8 May 2012 15:06:28 +0000
Subject: [PATCH] Move editing for config.xml into the merge modules.  Add a
 Shibboleth-schemas merge modules.  Split several multi-file components up

---
 msi/WiX/MergeModules/Curl-x64.wxs           |   2 +-
 msi/WiX/MergeModules/Curl-x86.wxs           |   2 +-
 msi/WiX/MergeModules/FastCGI-x64.wxs        |   2 +-
 msi/WiX/MergeModules/FastCGI-x86.wxs        |   2 +-
 msi/WiX/MergeModules/Log4Shib-x64.wxs       |   2 +-
 msi/WiX/MergeModules/Log4Shib-x86.wxs       |   2 +-
 msi/WiX/MergeModules/OpenSAML-schemas.wxs   | 126 ++++++++++++++++++++++++++--
 msi/WiX/MergeModules/OpenSAML-x64.wxs       |   2 +-
 msi/WiX/MergeModules/OpenSAML-x86.wxs       |   2 +-
 msi/WiX/MergeModules/OpenSSL-x64.wxs        |   2 +-
 msi/WiX/MergeModules/OpenSSL-x86.wxs        |   2 +-
 msi/WiX/MergeModules/Shibboleth-x64.wxs     |   2 +-
 msi/WiX/MergeModules/Shibboleth-x86.wxs     |   2 +-
 msi/WiX/MergeModules/Xerces-x64.wxs         |   2 +-
 msi/WiX/MergeModules/Xerces-x86.wxs         |   2 +-
 msi/WiX/MergeModules/XmlSec-x64.wxs         |   2 +-
 msi/WiX/MergeModules/XmlSec-x86.wxs         |   2 +-
 msi/WiX/MergeModules/XmlTooling-schemas.wxs |  39 +++++++--
 msi/WiX/MergeModules/XmlTooling-x64.wxs     |   2 +-
 msi/WiX/MergeModules/XmlTooling-x86.wxs     |   2 +-
 msi/WiX/MergeModules/Zlib-x64.wxs           |   2 +-
 msi/WiX/MergeModules/Zlib-x86.wxs           |   2 +-
 msi/WiX/MergeModules/compile.bat            |   5 +-
 msi/WiX/MergeModules/te2.wxs                |   2 +-
 msi/WiX/MergeModules/tes.wxs                |  18 ++--
 25 files changed, 187 insertions(+), 43 deletions(-)

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index c213b6b..bff6678 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 4762aae..5ec9de0 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index e727845..e2cbfa1 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
     <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 3e8e3fb..ea50188 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
     <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 4e1bc49..48b95f4 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
     <Package Id='{A2D51A0D-847A-4941-80FC-C8C8E697565F}' Description='Merge Module for Log4Shib (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index e92ea61..5a75c9c 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
     <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 3315e45..d5591ea 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -22,7 +22,7 @@
   <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>
     <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'
              Comments='This module is built by the Shibboleth Consortium'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
@@ -34,73 +34,163 @@
                 <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
                   <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />
                 </Component>
-                <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>
+                <Component Id='schema_assertion_1_1' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
                   <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
                 </Component>
-                <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>
+                <Component Id='schema_protocol_1_1' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
                   <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
                 </Component>
-                <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>
+                <Component Id='schema_protocol_01' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
                   <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
                 </Component>
-                <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >
+                <Component Id='samlschema01' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
                   <File Name='saml10-catalog.xml' 
                         Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
+                </Component>
+                <Component Id='samlschema02' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
                   <File Name='saml11-catalog.xml' 
                         Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
+                </Component>
+                <Component Id='samlschema03' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
                   <File Name='saml20-catalog.xml' 
                         Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+                </Component>
+                <Component Id='samlschema04' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
                   <File Name='saml-schema-assertion-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema05' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
                   <File Name='saml-schema-authn-context-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema06' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
                   <File Id='a_c_auth_telephony2.0.xsd' 
                         Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema07' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
                   <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema08' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>
                   <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema09' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>
                   <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema10' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>
                   <File Id='a_c_mobileonefactorreg2.0.xsd' 
                         Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema11' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>
                   <File Id='a_c_mobileonefactorunreg2.0.xsd' 
                         Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema12' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>
                   <File Id='a_c_mobiletwofactorreg2.0.xsd' 
                         Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema13' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>
                   <File Id='a_c_mobiletwofactorunreg2.0.xsd' 
                         Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema14' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>
                   <File Id='a_c_nomadtelephony2.0.xsd' 
                         Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />
+                </Component>
+                <Component Id='samlschema15' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>
                   <File Id='a_c_personaltelephony2.0.xsd' 
                         Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema16' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>
                   <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema17' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>
                   <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema18' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>
                   <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema19' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>
                   <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema20' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>
                   <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1a' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>
                   <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1b' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>
                   <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1c' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>
                   <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1d' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>
                   <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1e' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>
                   <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1f' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>
                   <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1g' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>
                   <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1h' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>
                   <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1i' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>
                   <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1j' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>
                   <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>
+                </Component>
 
+                <Component Id='samlschema1k' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>
                   <File Name='saml-schema-dce-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1l' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>
                   <File Name='saml-schema-ecp-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1m' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>
                   <File Name='saml-schema-metadata-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1n' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>
                   <File Name='saml-schema-protocol-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1o' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>
                   <File Name='saml-schema-x500-2.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1p' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>
                   <File Name='saml-schema-xacml-2.0.xsd'/>
+                </Component>
 
+                <Component Id='samlschema1q' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>
                   <File Name='sstc-metadata-attr.xsd'/>
+                </Component>
+                <Component Id='samlschema1r' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>
                   <File Name='sstc-request-initiation.xsd'/>
+                </Component>
+                <Component Id='samlschema1s' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>
                   <File Name='sstc-saml1x-metadata.xsd'/>
+                </Component>
+                <Component Id='samlschema1t' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>
                   <File Name='sstc-saml-attribute-ext.xsd'/>
+                </Component>
+                <Component Id='samlschema1u' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>
                   <File Name='sstc-saml-delegation.xsd'/>
+                </Component>
+                <Component Id='samlschema1v' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>
                   <File Name='sstc-saml-idp-discovery.xsd' />
+                </Component>
+                <Component Id='samlschema1w' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>
                   <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1x' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>
                   <File Name='sstc-saml-metadata-ext-query.xsd'/>
+                </Component>
+                <Component Id='samlschema1y' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>
                   <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>
+                </Component>
+                <Component Id='samlschema1z' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>
                   <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>
                 </Component>
               </Directory><!--opensaml-->
@@ -109,5 +199,31 @@
         </Directory><!--Shibboleth-->
       </Directory><!--CommonAppDataFolder-->
     </Directory><!--TargetDir-->
+
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditCatalog10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalog10' Property='EditCatalog10' 
+                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+
+    <CustomAction Id='EditCatalog11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalog11' Property='EditCatalog11' 
+                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+
+    <CustomAction Id='EditCatalog20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalog20' Property='EditCatalog20' 
+                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+
+    <InstallExecuteSequence>
+      <Custom Action='SetEditCatalog10' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditCatalog10' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='SetEditCatalog11' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditCatalog11' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='SetEditCatalog20' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditCatalog20' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
   </Module>
 </Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index b3ddd1e..c19955f 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
     <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index bf13737..92721c1 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>
     <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 3395855..d2420b5 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
     <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' >
         <Directory Id='shibboleth64' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index afdcf34..95cbdf9 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
     <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index ee12b84..dac7a92 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -21,7 +21,7 @@
   <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
     <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 31843e1..0686e95 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -21,7 +21,7 @@
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>
     <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 289d3a2..e6f53f6 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
     <Package Id='{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}' Description='Merge Module for Xerces (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index a6522df..6a88d20 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
     <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 537b0b9..eb1ec55 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>
     <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for XmlSec (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index b87251c..7633758 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>
     <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for XmlSec (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
index f1f595b..d73a289 100644
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -19,9 +19,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlTooling_schemas' Language='1033' Version='$(var.XmlToolingVersion)'>
-    <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for XmlTooling schemas'
-             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+    <Package Id='{6C74499B-E2BD-4705-A619-8901A6745D8C}' Description='Merge Module for XmlTooling schemas'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
@@ -32,12 +32,25 @@
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >
                 <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
                   <File Name='xenc-schema.xsd'/>
-                  <File Name='xmldsig-core-schema.xsd'  />
+                </Component>
+                <Component Id='xmldsigcoreschema.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>
+                  <File Name='xmldsig-core-schema.xsd'/>
+                </Component>
+                <Component Id='soapenvelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>
                   <File Name='soap-envelope.xsd'  />
+                </Component>
+                <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>
                   <File Name='xml.xsd'  />
+                </Component>
+                <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>
                   <File Name='xmltooling.xsd'  />
-                  <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'  />
-                  <File Name='xmldsig11-schema.xsd' />
+                </Component>
+                <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>
+                <File Name='catalog.xml' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'/>
+                </Component>
+                <Component Id='xmldsig11schema.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>
+                  <File Name='xmldsig11-schema.xsd'/>
                 </Component>
               </Directory><!--xmltooling-->
             </Directory><!--xml-->
@@ -45,5 +58,19 @@
         </Directory><!--Shibboleth-->
       </Directory><!--CommonAppDataFolder-->
     </Directory><!--TargetDir-->
+
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalog' Property='EditCatalog' 
+                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
+
+    <InstallExecuteSequence>
+      <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+
+
   </Module>
 </Wix>
diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs b/msi/WiX/MergeModules/XmlTooling-x64.wxs
index 04384a0..cac2154 100644
--- a/msi/WiX/MergeModules/XmlTooling-x64.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x64.wxs
@@ -22,7 +22,7 @@
   <Module Id='XmlToolingMergeModule_x64' Language='1033' Version='$(var.XmlToolingVersion)'>
     <Package Id='{F944F719-7138-484D-A5B3-753411741B40}' Description='Merge Module for XMLTooling (x64)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
          At a a later date, we may chose to make this a placed module  -->
diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
index fbf3203..43adf11 100644
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -22,7 +22,7 @@
   <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>
     <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index 210a599..7729850 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -21,7 +21,7 @@
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
     <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 729a860..b9611bf 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -21,7 +21,7 @@
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
     <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index 451ba8d..b83cf66 100644
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -1,6 +1,5 @@
 goto current
 :current
-
  wixcop -indent:2 Curl-x86.wxs
  candle Curl-x86.wxs
  light  Curl-x86.wixobj
@@ -43,7 +42,8 @@ wixcop -indent:2 OpenSAML-x64.wxs
  candle OpenSAML-x64.wxs
  light  OpenSAML-x64.wixobj 
  smoke  OpenSAML-x64.msm
-goto continue
+
+
 wixcop -indent:2 OpenSSL-x86.wxs
 candle OpenSSL-x86.wxs
 light  OpenSSL-x86.wixobj
@@ -83,7 +83,6 @@ rem smoke  OpenSSL-x64.msm
  light  XmlSec-x64.wixobj
  smoke  XmlSec-x64.msm
 
-:continue
  wixcop -indent:2  XmlTooling-x86.wxs
  candle XmlTooling-x86.wxs
  wixcop -indent:2  XmlTooling-schemas.wxs
diff --git a/msi/WiX/MergeModules/te2.wxs b/msi/WiX/MergeModules/te2.wxs
index 75d6af6..c7ed339 100644
--- a/msi/WiX/MergeModules/te2.wxs
+++ b/msi/WiX/MergeModules/te2.wxs
@@ -21,7 +21,7 @@
            Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
     <Package Description='TEST2 Windows Installer package'
              Comments='Ignore Ignore Ignore Ignore' Platform='x86'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Compressed='yes' />
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
     <!-- Files -->
diff --git a/msi/WiX/MergeModules/tes.wxs b/msi/WiX/MergeModules/tes.wxs
index e7faecb..46dce08 100644
--- a/msi/WiX/MergeModules/tes.wxs
+++ b/msi/WiX/MergeModules/tes.wxs
@@ -21,16 +21,18 @@
            Version='1.0.0.0' Manufacturer='Shibboleth Consortium' >
     <Package Description='TEST Windows Installer package'
              Comments='Ignore Ignore Ignore Ignore' Platform='x64'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Compressed='yes' />
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' >
-        <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />
-<!--        <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' />  -->
         <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />
-<!--        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' /> -->
+
+<!--        <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> 
+        <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' /> 
+
         <Merge Id='XmlTooling-Schemas' Language='1033' SourceFile='.\XmlTooling-schemas.msm' DiskId='1' />
         <Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />
         <Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />
@@ -51,15 +53,15 @@
         <Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />
         <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />
         <Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />
-      </Directory>
+-->      </Directory>
     </Directory>
 
     <!-- Feature -->
     <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <MergeRef Id='OpenSAML-schemas'/>
+<!--      <MergeRef Id='OpenSAML-32'/> 
       <MergeRef Id='OpenSSL-32'/>
       <MergeRef Id='OpenSSL-64'/>
-<!--      <MergeRef Id='OpenSAML-32'/> -->
-      <MergeRef Id='OpenSAML-schemas'/>
       <MergeRef Id='OpenSAML-64'/>
       <MergeRef Id='Curl-32'/>
       <MergeRef Id='Curl-64'/>
@@ -75,11 +77,11 @@
       <MergeRef Id='Xerces-64'/>
       <MergeRef Id='XmlSec-32'/>
       <MergeRef Id='XmlSec-64'/>
-<!--      <MergeRef Id='XmlTooling-32'/>  -->
       <MergeRef Id='XmlTooling-Schemas'/> 
       <MergeRef Id='XmlTooling-64'/>
       <MergeRef Id='Zlib-32'/>
       <MergeRef Id='Zlib-64'/>
+      <MergeRef Id='XmlTooling-32'/>  -->
     </Feature>
   </Product>
 </Wix>
-- 
2.1.4