From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 18 May 2012 21:09:05 +0000 (+0000)
Subject: Cleanups and adjustments
X-Git-Tag: 2.5.0~95
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=380432a418b432404fc80d82d5dc53b6e0c2b598

Cleanups and adjustments
---

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index bff6678..6a10b14 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -48,6 +48,11 @@
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 5ec9de0..dd03a63 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -29,7 +29,6 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-
               <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
                 <File KeyPath='yes' 
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
@@ -43,12 +42,17 @@
                   <File KeyPath='yes' 
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
                 </Component>
-                <Component Id='curl.exe1' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
+                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
                   <File Id='curl.exe_debug' KeyPath='yes' 
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index e2cbfa1..5c97050 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -29,21 +29,18 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='libfcgi.dll21' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
+                <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='libfcgi.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
+                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
+                  <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+                <File KeyPath='yes' Name='FASTCGI.LICENSE' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth -->
@@ -52,5 +49,3 @@
     </Directory><!-- TARGETDIR -->
   </Module>
 </Wix>
-
-
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index ea50188..32b0853 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -29,21 +29,18 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='libfcgi.dll21' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
+              <Component Id='libfcgi.dll' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
+                <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='libfcgi.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
+                <Component Id='libfcgid.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
+                  <File KeyPath='yes' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+                <File KeyPath='yes' Name='FASTCGI.LICENSE' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 48b95f4..8fc65ab 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -45,9 +45,8 @@
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Component Id='LOG4CPP.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+              <Component Id='LOG4SHIB.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 5a75c9c..e8992d7 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -46,8 +46,7 @@
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index e37b6dd..8771dac 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -28,13 +28,212 @@
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
         <Directory Id='Shibboleth' Name='Shibboleth' >
           <Directory Id='SP' Name='SP' >
-            <Directory Id='xml' Name='xml' />
-          </Directory><!--SP-->
-        </Directory><!--Shibboleth-->
-      </Directory><!--CommonAppDataFolder-->
-    </Directory><!--TargetDir-->
-
-    <?include OpenSAML-schemas.wxi ?>
+            <Directory Id='xml' Name='xml' >
+              <Directory Id='opensaml' Name='opensaml' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\schemas\' >
+                <Component Id='cs-sstc-schema-assertion-01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
+                  <File KeyPath='yes' Name='cs-sstc-schema-assertion-01.xsd'/>
+                </Component>
+                <Component Id='cs-sstc-schema-assertion-1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
+                  <File KeyPath='yes' Name='cs-sstc-schema-assertion-1.1.xsd' />
+                </Component>
+                <Component Id='cs-sstc-schema-protocol-01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
+                  <File KeyPath='yes' Name='cs-sstc-schema-protocol-01.xsd' />
+                </Component>
+                <Component Id='cs-sstc-schema-protocol-1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
+                  <File KeyPath='yes' Name='cs-sstc-schema-protocol-1.1.xsd' />
+                </Component>
+                <Component Id='saml10-catalog.xml' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
+                  <File KeyPath='yes' Name='saml10-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in' />
+                </Component>
+                <Component Id='saml11-catalog.xml' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
+                  <File KeyPath='yes' Name='saml11-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in' />
+                </Component>
+                <Component Id='saml20-catalog.xml' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
+                  <File KeyPath='yes' Name='saml20-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+                </Component>
+                <Component Id='saml-schema-assertion-2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
+                  <File KeyPath='yes' Name='saml-schema-assertion-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-auth-telephony-2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-ip-2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-ip-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-ippword-2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-ippword-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-kerberos-2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-kerberos-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-nomad-telephony-2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-personal-telephony-2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-pgp-2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>
+                  <File KeyPath='yes' Name='saml-schema-authn-context-pgp-2.0.xsd' />
+                </Component>
+                <Component Id='saml-schema-authn-context-ppt-2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>
+                  <File KeyPath='yes' 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 -->
+              <Directory Id='xmltooling' Name='xmltooling'
+                FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >
+                <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
+                  <File Name='xenc-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'  />
+                </Component>
+                <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>
+                  <File Id='XMLToolingcatalog' 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 -->
+          </Directory><!-- SP -->
+        </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='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10' 
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+    
+    <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11' 
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+    
+    <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20' 
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+    
+    <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog' 
+      Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
 
     <InstallExecuteSequence>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxi b/msi/WiX/MergeModules/OpenSAML-x64.wxi
