Merge XMLTooling* into OpenSAML. Shibboleth Merge modules now contains OpenSAML...
[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / OpenSAML-schemas.wxs
index 8791265..e37b6dd 100644 (file)
@@ -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
       <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