[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-defs-x86.wxi ShibbolethSP-main-x64.wxs ShibbolethSP-noarch.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Tue May  8 17:17:10 2012
New Revision: 3650

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3650&view=rev
Log:
Split up more multifile components, this time the config files

Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi?rev=3650&r1=3649&r2=3650&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi Tue May  8 17:17:10 2012
@@ -2,10 +2,37 @@
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- ShibbolethSP-noarch -->
 
-  <ComponentRef Id='doc_shibboleth'/>
-  <ComponentRef Id='etc_shibboleth_perm'/>
+  <ComponentRef Id='main.css'/>
+  <ComponentRef Id='logo.jpg'/>
+  <ComponentRef Id='CREDITS.txt'/>
+  <ComponentRef Id='LICENSE.txt'/>
+  <ComponentRef Id='NOTICE.txt'/>
+  <ComponentRef Id='README.txt'/>
+  <ComponentRef Id='RELEASE.txt'/>
+
+  <ComponentRef Id='openssl.cnf'/>
+  <ComponentRef Id='upgrade.xsl'/>
+  <ComponentRef Id='examplemetadata.xml'/>
+  <ComponentRef Id='exampleshibboleth2.xml'/> 
+
   <ComponentRef Id='etc_shibboleth_nonperm'/>
+
   <ComponentRef Id='dist_noperm'/>
+  <ComponentRef Id='sslError.html'/>
+  <ComponentRef Id='xsltproc.js'/>
+  <ComponentRef Id='bindingTemplate.html'/>
+  <ComponentRef Id='globalLogout.html'/>
+  <ComponentRef Id='localLogout.html'/>
+  <ComponentRef Id='attributemap'/>
+  <ComponentRef Id='attributepolicy'/>
+  <ComponentRef Id='shibboleth2.xml'/>
+  <ComponentRef Id='console.logger'/>
+  <ComponentRef Id='discoveryTemplate.html'/>
+  <ComponentRef Id='postTemplate.html'/>
+  <ComponentRef Id='partialLogout.html'/>
+  <ComponentRef Id='protocols.xml'/>
+  <ComponentRef Id='securitypolicy.xml'/>
+
   <ComponentRef Id='accessError.html'/>
   <ComponentRef Id='apache.config'/>
   <ComponentRef Id='apache2.config'/>
@@ -14,8 +41,7 @@
   <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'/>
+  <ComponentRef Id='var_run_shibboleth_folder'/>
 
   <!-- ShibbolethSP-exe-x64-->
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3650&r1=3649&r2=3650&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Tue May  8 17:17:10 2012
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' 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'

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs?rev=3650&r1=3649&r2=3650&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Tue May  8 17:17:10 2012
@@ -1,20 +1,20 @@
 <?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
- 
+     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

[... 222 lines stripped ...]