deleted file mode 100644
index 8334d02..0000000
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxi
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Licensed to the University Corporation for Advanced Internet
-     Development, Inc. (UCAID) under one or more contributor license
-     agreements.  See the NOTICE file distributed with this work for
-     additional information regarding copyright ownership. The UCAID
-     licenses this file to You 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.  -->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Release\' >
-    <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>
-      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
-    </Component>
-    <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>
-      <File KeyPath='yes' Name='samlsign.exe' />
-    </Component>
-  </DirectoryRef>
-  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Release\' >
-    <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>
-      <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />
-    </Component>
-    <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>
-      <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />
-    </Component>
-  </DirectoryRef><!-- lib-->
-  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>
-    <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>
-      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
-    </Component>
-    <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>
-      <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />
-    </Component>
-  </DirectoryRef><!-- lib_debug-->
-  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Debug\'>
-    <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>
-      <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />
-    </Component>
-    <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>
-      <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
-    </Component>
-  </DirectoryRef><!-- lib_debug-->
-
-  <DirectoryRef Id='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>
-    <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>
-      <File Name='CREDITS.txt' KeyPath='yes'/>
-      <File Name='LICENSE.txt' />
-      <File Name='NOTICE.txt' />
-      <File Name='README.txt'/>
-      <File Name='RELEASE.txt' />
-    </Component>
-  </DirectoryRef><!-- doc -->
-
-</Include>
-
-    
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index e81c32c..0e54a31 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -21,25 +21,51 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <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'
+             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
-              <Directory Id='lib_debug' Name='debug' />
-            </Directory><!--lib-->
-            <Directory Id='doc' Name='doc' />
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>
+              <Component Id='saml.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>
+                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>
+                <File KeyPath='yes' Name='samlsign.exe' />
+              </Component>
+              <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>
+                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>
+                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>
+                <Component Id='samlD.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>
+                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>
+                  <File KeyPath='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                </Component>
+                <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>
+                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>
+                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory> <!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>
+                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />
+                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
+                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
+              </Component>
+            </Directory> <!-- doc -->
           </Directory><!--shibboleth_SP-->
         </Directory><!--shibboleth-->
       </Directory><!--ProgramFiles64Folder-->
     </Directory>
-
-    <?include OpenSAML-x64.wxi ?>
-
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxi b/msi/WiX/MergeModules/OpenSAML-x86.wxi
deleted file mode 100644
index 90544ae..0000000
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxi
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-   Development, Inc. (UCAID) under one or more contributor license
-   agreements.  See the NOTICE file distributed with this work for
-   additional information regarding copyright ownership. The UCAID
-   licenses this file to You 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.  -->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>
-    <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
-      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
-    </Component>
-    <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
-      <File KeyPath='yes' Name='samlsign.exe' />
-    </Component>
-  </DirectoryRef><!-- lib -->
-  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release'>
-    <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
-      <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />
-    </Component>
-    <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
-      <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />
-    </Component>
-  </DirectoryRef><!-- lib -->
-  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>
-    <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
-      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
-    </Component>
-    <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
-      <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />
-    </Component>
-  </DirectoryRef><!-- lib_debug-->
-  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>
-    <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
-      <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />
-    </Component>
-    <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
-      <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
-    </Component>
-  </DirectoryRef><!-- lib_debug-->
-  <DirectoryRef Id='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>
-    <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
-      <File Name='CREDITS.txt' KeyPath='yes'/>
-      <File Name='LICENSE.txt' />
-      <File Name='NOTICE.txt' />
-      <File Name='README.txt'/>
-      <File Name='RELEASE.txt' />
-    </Component>
-  </DirectoryRef><!-- doc -->
-</Include>
-
-    
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 8d07820..12e7ea0 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -21,23 +21,51 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <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'
+             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
-              <Directory Id='lib_debug' Name='debug'/>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>
+              <Component Id='saml.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
+                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
+                <File KeyPath='yes' Name='samlsign.exe' />
+              </Component>
+              <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
+                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
+                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>
+                <Component Id='samlD.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
+                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
+                  <File KeyPath='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                </Component>
+                <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
+                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
+                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory> <!-- lib_debug -->
             </Directory><!-- lib -->
