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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep  6 17:05:07 2012
New Revision: 3763

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3763&view=rev
Log:
Final? fixes for SSPCPP-498

Modified:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
    branches/REL_2/msi/scripts/shib_edit_catalog.vbs

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=3763&r1=3762&r2=3763&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Thu Sep  6 17:05:07 2012
@@ -225,13 +225,13 @@
     <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
       Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml' />
     <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>

Modified: branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs?rev=3763&r1=3762&r2=3763&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Shibboleth-schemas.wxs Thu Sep  6 17:05:07 2012
@@ -72,7 +72,7 @@
     <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
                   Execute='deferred' Impersonate='no' />
     <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
-                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />
     <InstallExecuteSequence>
       <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
       <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>

Modified: branches/REL_2/msi/scripts/shib_edit_catalog.vbs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/scripts/shib_edit_catalog.vbs?rev=3763&r1=3762&r2=3763&view=diff
==============================================================================
--- branches/REL_2/msi/scripts/shib_edit_catalog.vbs (original)
+++ branches/REL_2/msi/scripts/shib_edit_catalog.vbs Thu Sep  6 17:05:07 2012
@@ -45,9 +45,8 @@
   customData = Session.Property("CustomActionData")
   msiProperties = split(customData,";@;")
   XMLDir = msiProperties(0) ' \programdata\shibboleth\sp\xml\opensaml\
-  ConfigFileName = msiProperties(1) 'catalog
+  ConfigFile = msiProperties(1) 'catalog
 
-  ConfigFile = XMLDir & ConfigFileName
   ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
 
 'Last End If