Merge XMLTooling* into OpenSAML. Shibboleth Merge modules now contains OpenSAML...

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxi b/msi/WiX/MergeModules/OpenSAML-schemas.wxi
new file mode 100644 (file)
index 0000000..53332f3
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxi
@@ -0,0 +1,234 @@
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+     Development, Inc. (UCAID) under one or more contributor license\r
+     agreements.  See the NOTICE file distributed with this work for\r
+     additional information regarding copyright ownership. The UCAID\r
+     licenses this file to You under the Apache License, Version 2.0\r
+     (the "License"); you may not use this file except in compliance\r
+     with the License.  You may obtain a copy of the License at\r
+     \r
+     http://www.apache.org/licenses/LICENSE-2.0\r
+     \r
+     Unless required by applicable law or agreed to in writing, software\r
+     distributed under the License is distributed on an "AS IS" BASIS,\r
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+     implied.  See the License for the specific language governing\r
+     permissions and limitations under the License.  -->\r
+\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <DirectoryRef Id='xml'>\r
+    <Directory Id='opensaml' Name='opensaml' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >\r
+      <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
+        <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
+      </Component>\r
+      <Component Id='schema_assertion_1_1' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>\r
+        <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
+      </Component>\r
+      <Component Id='schema_protocol_1_1' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>\r
+        <File Name='cs-sstc-schema-protocol-01.xsd' KeyPath='yes' />\r
+      </Component>\r
+      <Component Id='schema_protocol_01' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>\r
+        <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema01' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>\r
+        <File Name='saml10-catalog.xml' \r
+              Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
+      </Component>\r
+      <Component Id='samlschema02' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>\r
+        <File Name='saml11-catalog.xml' \r
+              Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
+      </Component>\r
+      <Component Id='samlschema03' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>\r
+        <File Name='saml20-catalog.xml' \r
+              Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
+      </Component>\r
+      <Component Id='samlschema04' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>\r
+        <File Name='saml-schema-assertion-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema05' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>\r
+        <File Name='saml-schema-authn-context-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema06' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>\r
+        <File Id='a_c_auth_telephony2.0.xsd' \r
+              Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema07' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>\r
+        <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema08' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>\r
+        <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema09' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>\r
+        <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema10' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>\r
+        <File Id='a_c_mobileonefactorreg2.0.xsd' \r
+              Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema11' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>\r
+        <File Id='a_c_mobileonefactorunreg2.0.xsd' \r
+              Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema12' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>\r
+        <File Id='a_c_mobiletwofactorreg2.0.xsd' \r
+              Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema13' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>\r
+        <File Id='a_c_mobiletwofactorunreg2.0.xsd' \r
+              Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema14' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>\r
+        <File Id='a_c_nomadtelephony2.0.xsd' \r
+              Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
+      </Component>\r
+      <Component Id='samlschema15' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>\r
+        <File Id='a_c_personaltelephony2.0.xsd' \r
+              Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema16' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>\r
+        <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema17' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>\r
+        <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema18' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>\r
+        <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema19' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>\r
+        <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema20' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>\r
+        <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1a' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>\r
+        <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1b' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>\r
+        <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1c' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>\r
+        <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1d' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>\r
+        <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1e' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>\r
+        <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1f' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>\r
+        <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1g' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>\r
+        <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1h' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>\r
+        <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1i' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>\r
+        <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1j' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>\r
+        <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
+      </Component>\r
+\r
+      <Component Id='samlschema1k' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>\r
+        <File Name='saml-schema-dce-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1l' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>\r
+        <File Name='saml-schema-ecp-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1m' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>\r
+        <File Name='saml-schema-metadata-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1n' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>\r
+        <File Name='saml-schema-protocol-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1o' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>\r
+        <File Name='saml-schema-x500-2.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1p' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>\r
+        <File Name='saml-schema-xacml-2.0.xsd'/>\r
+      </Component>\r
+\r
+      <Component Id='samlschema1q' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>\r
+        <File Name='sstc-metadata-attr.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1r' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>\r
+        <File Name='sstc-request-initiation.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1s' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>\r
+        <File Name='sstc-saml1x-metadata.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1t' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>\r
+        <File Name='sstc-saml-attribute-ext.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1u' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>\r
+        <File Name='sstc-saml-delegation.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1v' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>\r
+        <File Name='sstc-saml-idp-discovery.xsd' />\r
+      </Component>\r
+      <Component Id='samlschema1w' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>\r
+        <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1x' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>\r
+        <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1y' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>\r
+        <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
+      </Component>\r
+      <Component Id='samlschema1z' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>\r
+        <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
+      </Component>\r
+    </Directory><!--opensaml-->\r
+\r
+    <Directory Id='xmltooling' Name='xmltooling'\r
+               FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >\r
+      <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
+        <File Name='xenc-schema.xsd'/>\r
+      </Component>\r
+      <Component Id='xmldsigcoreschema.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>\r
+        <File Name='xmldsig-core-schema.xsd'/>\r
+      </Component>\r
+      <Component Id='soapenvelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>\r
+        <File Name='soap-envelope.xsd'  />\r
+      </Component>\r
+      <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>\r
+        <File Name='xml.xsd'  />\r
+      </Component>\r
+      <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>\r
+        <File Name='xmltooling.xsd'  />\r
+      </Component>\r
+      <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>\r
+        <File Id='XMLToolingcatalog' Name='catalog.xml' \r
+              Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'/>\r
+      </Component>\r
+      <Component Id='xmldsig11schema.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>\r
+        <File Name='xmldsig11-schema.xsd'/>\r
+      </Component>\r
+    </Directory><!--xmltooling-->\r
+  </DirectoryRef><!--xml-->\r
+\r
+  <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
+  <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+                Execute='deferred' Impersonate='no' />\r
+  <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10' \r
+                Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
+\r
+  <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+                Execute='deferred' Impersonate='no' />\r
+  <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11' \r
+                Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
+\r
+  <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+                Execute='deferred' Impersonate='no' />\r
+  <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20' \r
+                Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
+\r
+  <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+                Execute='deferred' Impersonate='no' />\r
+  <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog' \r
+                Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
+\r
+</Include>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 8791265..e37b6dd 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
 \r