-            <Directory Id='doc' Name='doc' />
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
+                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />
+                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
+                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
+              </Component>
+            </Directory> <!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
-    <?include OpenSAML-x86.wxi ?>
   </Module>
 </Wix>
-
-    
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index d2420b5..f3aca08 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -25,34 +25,33 @@
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' >
-        <Directory Id='shibboleth64' Name='Shibboleth'>
-          <Directory Id='shibboleth_sp64' Name='SP'>
-            <Directory Id='lib64' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
-              <Component Id='libeay64.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
+              <Component Id='libeay32.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>
                 <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
-              <Component Id='ssleay64.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>
+              <Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>
                 <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
               </Component>
-              <Component Id='openssl64.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
+              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
                 <File KeyPath='yes' Name='openssl.exe' />
               </Component>
-              <Directory Id='lib_debug64' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
-                <Component Id='libeay64.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>
-                  <File Id='libeay64.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
+                <Component Id='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>
+                  <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='ssleay64.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>
-                  <File Id='ssleay64.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                <Component Id='ssleay32.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>
+                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
-                <Component Id='openssl64.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
-                  <File Id='openssl64.exe_debug' Name='openssl.exe' />
+                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
+                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
-            <Directory Id='doc64' Name='doc'>
-              <Component Id='OPENSSL.LICENSE_64' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
-                <File KeyPath='yes' Id='OPENSSL.LICENSE_64'
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+            <Directory Id='doc' Name='doc'>
+              <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 95cbdf9..cd07b8b 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -45,14 +45,13 @@
                   <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
                 </Component>
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
-                  <File Id='openssl.exe_debug' Name='openssl.exe' />
+                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 18d2833..2e10fa1 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -70,8 +70,6 @@
       </Directory><!--CommonAppDataFolder-->
     </Directory><!--TargetDir-->
 
-    <?include OpenSAML-schemas.wxi ?>
-
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 76e49a4..3a7bc7d 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -50,9 +50,6 @@
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFiles64Folder -->
     </Directory><!-- TARGETDIR -->
-
-    <?include OpenSAML-x64.wxi ?>
-
   </Module>
 </Wix>
 
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 05af6f5..4113a21 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -50,7 +50,6 @@
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
     </Directory><!-- TARGETDIR -->
-    <?include OpenSAML-x86.wxi ?>
   </Module>
 </Wix>
 
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index e6f53f6..8ac8463 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -27,6 +27,7 @@
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
+            
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>
                 <File Id='xercesc.dll' KeyPath='yes'
@@ -34,11 +35,17 @@
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>
-                  <File Id='xercescd.dll' KeyPath='yes'
+                  <File Id='xercescD.dll' KeyPath='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}'>
+                <File KeyPath='yes' Name='XERCES.LICENSE'
+                    Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 6a88d20..20a3202 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -27,6 +27,7 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
+            
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>
                 <File Id='xercesc.dll' KeyPath='yes'
@@ -34,11 +35,17 @@
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>
-                  <File Id='xercescd.dll' KeyPath='yes'
+                  <File Id='xercescD.dll' KeyPath='yes'
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>
+                <File KeyPath='yes' Name='XERCES.LICENSE'
+                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index eb1ec55..685f609 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -20,8 +20,8 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <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.'
+    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
@@ -29,8 +29,7 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
-              <!-- GUID taken from 2.4.3 installer -->
-              <Component Id='xsec_1_4_0.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>
+              <Component Id='xsec.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>
                 <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
@@ -53,29 +52,34 @@
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
-                <Component Id='xsec_1_4_0D.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>
+                <Component Id='xsecD.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>
                   <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
-                <Component Id='c14n.exe2' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
+                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
                   <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
                 </Component>
-                <Component Id='checksig.exe6' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
+                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
                   <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
                 </Component>
-                <Component Id='cipher.exe4' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
+                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
                   <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
                 </Component>
-                <Component Id='siginf.exe5' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
+                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
                   <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
                 </Component>
-                <Component Id='templatesign.exe3' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
+                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
                   <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
                 </Component>
