From 9d9cf28a5acea0d013e69ba7d5ea0a7b67a5006b Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Thu, 12 Apr 2012 13:43:52 +0000
Subject: [PATCH] Initial Commit of wixbuild for a 32 bit installer.

Includes:
  Sources for (32 bit) merge modules for:
    Curl
    FastCGI
    Log4Shib
    OpenSAML (with <Fragment/> for schemas which can be shared with x64)
    OpenSSL
    Shibboleth
    Xerces
    XMLSec
    XMLTooling  (with </Fragment/> for schemas which can be shared with x64)
    Zlib

  <Fragments/> for the SP architure specific and architecture neutral parts.
  A test file to pull this all together
---
 msi/WiX/MergeModules/Curl-x86.wxs           |  61 +++++++
 msi/WiX/MergeModules/FastCGI-x86.wxs        |  62 +++++++
 msi/WiX/MergeModules/Log4Shib-x86.wxs       |  69 ++++++++
 msi/WiX/MergeModules/OpenSAML-schemas.wxs   |  90 ++++++++++
 msi/WiX/MergeModules/OpenSAML-x86.wxs       |  74 +++++++++
 msi/WiX/MergeModules/OpenSSL-x86.wxs        |  78 +++++++++
 msi/WiX/MergeModules/Shibboleth-x86.wxs     |  58 +++++++
 msi/WiX/MergeModules/Xerces-x86.wxs         |  55 +++++++
 msi/WiX/MergeModules/XmlSec-x86.wxs         | 104 ++++++++++++
 msi/WiX/MergeModules/XmlTooling-schemas.wxs |  36 ++++
 msi/WiX/MergeModules/XmlTooling-x86.wxs     |  67 ++++++++
 msi/WiX/MergeModules/Zlib-x86.wxs           |  51 ++++++
 msi/WiX/ShibbolethSP-exe-x86.wxs            | 170 +++++++++++++++++++
 msi/WiX/ShibbolethSP-noarch.wxs             | 245 ++++++++++++++++++++++++++++
 msi/WiX/testInstall.wxs                     | 117 +++++++++++++
 15 files changed, 1337 insertions(+)
 create mode 100644 msi/WiX/MergeModules/Curl-x86.wxs
 create mode 100644 msi/WiX/MergeModules/FastCGI-x86.wxs
 create mode 100644 msi/WiX/MergeModules/Log4Shib-x86.wxs
 create mode 100644 msi/WiX/MergeModules/OpenSAML-schemas.wxs
 create mode 100644 msi/WiX/MergeModules/OpenSAML-x86.wxs
 create mode 100644 msi/WiX/MergeModules/OpenSSL-x86.wxs
 create mode 100644 msi/WiX/MergeModules/Shibboleth-x86.wxs
 create mode 100644 msi/WiX/MergeModules/Xerces-x86.wxs
 create mode 100644 msi/WiX/MergeModules/XmlSec-x86.wxs
 create mode 100644 msi/WiX/MergeModules/XmlTooling-schemas.wxs
 create mode 100644 msi/WiX/MergeModules/XmlTooling-x86.wxs
 create mode 100644 msi/WiX/MergeModules/Zlib-x86.wxs
 create mode 100644 msi/WiX/ShibbolethSP-exe-x86.wxs
 create mode 100644 msi/WiX/ShibbolethSP-noarch.wxs
 create mode 100644 msi/WiX/testInstall.wxs

diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
new file mode 100644
index 0000000..23e2ead
--- /dev/null
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -0,0 +1,61 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define CurlVersion='7.21.2' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+
+              <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'/>
+              </Component>
+              <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>
+                  <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}'>
+                  <File Id='curl.exe_debug' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
new file mode 100644
index 0000000..2dc293c
--- /dev/null
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -0,0 +1,62 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define FastCGIVersion='2.4.0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <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>
+              <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>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
new file mode 100644
index 0000000..fa6922d
--- /dev/null
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -0,0 +1,69 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define LogForShibVersion='1.0.5' ?>
+<?define LogForShibFileVersion='1_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib'
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>
+              </Component>
+              <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>
+                </Component>
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
new file mode 100644
index 0000000..777eee2
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -0,0 +1,90 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment>
+    <DirectoryRef Id='share_xml_opensaml'
+                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >
+      <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}'>
+        <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
+      </Component>
+      <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>
+        <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
+      </Component>
+      <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>
+        <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
+      </Component>
+      <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >
+        <File Name='saml10-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
+        <File Name='saml11-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
+        <File Name='saml20-catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+
+        <File Name='saml-schema-assertion-2.0.xsd'/>
+        <File Name='saml-schema-authn-context-2.0.xsd'/>
+        <File Id='a_c_auth_telephony2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>
+        <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>
+        <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>
+        <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>
+        <File Id='a_c_mobileonefactorreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>
+        <File Id='a_c_mobileonefactorunreg2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>
+        <File Id='a_c_mobiletwofactorreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>
+        <File Id='a_c_mobiletwofactorunreg2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>
+        <File Id='a_c_nomadtelephony2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />
+        <File Id='a_c_personaltelephony2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>
+        <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>
+        <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>
+        <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>
+        <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>
+        <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>
+        <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>
+        <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>
+        <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>
+        <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>
+        <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>
+        <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>
+        <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>
+        <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>
+        <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>
+        <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>
+
+        <File Name='saml-schema-dce-2.0.xsd'/>
+        <File Name='saml-schema-ecp-2.0.xsd'/>
+        <File Name='saml-schema-metadata-2.0.xsd'/>
+        <File Name='saml-schema-protocol-2.0.xsd'/>
+        <File Name='saml-schema-x500-2.0.xsd'/>
+        <File Name='saml-schema-xacml-2.0.xsd'/>
+
+        <File Name='sstc-metadata-attr.xsd'/>
+        <File Name='sstc-request-initiation.xsd'/>
+        <File Name='sstc-saml1x-metadata.xsd'/>
+        <File Name='sstc-saml-attribute-ext.xsd'/>
+        <File Name='sstc-saml-delegation.xsd'/>
+        <File Name='sstc-saml-idp-discovery.xsd' />
+        <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>
+        <File Name='sstc-saml-metadata-ext-query.xsd'/>
+        <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>
+        <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
new file mode 100644
index 0000000..6bf80dd
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -0,0 +1,74 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSAMLVersion='2.4.3' ?> 
+<?define OpenSAMLFileVersion='2_4' ?>
+
+<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'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+
+              <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>
+                  <File KeyPath='yes'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
+                  <File Id='samlsign.exe_Debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='share' Name='share'>
+              <Directory Id='share_xml' Name='xml'>
+                <Directory Id='share_xml_opensaml' Name='opensaml' />
+              </Directory><!-- xml-->
+            </Directory><!-- share -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='schema_assertion_01'/>
+    <ComponentRef Id='schema_assertion_1_1'/>
+    <ComponentRef Id='schema_protocol_01'/>
+    <ComponentRef Id='schema_protocol_1_1'/>
+    <ComponentRef Id='samlschema' />
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
new file mode 100644
index 0000000..6e2a674
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -0,0 +1,78 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
+<?define OpenSSLDirVersion='1.0.0a' ?>
+<?define OpenSSLFileVersion='1_0_0' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>
+                  <File Id='libeay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>
+                  <File Id='ssleay32.dll_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
+                  <File Id='openssl.exe_debug'
+                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Directory Id='doc_shibboleth' Name='shibboleth'>
+                <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
+                  <File KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />
+                </Component>
+              </Directory><!-- doc_shibboleth-->
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>    
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
new file mode 100644
index 0000000..0e4c661
--- /dev/null
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -0,0 +1,58 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ShibbolethSPFileVersion='1_4' ?>
+<?define ShibbolethVersion='1.4.2' ?>
+
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' 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' 
+                       FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>
+              <Component Id="shibsplite.dll" Guid="{10475E33-434D-4805-B983-195092549BED}">
+                <File Name="shibsp-lite$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              </Component>
+              <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">
+                <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
+                <Component Id="shibspliteD.dll" Guid="{8E070220-2992-4D45-BF98-459022CD268F}">
+                  <File Name="shibsp-lite$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                </Component>
+                <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">
+                  <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
new file mode 100644
index 0000000..a4928d4
--- /dev/null
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -0,0 +1,55 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XercesVersion='3.1.1' ?>
+<?define XercesFileVersion='3_1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
+    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>
+                <File Id='xercesc.dll' KeyPath='yes'
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>
+                  <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><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
new file mode 100644
index 0000000..d8dfee5
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -0,0 +1,104 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XmlSecVersion='1.6.0' ?> <!-- 1.0.0a -->
+<?define XmlSecFileVersion='1_6' ?>
+
+<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'
+             Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <!-- GUID taken from 2.4.3 installer -->
+              <Component Id='xsec_1_4_0.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(var.XmlSecFileVersion).dll'/>
+              </Component>
+              <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe'/>
+              </Component>
+              <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe'/>
+              </Component>
+              <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe'/>
+              </Component>
+              <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe'/>
+              </Component>
+              <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe'/>
+              </Component>
+              <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xsec_1_4_0D.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>
+                  <File KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(var.XmlSecFileVersion)D.dll'/>
+                </Component>
+                <Component Id='c14n.exe2' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
+                  <File Id='c14n.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe'/>
+                </Component>
+                <Component Id='checksig.exe6' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
+                  <File Id='checksig.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe'/>
+                </Component>
+                <Component Id='cipher.exe4' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
+                  <File Id='cipher.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe'/>
+                </Component>
+                <Component Id='siginf.exe5' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
+                  <File Id='siginf.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe'/>
+                </Component>
+                <Component Id='templatesign.exe3' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
+                  <File Id='templatesign.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe'/>
+                </Component>
+                <Component Id='txfmout.exe1' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
+                  <File Id='txfmout.exe_debug' KeyPath='yes'
+                        Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\txfmout.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix> 
+
+  
diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
new file mode 100644
index 0000000..5cb1e28
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -0,0 +1,36 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment>
+    <DirectoryRef Id='share_xml_xmltooling'
+                  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'  />
+        <File Name='soap-envelope.xsd'  />
+        <File Name='xml.xsd'  />
+        <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>
+    </DirectoryRef>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
new file mode 100644
index 0000000..add03b7
--- /dev/null
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -0,0 +1,67 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define XmlToolingVersion='1.4.2' ?> 
+<?define XmlToolingFileVersion='1_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>
+    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'
+             Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
+
+    <!-- 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  -->
+
+    <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'>
+              <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>
+                <File Id='xmltooling.dll'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>
+                <File Id='xmltoolinglite.dll'
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>
+                  <File Id='xmltoolingD.dll'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>
+                  <File Id='xmltoolingliteD.dll'
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='share' Name='share'>
+              <Directory Id='share_xml' Name='xml'>
+                <Directory Id='share_xml_xmltooling' Name='xmltooling' />
+              </Directory><!-- xml-->
+            </Directory><!-- share -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFiles -->
+    </Directory><!-- TARGETDIR -->
+    <ComponentRef Id='xmltoolingschema'/>
+  </Module>
+</Wix>
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
new file mode 100644
index 0000000..3f62a2a
--- /dev/null
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -0,0 +1,51 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ZlibVersion='1.2.5' ?>
+<?define ZlibFileVersion='1' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
+    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' 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'>
+              <Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>
+                <File KeyPath='yes'
+                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>
+                  <File Id='zlib1d.dll' KeyPath='yes' 
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
new file mode 100644
index 0000000..d16228e
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -0,0 +1,170 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define ShibbolethSPFileVersion='1_4' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer
+       -->
+  <Fragment>
+    <!-- Configuration, licenses and documentation -->
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='bin' Name='bin' 
+                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+        <Component Id="resolvertest.exe" Guid="{D381B6FA-2971-457B-804E-F08DD517866F}">
+          <File Name="resolvertest.exe" KeyPath="yes" />
+        </Component>
+        <Component Id="mdquery.exe" Guid="{AA3655D7-D498-4FEE-A1C4-437C82AA1C2A}">
+          <File Name="mdquery.exe" KeyPath="yes" />
+        </Component>
+        <Directory Id='bin_debug' Name='debug' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+          <Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">
+            <File Name="resolvertest.exe" Id="resolvertest.exe_debug" KeyPath="yes"/>
+          </Component>
+          <Component Id="mdquery.exe_debug" Guid="{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}">
+            <File Name="mdquery.exe" Id="mdquery.exe_debug" KeyPath="yes" />
+          </Component>
+        </Directory><!-- bin_debug -->
+      </Directory><!-- bin -->
+
+      <Directory Id='lib' Name='lib' 
+                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+        <Directory Id='lib_shibboleth' Name='shibboleth' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+          <Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">
+            <File Name="adfs.so" KeyPath="yes" />
+          </Component>
+          <Component Id="adfslite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">
+            <File Name="adfs-lite.so" KeyPath="yes" />
+          </Component>
+          <Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">
+            <File Name="isapi_shib.dll" KeyPath="yes" />
+          </Component>
+          <Component Id="mod_shib_13.so" Guid="{5C85940B-7644-4AA4-9948-9EFFC1729EFB}">
+            <File Name="mod_shib_13.so" KeyPath="yes" />
+          </Component>
+          <Component Id="mod_shib_20.so" Guid="{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}">
+            <File Name="mod_shib_20.so" KeyPath="yes" />
+          </Component>
+          <Component Id="mod_shib_22.so" Guid="{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}">
+            <File Name="mod_shib_22.so" KeyPath="yes" />
+          </Component>
+          <Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">
+            <File Name="nsapi_shib.dll" KeyPath="yes" />
+          </Component>
+          <Component Id="odbcstore.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">
+            <File Name="odbc-store.so" KeyPath="yes" />
+          </Component>
+          <Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">
+            <File Name="shibauthorizer.exe" KeyPath="yes" />
+          </Component>
+          <Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">
+            <File Name="shibresponder.exe" KeyPath="yes" />
+          </Component>
+          <Directory Id='lib_shibboleth_debug' Name='debug' 
+                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
+            <Component Id="adfsD.so" Guid="{9B8E071F-B251-4373-A786-8966FD0D22EF}">
+              <File Id="adfsD.so" Name="adfs.so" KeyPath="yes" />
+            </Component>
+            <Component Id="adfsliteD.so" Guid="{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}">
+              <File Id="adfs_liteD.so" Name="adfs-lite.so" KeyPath="yes" />
+            </Component>
+            <Component Id="isapi_shibD.dll" Guid="{F8212D30-0BA8-4F02-B595-E8E5D312342B}">
+              <File Id="isapi_shibD.dll" Name="isapi_shib.dll" KeyPath="yes" />
+            </Component>
+            <Component Id="mod_shib_13D.so" Guid="{E8B798AB-D772-428D-8033-2A77CB437CF0}">
+              <File Id="mod_shib_13D.so" Name="mod_shib_13.so" KeyPath="yes" />
+            </Component>
+            <Component Id="mod_shib_20D.so" Guid="{468806BF-6924-47D5-B319-608C2D63FDDC}">
+              <File Id="mod_shib_20D.so" Name="mod_shib_20.so" KeyPath="yes" />
+            </Component>
+            <Component Id="mod_shib_22D.so" Guid="{3DA4492F-C0EA-4286-9C37-13F82342FA67}">
+              <File Id="mod_shib_22D.so" Name="mod_shib_22.so" KeyPath="yes" />
+            </Component>
+            <Component Id="nsapi_shibD.dll" Guid="{492A5D72-4FE0-417E-9023-311E1BF34816}">
+              <File Id="nsapi_shibD.dll" Name="nsapi_shib.dll" KeyPath="yes" />
+            </Component>
+            <Component Id="odbcstoreD.so" Guid="{F217D7CF-91C1-4318-901D-709C710803C6}">
+              <File Id="odbc_storeD.so" Name="odbc-store.so" KeyPath="yes" />
+            </Component>
+            <Component Id="shibauthorizerD.exe" Guid="{83360639-DDC0-4B76-8168-21FB77EE6CD6}">
+              <File Id="shibauthorizer.exe_Debug" Name="shibauthorizer.exe" KeyPath="yes" />
+            </Component>
+            <Component Id="shibresponderD.exe" Guid="{760124EA-67E5-4393-B3DF-657DCC92F04C}">
+              <File Id="shibresponder.exe_Debug" Name="shibresponder.exe" KeyPath="yes" />
+            </Component>
+          </Directory><!-- lib_shibboleth_debug -->
+        </Directory><!-- lib_shibboleth -->
+      </Directory><!-- lib -->
+      <!-- the service bin -->
+      <Directory Id='sbin' Name='sbin'
+                 FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >
+        <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}">
+          <File Name="shibd.exe" KeyPath="yes" />
+        </Component>
+        <Directory Id="sbin_debug" Name="debug"
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >
+          <Component Id="shibdD.exe" Guid="{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}">
+            <File Id="shibd.exe_debug" Name="shibd.exe" KeyPath="yes" />
+          </Component>
+        </Directory><!-- sbin_debug -->
+      </Directory><!-- sbin -->
+    </DirectoryRef><!-- INSTALLDIR -->
+
+    <!-- Components
+
+         <ComponentRef Id='resolvertest.exe'/>
+         <ComponentRef Id='mdquery.exe'/>
+         <ComponentRef Id='resolvertest.exe_debug'/>
+         <ComponentRef Id='mdquery.exe_debug'/>
+
+         <ComponentRef Id='shibsplite.dll'/>
+         <ComponentRef Id='shibsp.dll'/>
+         <ComponentRef Id='shibspliteD.dll'/>
+         <ComponentRef Id='shibspD.dll'/>
+
+         <ComponentRef Id='adfs.so'/>
+         <ComponentRef Id='adfslite.so'/>
+         <ComponentRef Id='isapi_shib.dll'/>
+         <ComponentRef Id='mod_shib_13.so'/>
+         <ComponentRef Id='mod_shib_20.so'/>
+         <ComponentRef Id='mod_shib_22.so'/>
+         <ComponentRef Id='nsapi_shib.dll'/>
+         <ComponentRef Id='odbcstore.so'/>
+         <ComponentRef Id='shibauthorizer.exe'/>
+         <ComponentRef Id='shibresponder.exe'/>
+
+         <ComponentRef Id='adfsD.so'/>
+         <ComponentRef Id='adfsliteD.so'/>
+         <ComponentRef Id='isapi_shibD.dll'/>
+         <ComponentRef Id='mod_shib_13D.so'/>
+         <ComponentRef Id='mod_shib_20D.so'/>
+         <ComponentRef Id='mod_shib_22D.so'/>
+         <ComponentRef Id='nsapi_shibD.dll'/>
+         <ComponentRef Id='odbcstoreD.so'/>
+         <ComponentRef Id='shibauthorizerD.exe'/>
+         <ComponentRef Id='shibresponderD.exe'/>
+
+         <ComponentRef Id='shibd.exe'/>
+         <ComponentRef Id='shibdD.exe'/>
+         -->
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
new file mode 100644
index 0000000..33a23c8
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -0,0 +1,245 @@
+<?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.  -->
+
+<?define BuildDirectory='G:\Downloads\shib\' ?>
+<?define OpenSSLDirVersion='1.0.0a' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all the architecture neutral bits of the
+       Shibboleth install.  It turns out that it may not be all the
+       architecture insenstive stuff since some GUIDS may have moved
+       -->
+  <Fragment>
+    <!-- Files First -->
+    <!-- Configuration, licenses and documentation -->
+
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='doc' Name='doc' >
+        <Directory Id='doc_shibboleth' Name='shibboleth' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc' >
+          <Component Id='doc_shibboleth' Guid='{8239E994-8295-4E26-8708-DDF240B486BF}'>
+            <File Name='main.css' KeyPath='yes'/>
+            <File Name='logo.jpg' />
+            <File Name='CREDITS.txt' />
+            <File Name='LICENSE.txt' />
+            <File Name='NOTICE.txt' />
+            <File Name='README.txt'/>
+            <File Name='RELEASE.txt' />
+          </Component>
+        </Directory><!-- doc_shibboleth -->
+      </Directory><!-- doc -->
+      <Directory Id='etc' Name='etc' >
+        <Directory Id='etc_shibboleth' Name='shibboleth' 
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >
+          <Component Id='etc_shibboleth_perm' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>
+            <File KeyPath='yes' 
+                  Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />
+            <File Name='upgrade.xsl' />
+            <File Name='example-metadata.xml' />
+            <File Name='example-shibboleth2.xml' />
+          </Component>
+          <Component Id='etc_shibboleth_nonperm' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
+            <File Name='keygen.bat' KeyPath='yes' />
+            <File Name='xsltproc.js' />
+          </Component>
+          <Directory Id='etc_shibboleth_dist' Name='dist' 
+                     FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >
+            <Component Id='dist_noperm' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>
+              <!-- Note that the dir creation here is an accident caused by the inhertited Installer -->
+              <CreateFolder Directory='var_run_shibboleth' />
+              <File Name='apache22.config.in' KeyPath='yes' />
+              <File Name='sslError.html' />
+              <File Name='bindingTemplate.html' />
+              <File Name='globalLogout.html' />
+              <File Name='localLogout.html' />
+              <File Name='attribute-map.xml' />
+              <File Name='attribute-policy.xml'/>
+              <File Name='shibboleth2.xml' />
+              <File Name='console.logger' />
+              <File Name='discoveryTemplate.html' />
+              <File Name='postTemplate.html' />
+              <File Name='partialLogout.html' />
+              <File Name='protocols.xml' />
+              <File Name='security-policy.xml' />
+            </Component>
+            <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}' Permanent='yes'>
+              <File Name='accessError.html' />
+            </Component>
+            <Component Id='apache.config' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}' Permanent='yes'>
+              <File Name='apache.config.in' />
+            </Component>
+            <Component Id='apache2.config' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}' Permanent='yes'>
+              <File Name='apache2.config.in' KeyPath='yes' />
+            </Component>
+            <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}' Permanent='yes'>
+              <File  Name='metadataError.html' KeyPath='yes' />
+            </Component>
+            <Component Id='native.logger' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}' Permanent='yes'>
+              <File Name='native.logger.in' KeyPath='yes' />
+            </Component>
+            <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}' Permanent='yes'>
+              <File Name='sessionError.html' KeyPath='yes' />
+            </Component>
+            <Component Id='shibd.logger' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}' Permanent='yes'>
+              <File Name='shibd.logger.in' KeyPath='yes' />
+            </Component>
+          </Directory><!-- etc_shibboleth_dist -->
+        </Directory><!-- etc_shibboleth -->
+      </Directory><!-- etc_dist -->
+      <Directory Id='var' Name='var'>
+        <Directory Id='var_log' Name='log'>
+          <Directory Id='var_log_shibboleth' Name='shibboleth'>
+            <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}' KeyPath='yes'>
+              <CreateFolder />
+            </Component>
+          </Directory><!-- var_log_shibboleth -->
+        </Directory><!-- var_log -->
+        <Directory Id='var_run' Name='run'>
+          <Directory Id='var_run_shibboleth' Name='shibboleth' />
+        </Directory><!-- var_run -->
+      </Directory><!-- var -->
+    </DirectoryRef>
+    <!-- Schemas -->
+    <DirectoryRef Id='SHARE_DIR'><!-- \opt\shibboleth-sp\share -->
+      <Directory Id='share_xml' Name='xml'>
+        <Directory Id='share_xml_shibboleth' Name='shibboleth'
+                   FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
+          <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>
+            <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
+            <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
+            <File Name='shibboleth-2.0-attribute-map.xsd' />
+            <File Name='shibboleth-2.0-afp.xsd' />
+            <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
+            <File Name='WS-Trust.xsd' />
+            <File Name='shibboleth-2.0-sp-notify.xsd' />
+            <File Name='shibboleth-2.0-native-sp-config.xsd' />
+            <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
+            <File Name='shibboleth-2.0-native-sp-protocols.xsd' />
+          </Component>
+          <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>
+            <File Name='shibboleth.xsd' KeyPath='yes' />
+          </Component>
+        </Directory><!-- share_xml_shibboleth -->
+      </Directory><!-- share_xml -->
+    </DirectoryRef><!-- share -->
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>
+      <!-- 32 bit -->
+      <RegistrySearch Id='SP2_2_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='AppReg2' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' 
+                      Name='DisplayName' Type='raw' />
+      <RegistrySearch Id='AppReg1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
+                      Name='DisplayVersion' Type='raw' />
+
+      <!-- 64 bit 
+      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' 
+                      Name='DisplayName' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' /> -->
+    </Property>
+
+    <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />
+
+    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
+    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
+    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
+
+    <!-- The actions to perform after the files have been copied -->
+    <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs' />
+    <CustomAction Id='EditConfigFiles' 
+                  BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT]' />
+    <InstallExecuteSequence>
+      <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+    <!-- Components
+
+         <ComponentRef Id='doc_shibboleth'/>
+         <ComponentRef Id='etc_shibboleth_perm'/>
+         <ComponentRef Id='etc_shibboleth_nonperm'/>
+         <ComponentRef Id='dist_noperm'/>
+         <ComponentRef Id='accessError.html'/>
+         <ComponentRef Id='apache.config'/>
+         <ComponentRef Id='apache2.config'/>
+         <ComponentRef Id='metadataError.html'/>
+         <ComponentRef Id='native.logger'/>
+         <ComponentRef Id='sessionError.html'/>
+         <ComponentRef Id='shibd.logger'/>
+         <ComponentRef Id='var_log_shibboleth_folder'/>
+         <ComponentRef Id='share_xml_shibboleth'/>
+         <ComponentRef Id='share_xml_shibboleth_xsd'/>
+         -->
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/testInstall.wxs b/msi/WiX/testInstall.wxs
new file mode 100644
index 0000000..d0b22ed
--- /dev/null
+++ b/msi/WiX/testInstall.wxs
@@ -0,0 +1,117 @@
+<?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.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033'
+           Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>
+    <Package Description='TEST Windows Installer package'
+             Comments='Ignore Ignore Ignore Ignore'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Compressed='yes' />
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <!-- The test bit -->
+      <Directory Id='Opt' Name='opt'>
+        <Directory Id='INSTALLDIR' Name='shibboleth-sp'>
+          <Component Id='MyComponent' Guid='74DBAA41-4C46-4944-80F6-27F925991CB2'>
+            <File Source='FileCounts.txt' />
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+        <!-- The merge modules -->
+        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
+        <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />
+        <!-- the schema -->
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='SHARE_DIR' Name='Share'/>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+    <!-- Feature -->
+    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>
+      <ComponentRef Id='MyComponent' />
+      <ComponentRef Id='doc_shibboleth'/>
+      <ComponentRef Id='etc_shibboleth_perm'/>
+      <ComponentRef Id='etc_shibboleth_nonperm'/>
+      <ComponentRef Id='dist_noperm'/>
+      <ComponentRef Id='accessError.html'/>
+      <ComponentRef Id='apache.config'/>
+      <ComponentRef Id='apache2.config'/>
+      <ComponentRef Id='metadataError.html'/>
+      <ComponentRef Id='native.logger'/>
+      <ComponentRef Id='sessionError.html'/>
+      <ComponentRef Id='shibd.logger'/>
+      <ComponentRef Id='var_log_shibboleth_folder'/>
+      <ComponentRef Id='share_xml_shibboleth'/>
+      <ComponentRef Id='share_xml_shibboleth_xsd'/>
+      <!--exe's -->
+      <ComponentRef Id='resolvertest.exe'/>
+      <ComponentRef Id='mdquery.exe'/>
+      <ComponentRef Id='resolvertest.exe_debug'/>
+      <ComponentRef Id='mdquery.exe_debug'/>
+      <!-- plugins  -->
+      <ComponentRef Id='adfs.so'/>
+      <ComponentRef Id='adfslite.so'/>
+      <ComponentRef Id='isapi_shib.dll'/>
+      <ComponentRef Id='mod_shib_13.so'/>
+      <ComponentRef Id='mod_shib_20.so'/>
+      <ComponentRef Id='mod_shib_22.so'/>
+      <ComponentRef Id='nsapi_shib.dll'/>
+      <ComponentRef Id='odbcstore.so'/>
+      <ComponentRef Id='shibauthorizer.exe'/>
+      <ComponentRef Id='shibresponder.exe'/>
+      <!-- debug plugins -->
+      <ComponentRef Id='adfsD.so'/>
+      <ComponentRef Id='adfsliteD.so'/>
+      <ComponentRef Id='isapi_shibD.dll'/>
+      <ComponentRef Id='mod_shib_13D.so'/>
+      <ComponentRef Id='mod_shib_20D.so'/>
+      <ComponentRef Id='mod_shib_22D.so'/>
+      <ComponentRef Id='nsapi_shibD.dll'/>
+      <ComponentRef Id='odbcstoreD.so'/>
+      <ComponentRef Id='shibauthorizerD.exe'/>
+      <ComponentRef Id='shibresponderD.exe'/>
+      <!-- the service -->
+      <ComponentRef Id='shibd.exe'/>
+      <ComponentRef Id='shibdD.exe'/>
+      <!-- The merge modules -->
+      <MergeRef Id='CurlMergeModule_x86' />
+      <MergeRef Id='FastCGIMergeModule_x86' />
+      <MergeRef Id='OpenSAMLMergeModule_x86' />
+      <MergeRef Id='OpenSSLMergeModule_x86' />
+      <MergeRef Id='Log4ShibMergeModule_x86' />
+      <MergeRef Id='ShibbolethMergeModule_x86' />
+      <MergeRef Id='ZlibMergeModule_x86' />
+      <MergeRef Id='XercesMergeModule_x86' />
+      <MergeRef Id='XmlSecMergeModule_x86' />
+      <MergeRef Id='XmlToolingMergeModule_x86' />
+    </Feature>
+  </Product>
+</Wix>
-- 
2.1.4