-<!-- TODO roll in xmltooling, make subsidiary to Shib -->\r
 <!-- Licensed to the University Corporation for Advanced Internet\r
      Development, Inc. (UCAID) under one or more contributor license\r
      agreements.  See the NOTICE file distributed with this work for\r
@@ -29,201 +28,24 @@
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
         <Directory Id='Shibboleth' Name='Shibboleth' >\r
           <Directory Id='SP' Name='SP' >\r
-            <Directory Id='xml' Name='xml' >\r
-              <Directory Id='opensaml' Name='opensaml'\r
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >\r
-                <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
-                  <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
-                </Component>\r
-                <Component Id='schema_assertion_1_1' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>\r
-                  <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
-                </Component>\r
-                <Component Id='schema_protocol_1_1' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>\r
-                  <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />\r
-                </Component>\r
-                <Component Id='schema_protocol_01' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>\r
-                  <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema01' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>\r
-                  <File Name='saml10-catalog.xml' \r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='samlschema02' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>\r
-                  <File Name='saml11-catalog.xml' \r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='samlschema03' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>\r
-                  <File Name='saml20-catalog.xml' \r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='samlschema04' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>\r
-                  <File Name='saml-schema-assertion-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema05' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>\r
-                  <File Name='saml-schema-authn-context-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema06' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>\r
-                  <File Id='a_c_auth_telephony2.0.xsd' \r
-                        Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema07' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>\r
-                  <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema08' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>\r
-                  <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema09' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>\r
-                  <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema10' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>\r
-                  <File Id='a_c_mobileonefactorreg2.0.xsd' \r
-                        Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema11' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>\r
-                  <File Id='a_c_mobileonefactorunreg2.0.xsd' \r
-                        Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema12' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>\r
-                  <File Id='a_c_mobiletwofactorreg2.0.xsd' \r
-                        Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema13' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>\r
-                  <File Id='a_c_mobiletwofactorunreg2.0.xsd' \r
-                        Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema14' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>\r
-                  <File Id='a_c_nomadtelephony2.0.xsd' \r
-                        Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
-                </Component>\r
-                <Component Id='samlschema15' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>\r
-                  <File Id='a_c_personaltelephony2.0.xsd' \r
-                        Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema16' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>\r
-                  <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema17' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>\r
-                  <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema18' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>\r
-                  <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema19' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>\r
-                  <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema20' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>\r
-                  <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1a' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>\r
-                  <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1b' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>\r
-                  <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1c' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>\r
-                  <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1d' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>\r
-                  <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1e' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>\r
-                  <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1f' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>\r
-                  <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1g' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>\r
-                  <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1h' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>\r
-                  <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1i' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>\r
-                  <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1j' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>\r
-                  <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
-                </Component>\r
-\r
-                <Component Id='samlschema1k' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>\r
-                  <File Name='saml-schema-dce-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1l' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>\r
-                  <File Name='saml-schema-ecp-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1m' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>\r
-                  <File Name='saml-schema-metadata-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1n' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>\r
-                  <File Name='saml-schema-protocol-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1o' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>\r
-                  <File Name='saml-schema-x500-2.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1p' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>\r
-                  <File Name='saml-schema-xacml-2.0.xsd'/>\r
-                </Component>\r
-\r
-                <Component Id='samlschema1q' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>\r
-                  <File Name='sstc-metadata-attr.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1r' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>\r
-                  <File Name='sstc-request-initiation.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1s' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>\r
-                  <File Name='sstc-saml1x-metadata.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1t' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>\r
-                  <File Name='sstc-saml-attribute-ext.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1u' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>\r
-                  <File Name='sstc-saml-delegation.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1v' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>\r
-                  <File Name='sstc-saml-idp-discovery.xsd' />\r
-                </Component>\r
-                <Component Id='samlschema1w' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>\r
-                  <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1x' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>\r
-                  <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1y' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>\r
-                  <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
-                </Component>\r
-                <Component Id='samlschema1z' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>\r
-                  <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
-                </Component>\r
-              </Directory><!--opensaml-->\r
-            </Directory><!--xml-->\r
+            <Directory Id='xml' Name='xml' />\r
           </Directory><!--SP-->\r
         </Directory><!--Shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
     </Directory><!--TargetDir-->\r
 \r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditCatalog10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog10' Property='EditCatalog10' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