-                <Component Id='txfmout.exe1' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
+                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
                   <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}'>
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 7633758..ddfd94a 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -20,8 +20,8 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <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.'
+    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for Santuario (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes Several executable utilities.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
@@ -29,8 +29,7 @@
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
-              <!-- GUID taken from 2.4.3 installer -->
-              <Component Id='xsec_1_4_0.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
+              <Component Id='xsec.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
                 <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
               </Component>
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
@@ -53,29 +52,34 @@
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
-                <Component Id='xsec_1_4_0D.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
+                <Component Id='xsecD.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
                   <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
                 </Component>
-                <Component Id='c14n.exe2' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
+                <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
                   <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>
                 </Component>
-                <Component Id='checksig.exe6' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
+                <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
                   <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>
                 </Component>
-                <Component Id='cipher.exe4' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
+                <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
                   <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>
                 </Component>
-                <Component Id='siginf.exe5' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
+                <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
                   <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>
                 </Component>
-                <Component Id='templatesign.exe3' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
+                <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
                   <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>
                 </Component>
-                <Component Id='txfmout.exe1' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
+                <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
                   <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_sp -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->
diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index 0211e87..368a1fd 100644
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -1,3 +1,5 @@
+PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
+
 goto current
 :current
  wixcop -indent:2 Curl-x86.wxs
@@ -45,13 +47,13 @@ wixcop -indent:2 OpenSAML-x64.wxs
 
 
 wixcop -indent:2 OpenSSL-x86.wxs
-candle OpenSSL-x86.wxs
-light  OpenSSL-x86.wixobj
-rem smoke  OpenSSL-x86.msm
+ candle OpenSSL-x86.wxs
+ light  OpenSSL-x86.wixobj
+ smoke  OpenSSL-x86.msm
 wixcop -indent:2 OpenSSL-x64.wxs
-candle OpenSSL-x64.wxs
-light  OpenSSL-x64.wixobj
-rem smoke  OpenSSL-x64.msm
+ candle OpenSSL-x64.wxs
+ light  OpenSSL-x64.wixobj
+ smoke  OpenSSL-x64.msm
 
  wixcop -indent:2 Shibboleth-x86.wxs
  candle Shibboleth-x86.wxs
diff --git a/msi/WiX/MergeModules/tes.wxs b/msi/WiX/MergeModules/tes.wxs
index 46dce08..db9759e 100644
--- a/msi/WiX/MergeModules/tes.wxs
+++ b/msi/WiX/MergeModules/tes.wxs
@@ -29,7 +29,7 @@
       <Directory Id='ProgramFilesFolder' >
         <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />
 
-<!--        <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-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' /> 
 
@@ -53,13 +53,13 @@
         <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='OpenSAML-32'/> 
       <MergeRef Id='OpenSSL-32'/>
       <MergeRef Id='OpenSSL-64'/>
       <MergeRef Id='OpenSAML-64'/>
@@ -81,7 +81,7 @@
       <MergeRef Id='XmlTooling-64'/>
       <MergeRef Id='Zlib-32'/>
       <MergeRef Id='Zlib-64'/>
-      <MergeRef Id='XmlTooling-32'/>  -->
+      <MergeRef Id='XmlTooling-32'/>
     </Feature>
   </Product>
 </Wix>
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 0b158f9..4db984c 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -17,14 +17,15 @@
    permissions and limitations under the License.  -->
 
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <?define BuildDirectory='G:\Downloads\shib\' ?>
-
+  <?define BuildDirectory='C:\Users\scantor\Shibboleth\' ?>
+  <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>
+  
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
   <?define ShibbolethVersion='2.4.186'?>
   <!-- DO NOT CHANGE UpgradeCode -->
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
 
-  <?define CurlVersion='7.21.2' ?>
+  <?define CurlVersion='7.21.7' ?>
 
   <?define FastCGIVersion='2.4.0' ?>
 
@@ -35,8 +36,8 @@
   <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
   <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
-  <?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
-  <?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
+  <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->
+  <?define OpenSSLDirVersion='1.0.0i' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
   <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
@@ -46,7 +47,7 @@
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
-  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
+  <?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
   <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <?define XmlToolingVersion='1.4.2' ?>