Menu
▾
▴
[WiX-commits] wix/src/ca/serverca/setup sca.wxs,1.2,1.3
|
From: Rob M. <ro...@us...> - 2005-07-13 10:22:30
|
Update of /cvsroot/wix/wix/src/ca/serverca/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31352/src/ca/serverca/setup Modified Files: sca.wxs Log Message: fix WebExtension handling minor fixes for Certificate handling mark all server CustomActions as NoImpersonate sfbug:1235657 - improve error messages displayed during command-line processing sfbug:1234905 CPU utilization shooots to 100% sfbug:1234893 - document how to set default value for Registry sfreq:1236986 - accept all typical GUID representations sfbug:1234099 - process complex references in all sections not just the entry section sfbug:1235011,1235012,1233526 - decompiler fixes fixed WiX CodeDom Index: sca.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ca/serverca/setup/sca.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sca.wxs 6 May 2005 18:18:12 -0000 1.2 --- sca.wxs 13 Jul 2005 10:21:51 -0000 1.3 *************** *** 74,83 **** <CustomAction Id='ConfigureIIs' BinaryKey='ScaSchedule' DllEntry='ConfigureIIs' Execute='immediate' Return='check'/> ! <CustomAction Id='StartMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='StartMetabaseTransaction' Execute='deferred' Return='check'/> ! <CustomAction Id='RollbackMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='RollbackMetabaseTransaction' Execute='rollback' Return='check'/> ! <CustomAction Id='CommitMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='CommitMetabaseTransaction' Execute='commit' Return='check'/> ! <CustomAction Id='WriteMetabaseChanges' BinaryKey='ScaExecute' DllEntry='WriteMetabaseChanges' Execute='deferred' Return='check'/> ! <CustomAction Id='AddCertificate' BinaryKey='ScaExecute' DllEntry='AddCertificate' Execute='deferred' Return='check' /> ! <CustomAction Id='DeleteCertificate' BinaryKey='ScaExecute' DllEntry='DeleteCertificate' Execute='deferred' Return='check' /> <InstallExecuteSequence> --- 74,83 ---- <CustomAction Id='ConfigureIIs' BinaryKey='ScaSchedule' DllEntry='ConfigureIIs' Execute='immediate' Return='check'/> ! <CustomAction Id='StartMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='StartMetabaseTransaction' Impersonate="no" Execute='deferred' Return='check'/> ! <CustomAction Id='RollbackMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='RollbackMetabaseTransaction' Impersonate="no" Execute='rollback' Return='check'/> ! <CustomAction Id='CommitMetabaseTransaction' BinaryKey='ScaExecute' DllEntry='CommitMetabaseTransaction' Impersonate="no" Execute='commit' Return='check'/> ! <CustomAction Id='WriteMetabaseChanges' BinaryKey='ScaExecute' DllEntry='WriteMetabaseChanges' Impersonate="no" Execute='deferred' Return='check'/> ! <CustomAction Id='AddCertificate' BinaryKey='ScaExecute' DllEntry='AddCertificate' Impersonate="no" Execute='deferred' Return='check' /> ! <CustomAction Id='DeleteCertificate' BinaryKey='ScaExecute' DllEntry='DeleteCertificate' Impersonate="no" Execute='deferred' Return='check' /> <InstallExecuteSequence> *************** *** 108,111 **** --- 108,112 ---- </UI> + <!-- The SQL custom actions should impersonate the user because the user's cridentials are used when connected to the database if none are provided --> <CustomAction Id='ConfigureSql' BinaryKey='ScaSchedule' DllEntry='ConfigureSql' Execute='immediate' Return='check'/> <CustomAction Id='CreateDatabase' BinaryKey='ScaExecute' DllEntry='CreateDatabase' Execute='deferred' Return='check'/> *************** *** 137,144 **** <CustomAction Id='ConfigureUsers' BinaryKey='ScaSchedule' DllEntry='ConfigureUsers' Execute='immediate' Return='check'/> ! <CustomAction Id='CreateUser' BinaryKey='ScaExecute' DllEntry='CreateUser' Execute='deferred' Return='check' HideTarget='yes'/> ! <CustomAction Id='CreateUserRollback' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute='rollback' Return='check'/> <!-- RemoveUser is a type commit action because it is not possible to rollback the removal of a user --> ! <CustomAction Id='RemoveUser' BinaryKey='ScaExecute' DllEntry='RemoveUser' Execute='commit' Return='check'/> <InstallExecuteSequence> --- 138,145 ---- <CustomAction Id='ConfigureUsers' BinaryKey='ScaSchedule' DllEntry='ConfigureUsers' Execute='immediate' Return='check'/> ! <CustomAction Id='CreateUser' BinaryKey='ScaExecute' DllEntry='CreateUser' Impersonate="no" Execute='deferred' Return='check' HideTarget='yes'/> ! <CustomAction Id='CreateUserRollback' BinaryKey='ScaExecute' DllEntry='RemoveUser' Impersonate="no" Execute='rollback' Return='check'/> <!-- RemoveUser is a type commit action because it is not possible to rollback the removal of a user --> ! <CustomAction Id='RemoveUser' BinaryKey='ScaExecute' DllEntry='RemoveUser' Impersonate="no" Execute='commit' Return='check'/> <InstallExecuteSequence> *************** *** 159,166 **** <CustomAction Id='ConfigureSmb' BinaryKey='ScaSchedule' DllEntry='ConfigureSmb' Execute='immediate' Return='check'/> ! <CustomAction Id='CreateSmb' BinaryKey='ScaExecute' DllEntry='CreateSmb' Execute='deferred' Return='check'/> ! <CustomAction Id='CreateSmbRollback' BinaryKey='ScaExecute' DllEntry='DropSmb' Execute='rollback' Return='ignore'/> <!-- DropSmb is a type commit action because it is not possible to rollback the removal of a fileshare --> ! <CustomAction Id='DropSmb' BinaryKey='ScaExecute' DllEntry='DropSmb' Execute='commit' Return='check'/> <InstallExecuteSequence> --- 160,167 ---- <CustomAction Id='ConfigureSmb' BinaryKey='ScaSchedule' DllEntry='ConfigureSmb' Execute='immediate' Return='check'/> ! <CustomAction Id='CreateSmb' BinaryKey='ScaExecute' DllEntry='CreateSmb' Impersonate="no" Execute='deferred' Return='check'/> ! <CustomAction Id='CreateSmbRollback' BinaryKey='ScaExecute' DllEntry='DropSmb' Impersonate="no" Execute='rollback' Return='ignore'/> <!-- DropSmb is a type commit action because it is not possible to rollback the removal of a fileshare --> ! <CustomAction Id='DropSmb' BinaryKey='ScaExecute' DllEntry='DropSmb' Impersonate="no" Execute='commit' Return='check'/> <InstallExecuteSequence> *************** *** 184,191 **** <CustomAction Id='ConfigurePerfmonInstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonInstall' Execute='immediate' Return='check'/> <CustomAction Id='ConfigurePerfmonUninstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonUninstall' Execute='immediate' Return='check'/> ! <CustomAction Id='RegisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Execute='deferred' Return='check'/> ! <CustomAction Id='UnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Execute='deferred' Return='check'/> ! <CustomAction Id='RollbackRegisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Execute='rollback' Return='check'/> ! <CustomAction Id='RollbackUnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Execute='rollback' Return='check'/> <InstallExecuteSequence> --- 185,192 ---- <CustomAction Id='ConfigurePerfmonInstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonInstall' Execute='immediate' Return='check'/> <CustomAction Id='ConfigurePerfmonUninstall' BinaryKey='ScaSchedule' DllEntry='ConfigurePerfmonUninstall' Execute='immediate' Return='check'/> ! <CustomAction Id='RegisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Impersonate="no" Execute='deferred' Return='check'/> ! <CustomAction Id='UnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Impersonate="no" Execute='deferred' Return='check'/> ! <CustomAction Id='RollbackRegisterPerfmon' BinaryKey='ScaExecute' DllEntry='UnregisterPerfmon' Impersonate="no" Execute='rollback' Return='check'/> ! <CustomAction Id='RollbackUnregisterPerfmon' BinaryKey='ScaExecute' DllEntry='RegisterPerfmon' Impersonate="no" Execute='rollback' Return='check'/> <InstallExecuteSequence> |