-\r
-    <CustomAction Id='EditCatalog11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog11' Property='EditCatalog11' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
-\r
-    <CustomAction Id='EditCatalog20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog20' Property='EditCatalog20' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
+    <?include OpenSAML-schemas.wxi ?>\r
 \r
     <InstallExecuteSequence>\r
-      <Custom Action='SetEditCatalog10' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog10' After='InstallFiles'>NOT Installed</Custom>\r
-      <Custom Action='SetEditCatalog11' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog11' After='InstallFiles'>NOT Installed</Custom>\r
-      <Custom Action='SetEditCatalog20' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog20' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
+\r
+      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>\r
     </InstallExecuteSequence>\r
 \r
   </Module>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxi b/msi/WiX/MergeModules/OpenSAML-x64.wxi
new file mode 100644 (file)
index 0000000..8334d02
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxi
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='UTF-8'?>\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+     Development, Inc. (UCAID) under one or more contributor license\r
+     agreements.  See the NOTICE file distributed with this work for\r
+     additional information regarding copyright ownership. The UCAID\r
+     licenses this file to You under the Apache License, Version 2.0\r
+     (the "License"); you may not use this file except in compliance\r
+     with the License.  You may obtain a copy of the License at\r
+     \r
+     http://www.apache.org/licenses/LICENSE-2.0\r
+     \r
+     Unless required by applicable law or agreed to in writing, software\r
+     distributed under the License is distributed on an "AS IS" BASIS,\r
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+     implied.  See the License for the specific language governing\r
+     permissions and limitations under the License.  -->\r
+\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Release\' >\r
+    <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
+      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
+    </Component>\r
+    <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
+      <File KeyPath='yes' Name='samlsign.exe' />\r
+    </Component>\r
+  </DirectoryRef>\r
+  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Release\' >\r
+    <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
+      <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
+    </Component>\r
+    <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
+      <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib-->\r
+  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>\r
+    <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
+      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+    </Component>\r
+    <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
+      <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib_debug-->\r
+  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Debug\'>\r
+    <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
+      <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+    </Component>\r
+    <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
+      <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib_debug-->\r
+\r
+  <DirectoryRef Id='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
+    <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
+      <File Name='CREDITS.txt' KeyPath='yes'/>\r
+      <File Name='LICENSE.txt' />\r
+      <File Name='NOTICE.txt' />\r
+      <File Name='README.txt'/>\r
+      <File Name='RELEASE.txt' />\r
+    </Component>\r
+  </DirectoryRef><!-- doc -->\r
+\r
+</Include>\r
+\r
+    \r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index cbf5887..e81c32c 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
-<!-- TODO roll in xmltooling, make subsidiary to Shib Ad documentation -->\r
+\r
 <!-- Licensed to the University Corporation for Advanced Internet\r
    Development, Inc. (UCAID) under one or more contributor license\r
    agreements.  See the NOTICE file distributed with this work for\r
