From 9f10b14ba77300a3be5a02949b6bdee3ae663229 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Tue, 29 May 2012 07:34:17 +0000
Subject: [PATCH] backout overeager commit of three files into R3682

---
 msi/WiX/ShibbolethSP-main-x64.wxs |  4 +---
 msi/WiX/ShibbolethSP-main-x86.wxs |  2 +-
 msi/WiX/Versions.wxi              | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 16e3de6..d54e803 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{0F65D86B-3F47-41DC-9CEC-E20538849A6C}' Language='1033' 
+  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
@@ -152,7 +152,6 @@
       <ComponentRef Id='mod_shib_2464.so'/>
       <ComponentRef Id='odbc_store64.so'/>
       <ComponentRef Id='plugins64.so'/>
-      <ComponentRef Id='plugins_lite64.so'/>
       <ComponentRef Id='shibauthorizer64.exe'/>
       <ComponentRef Id='shibresponder64.exe'/>
 
@@ -163,7 +162,6 @@
       <ComponentRef Id='mod_shib_2464.so_debug'/>
       <ComponentRef Id='odbc_store64.so_debug'/>
       <ComponentRef Id='plugins64.so_debug'/>
-      <ComponentRef Id='plugins_lite64.so_debug'/>
       <ComponentRef Id='shibauthorizer64.exe_debug'/>
       <ComponentRef Id='shibresponder64.exe_debug'/>
 
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 0148b82..d3fe0cc 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{DB1B7660-87DA-4B83-AF31-0449113298BD}' Language='1033' 
+  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 6fa2b09..238d9ba 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -17,11 +17,11 @@
    permissions and limitations under the License.  -->
 
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <?define BuildDirectory='g:\downloads\shib\' ?>
-  <?define SPBuildDirectory='g:\downloads\shib\cvs\2.0\' ?>
+  <?define BuildDirectory='C:\Users\scantor\Shibboleth\' ?>
+  <?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>
   
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethVersion='2.5.1'?>
+  <?define ShibbolethVersion='2.5.0'?>
   <!-- DO NOT CHANGE UpgradeCode -->
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>
 
@@ -33,7 +33,7 @@
 
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->
 
-  <?define OpenSAMLVersion='2.5.1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
+  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
   <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
   <?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->
@@ -47,10 +47,10 @@
   <?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.5.1' ?>
+  <?define XmlToolingVersion='1.5.0' ?>
   <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
   <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->
-- 
2.1.4