[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: MergeModules/OpenSAML-schemas.wxi MergeModules/OpenSAML-schemas.wxs Merge...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  9 15:18:32 2012
New Revision: 3652

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3652&view=rev
Log:
Merge XMLTooling* into OpenSAML.  Shibboleth Merge modules now contains OpenSAML (and XMLTooling)

Added:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxi
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxi
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxi
Removed:
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x86.wxs
Modified:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/compile.bat
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs?rev=3652&r1=3651&r2=3652&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Wed May  9 15:18:32 2012
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- TODO roll in xmltooling, make subsidiary to Shib -->
 <!-- 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
@@ -29,201 +28,24 @@
       <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
         <Directory Id='Shibboleth' Name='Shibboleth' >
           <Directory Id='SP' Name='SP' >
-            <Directory Id='xml' Name='xml' >
-              <Directory Id='opensaml' Name='opensaml'
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >
-                <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
-                  <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />
-                </Component>
-                <Component Id='schema_assertion_1_1' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
-                  <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />
-                </Component>
-                <Component Id='schema_protocol_1_1' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
-                  <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />
-                </Component>
-                <Component Id='schema_protocol_01' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
-                  <File Name='cs-sstc-schema-protocol-1.1.xsd'/>
-                </Component>
-                <Component Id='samlschema01' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
-                  <File Name='saml10-catalog.xml' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />
-                </Component>
-                <Component Id='samlschema02' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
-                  <File Name='saml11-catalog.xml' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />
-                </Component>
-                <Component Id='samlschema03' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
-                  <File Name='saml20-catalog.xml' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />
-                </Component>
-                <Component Id='samlschema04' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
-                  <File Name='saml-schema-assertion-2.0.xsd'/>
-                </Component>
-                <Component Id='samlschema05' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
-                  <File Name='saml-schema-authn-context-2.0.xsd'/>
-                </Component>
-                <Component Id='samlschema06' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
-                  <File Id='a_c_auth_telephony2.0.xsd' 
-                        Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>
-                </Component>
-                <Component Id='samlschema07' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
-                  <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>
-                </Component>
-                <Component Id='samlschema08' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>

[... 566 lines stripped ...]