@@ -28,26 +28,17 @@
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Release\' >\r
-              <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
-                <File KeyPath='yes' Name='samlsign.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>\r
-                <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
-                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
+            <Directory Id='lib' Name='lib'>\r
+              <Directory Id='lib_debug' Name='debug' />\r
+            </Directory><!--lib-->\r
+            <Directory Id='doc' Name='doc' />\r
+          </Directory><!--shibboleth_SP-->\r
+        </Directory><!--shibboleth-->\r
+      </Directory><!--ProgramFiles64Folder-->\r
+    </Directory>\r
+\r
+    <?include OpenSAML-x64.wxi ?>\r
+\r
   </Module>\r
 </Wix>\r
 \r

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxi b/msi/WiX/MergeModules/OpenSAML-x86.wxi
new file mode 100644 (file)
index 0000000..90544ae
--- /dev/null
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxi
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+   Development, Inc. (UCAID) under one or more contributor license\r
+   agreements.  See the NOTICE file distributed with this work for\r
+   additional information regarding copyright ownership. The UCAID\r
+   licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance\r
+   with the License.  You may obtain a copy of the License at\r
+ \r
+     http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+   implied.  See the License for the specific language governing\r
+   permissions and limitations under the License.  -->\r
+\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>\r
+    <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
+      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
+    </Component>\r
+    <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
+      <File KeyPath='yes' Name='samlsign.exe' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib -->\r
+  <DirectoryRef Id='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release'>\r
+    <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
+      <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
+    </Component>\r
+    <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
+      <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib -->\r
+  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>\r
+    <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
+      <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+    </Component>\r
+    <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
+      <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib_debug-->\r
+  <DirectoryRef Id='lib_debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>\r
+    <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
+      <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+    </Component>\r
+    <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
+      <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+    </Component>\r
+  </DirectoryRef><!-- lib_debug-->\r
+  <DirectoryRef Id='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
+    <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
+      <File Name='CREDITS.txt' KeyPath='yes'/>\r
+      <File Name='LICENSE.txt' />\r
+      <File Name='NOTICE.txt' />\r
+      <File Name='README.txt'/>\r
+      <File Name='RELEASE.txt' />\r
+    </Component>\r
+  </DirectoryRef><!-- doc -->\r
+</Include>\r
+\r
+    \r

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index f44c829..8d07820 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
-<!-- TODO roll in xmltooling make subsidiary to Shib -->\r
 \r
 <!-- Licensed to the University Corporation for Advanced Internet\r
    Development, Inc. (UCAID) under one or more contributor license\r
@@ -29,26 +28,15 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>\r
-              <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
-                <File KeyPath='yes' Name='samlsign.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>\r
-                <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
-                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
+            <Directory Id='lib' Name='lib'>\r
+              <Directory Id='lib_debug' Name='debug'/>\r
             </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc' />\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r
+    <?include OpenSAML-x86.wxi ?>\r
   </Module>\r
 </Wix>\r
 \r

diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 16fd092..18d2833 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -34,7 +34,7 @@
                   <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
                 </Component>\r
                 <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>\r
-                  <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
+                  <File Id='ShibbolethCatalog' Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
                 </Component>\r
                 <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
                   <File Name='shibboleth-2.0-attribute-map.xsd' />\r
@@ -70,15 +70,27 @@
       </Directory><!--CommonAppDataFolder-->\r
     </Directory><!--TargetDir-->\r
 \r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+    <?include OpenSAML-schemas.wxi ?>\r
+\r
+    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
                   Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog' Property='EditCatalog' \r
+    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
                   Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
 \r
+\r
     <InstallExecuteSequence>\r
-      <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
+\r
+      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>\r
+\r
+      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r
     </InstallExecuteSequence>\r
 \r
 \r

diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index dac7a92..76e49a4 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -45,19 +45,14 @@
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
-              <Component Id='doc_shibboleth' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
-                <File Name='CREDITS.txt' KeyPath='yes'/>\r
-                <File Name='LICENSE.txt' />\r
-                <File Name='NOTICE.txt' />\r
-                <File Name='README.txt'/>\r
-                <File Name='RELEASE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
+            <Directory Id='doc' Name='doc' />\r
           </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
+      </Directory><!-- ProgramFiles64Folder -->\r
     </Directory><!-- TARGETDIR -->\r
+\r
+    <?include OpenSAML-x64.wxi ?>\r
+\r
   </Module>\r
 </Wix>\r
 \r

diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 0686e95..05af6f5 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -45,18 +45,12 @@
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
-              <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
-                <File Name='CREDITS.txt' KeyPath='yes'/>\r
-                <File Name='LICENSE.txt' />\r
-                <File Name='NOTICE.txt' />\r
-                <File Name='README.txt'/>\r
-                <File Name='RELEASE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->          </Directory><!-- shibboleth_sp -->\r
+            <Directory Id='doc' Name='doc'/>\r
+          </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r
+    <?include OpenSAML-x86.wxi ?>\r
   </Module>\r
 </Wix>\r
 \r

diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
deleted file mode 100644 (file)
index d73a289..0000000
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlTooling_schemas' Language='1033' Version='$(var.XmlToolingVersion)'>\r
-    <Package Id='{6C74499B-E2BD-4705-A619-8901A6745D8C}' Description='Merge Module for XmlTooling schemas'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
-        <Directory Id='Shibboleth' Name='Shibboleth' >\r
-          <Directory Id='SP' Name='SP' >\r
-            <Directory Id='xml' Name='xml' >\r
-              <Directory Id='xmltooling' Name='xmltooling'\r
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >\r
-                <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
-                  <File Name='xenc-schema.xsd'/>\r
-                </Component>\r
-                <Component Id='xmldsigcoreschema.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>\r
-                  <File Name='xmldsig-core-schema.xsd'/>\r
-                </Component>\r
-                <Component Id='soapenvelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>\r
-                  <File Name='soap-envelope.xsd'  />\r
-                </Component>\r
-                <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>\r
-                  <File Name='xml.xsd'  />\r
-                </Component>\r
-                <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>\r
-                  <File Name='xmltooling.xsd'  />\r
-                </Component>\r
-                <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>\r
-                <File Name='catalog.xml' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'/>\r
-                </Component>\r
-                <Component Id='xmldsig11schema.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>\r
-                  <File Name='xmldsig11-schema.xsd'/>\r
-                </Component>\r
-              </Directory><!--xmltooling-->\r
-            </Directory><!--xml-->\r
-          </Directory><!--SP-->\r
-        </Directory><!--Shibboleth-->\r
-      </Directory><!--CommonAppDataFolder-->\r
-    </Directory><!--TargetDir-->\r
-\r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog' Property='EditCatalog' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
-\r
-    <InstallExecuteSequence>\r
-      <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>\r
-    </InstallExecuteSequence>\r
-\r
-\r
-\r
-  </Module>\r
-</Wix>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x64.wxs b/msi/WiX/MergeModules/XmlTooling-x64.wxs
deleted file mode 100644 (file)
index cac2154..0000000
--- a/msi/WiX/MergeModules/XmlTooling-x64.wxs
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
- \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
- \r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlToolingMergeModule_x64' Language='1033' Version='$(var.XmlToolingVersion)'>\r
-    <Package Id='{F944F719-7138-484D-A5B3-753411741B40}' Description='Merge Module for XMLTooling (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  \r
-         At a a later date, we may chose to make this a placed module  -->\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Release'>\r
-              <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
-                <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
-                <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' \r
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\x64\Debug'>\r
-                <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
-                  <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
-                  <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFiles -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r

diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
deleted file mode 100644 (file)
index 43adf11..0000000
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
- \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
- \r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>\r
-    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release'>\r
-              <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
-                <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
-                <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' \r
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>\r
-                <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
-                  <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
-                  <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFiles -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r

diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index b83cf66..0211e87 100644 (file)
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -63,6 +63,11 @@ rem smoke  OpenSSL-x64.msm
  light  Shibboleth-x64.wixobj
  smoke  Shibboleth-x64.msm
 
+ wixcop -indent:2 Shibboleth-schemas.wxs
+ candle Shibboleth-schemas.wxs
+ light  Shibboleth-schemas.wixobj
+ smoke  Shibboleth-schemas.msm
+
  wixcop -indent:2  Xerces-x86.wxs
  candle Xerces-x86.wxs
  light  Xerces-x86.wixobj
@@ -83,23 +88,6 @@ rem smoke  OpenSSL-x64.msm
  light  XmlSec-x64.wixobj
  smoke  XmlSec-x64.msm
 
- wixcop -indent:2  XmlTooling-x86.wxs
- candle XmlTooling-x86.wxs
- wixcop -indent:2  XmlTooling-schemas.wxs
- candle XmlTooling-schemas.wxs
- light  XmlTooling-x86.wixobj 
- smoke  XmlTooling-x86.msm
-
- wixcop -indent:2  XmlTooling-schemas.wxs
- candle XmlTooling-schemas.wxs
- light  XmlTooling-schemas.wixobj
- smoke  XmlTooling-schemas.msm
-
- wixcop -indent:2  XmlTooling-x64.wxs
- candle XmlTooling-x64.wxs
- light  XmlTooling-x64.wixobj
- smoke  XmlTooling-x64.msm
-
  wixcop -indent:2  Zlib-x86.wxs
  candle Zlib-x86.wxs
  light  Zlib-x86.wixobj

diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index cdfd854..4cbdc0c 100644 (file)
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -116,11 +116,12 @@
                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
         <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>\r
           <File Name='shibd.exe' KeyPath='yes' />\r
+          <!-- TODO this should not happen on an upgrade (install/uninstall) -->\r
           <ServiceInstall Id='shibd' Name='shibd_Default' \r
                           DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' \r
                           Start='auto' ErrorControl='ignore' />\r
           <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall'  \r
-                          Remove='uninstall' Wait='yes' />\r
+                          Remove='uninstall' Start='install' Wait='yes' />\r
         </Component>\r
         <Directory Id='sbin_debug' Name='debug'\r
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 1164ceb..517618a 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -48,17 +48,11 @@
         <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />\r
         <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />\r
         <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' \r
-               SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />\r
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
         <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
         <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_schemas' Language='1033' \r
-               SourceFile='MergeModules\XmlTooling-schemas.msm' DiskId='1' />\r
         <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
 \r
         <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' \r
@@ -72,12 +66,9 @@
         <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />\r
         <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />\r
         <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />\r
-        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />\r
         <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />\r
         <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlTooling-x64.msm' DiskId='1' />\r
         <Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />\r
 \r
         <Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033' \r
@@ -105,15 +96,11 @@
       <MergeRef Id='CurlMergeModule_x86'/>\r
       <MergeRef Id='FastCGIMergeModule_x86'/>\r
       <MergeRef Id='Log4ShibMergeModule_x86'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_x86'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
       <MergeRef Id='OpenSSLMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_schemas'/>\r
       <MergeRef Id='XercesMergeModule_x86'/>\r
       <MergeRef Id='XmlSecMergeModule_x86'/>\r
-      <MergeRef Id='XmlToolingMergeModule_x86'/>\r
-      <MergeRef Id='XmlToolingMergeModule_schemas'/>\r
       <MergeRef Id='ZlibMergeModule_x86'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\r
@@ -122,12 +109,9 @@
       <MergeRef Id='CurlMergeModule_x64'/>\r
       <MergeRef Id='FastCGIMergeModule_x64'/>\r
       <MergeRef Id='Log4ShibMergeModule_x64'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_x64'/>\r
-      <MergeRef Id='OpenSSLMergeModule_x64'/>\r
       <MergeRef Id='ShibbolethMergeModule_x64'/>\r
       <MergeRef Id='XercesMergeModule_x64'/>\r
       <MergeRef Id='XmlSecMergeModule_x64'/>\r
-      <MergeRef Id='XmlToolingMergeModule_x64'/>\r
       <MergeRef Id='ZlibMergeModule_x64'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>\r

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 8fa8f30..9e08c35 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -49,17 +49,11 @@
         <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />\r
         <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />\r
         <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' \r
-               SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />\r
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
         <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
         <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_schemas' Language='1033' \r
-               SourceFile='MergeModules\XmlTooling-schemas.msm' DiskId='1' />\r
         <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
 \r
         <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' \r
@@ -79,15 +73,11 @@
       <MergeRef Id='CurlMergeModule_x86'/>\r
       <MergeRef Id='FastCGIMergeModule_x86'/>\r
       <MergeRef Id='Log4ShibMergeModule_x86'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_x86'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
       <MergeRef Id='OpenSSLMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_schemas'/>\r
       <MergeRef Id='XercesMergeModule_x86'/>\r
       <MergeRef Id='XmlSecMergeModule_x86'/>\r
-      <MergeRef Id='XmlToolingMergeModule_x86'/>\r
-      <MergeRef Id='XmlToolingMergeModule_schemas'/>\r
       <MergeRef Id='ZlibMergeModule_x86'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\r

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 25c5997..0b158f9 100644 (file)
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -1,4 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+   Development, Inc. (UCAID) under one or more contributor license\r
+   agreements.  See the NOTICE file distributed with this work for\r
+   additional information regarding copyright ownership. The UCAID\r
+   licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance\r
+   with the License.  You may obtain a copy of the License at\r
+ \r
+     http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+   implied.  See the License for the specific language governing\r
+   permissions and limitations under the License.  -->\r
+\r
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <?define BuildDirectory='G:\Downloads\shib\' ?>\r
 \r