Index: installer/server.wxs
===================================================================
RCS file: /cvs/cvsnt/installer/server.wxs,v
retrieving revision 1.1.2.14.4.36.2.26
diff -c -r1.1.2.14.4.36.2.26 server.wxs
*** installer/server.wxs	22 Dec 2010 16:36:26 -0000	1.1.2.14.4.36.2.26
--- installer/server.wxs	7 Mar 2011 07:26:21 -0000
***************
*** 127,133 ****
                  <File Id="cvsmanagerx32.exe" Name="CVSMAN~1.EXE" LongName="cvsmanager.exe" KeyPath="yes" />
                  <File Id="cvsntsrv.exe" Name="cvsntsrv.exe" />
                  <ServiceControl Id="cvsx32" Name="cvs" Remove="both" Stop="both" Wait="yes" />
!                 <ServiceInstall Id="cvsmanagerx32.svc" Name="cvsnt" Arguments="-run" DisplayName="CVS Suite High Performance Dispatch service $(var.CVSNT_VERSION)" Type="ownProcess" Interactive="yes" Start="auto" ErrorControl="normal" Description="This service manages a pool of servers to respond to connections from clients.  Use the CVSNT Server control panel to configure this service." />
                  <ServiceControl Id="cvsntx32" Name="cvsnt" Start="install" Stop="both" Remove="uninstall" Wait="no" />
  	      </Component>
                <Component Id="ServiceFilesCvsx64" Guid="6F3C4AE6-9FBC-4782-B7C1-4F73E4631301" DiskId="1" Win64="yes">
--- 127,136 ----
                  <File Id="cvsmanagerx32.exe" Name="CVSMAN~1.EXE" LongName="cvsmanager.exe" KeyPath="yes" />
                  <File Id="cvsntsrv.exe" Name="cvsntsrv.exe" />
                  <ServiceControl Id="cvsx32" Name="cvs" Remove="both" Stop="both" Wait="yes" />
!                 <ServiceInstall Id="cvsmanagerx32.svc" Name="cvsnt" Arguments="-run" DisplayName="CVS Suite High Performance Dispatch service $(var.CVSNT_VERSION)" Type="ownProcess" Interactive="yes" Start="auto" ErrorControl="normal" Description="This service manages a pool of servers to respond to connections from clients.  Use the CVSNT Server control panel to configure this service." >
!                     <ServiceDependency Id="SamSs" />
!                     <ServiceDependency Id="cvslock" />
! 	        </ServiceInstall>
                  <ServiceControl Id="cvsntx32" Name="cvsnt" Start="install" Stop="both" Remove="uninstall" Wait="no" />
  	      </Component>
                <Component Id="ServiceFilesCvsx64" Guid="6F3C4AE6-9FBC-4782-B7C1-4F73E4631301" DiskId="1" Win64="yes">
***************
*** 136,148 ****
                  <File Id="cvsntsrvx64.exe" Name="cvsntsrv.exe" />
                  <User Id="CVSMGRX64USER" CreateUser="yes" CanNotChangePassword="yes" Disabled="no" LogonAsService="yes" Name="CVSMANAGER_USER" PasswordNeverExpires="yes" Password="Li$sadel[CVSMANAGER_PASSWD]_Al!ceWOZhere2009" UpdateIfExists="yes" RemoveOnUninstall="no" />
                  <ServiceControl Id="cvsx64" Name="cvs" Remove="both" Stop="both" Wait="yes" />
!                 <ServiceInstall Id="cvsmanagerx64.svc" Name="cvsnt" Account=".\CVSMANAGER_USER" Password="Li$sadel[CVSMANAGER_PASSWD]_Al!ceWOZhere2009" Arguments="-run" DisplayName="CVS Suite High Performance Dispatch service $(var.CVSNT_VERSION)" Type="ownProcess" Interactive="no" Start="auto" ErrorControl="normal" Description="This service manages a pool of servers to respond to connections from clients.  Use the CVSNT Server control panel to configure this service." />
                  <ServiceControl Id="cvsntx64" Name="cvsnt" Start="install" Stop="both" Remove="uninstall" Wait="no" />
  	      </Component>
                <Component Id="ServiceFilesCvsLock" Guid="A99AEB5E-0434-42f6-A0EB-B7986B59C921" DiskId="1">
                <!-- Orca validation error... cannot fix due to limitations of ServiceInstall -->
  		<File Id="sscvslock.exe" Name="cvslock.exe" KeyPath="yes" />
!                 <ServiceInstall Id="cvslock.exe" Name="cvslock" Arguments="-run" DisplayName="CVS Suite Deadlock service $(var.CVSNT_VERSION)" Type="ownProcess" Start="auto" ErrorControl="normal" Description="This service manages deadlocks for all the CVSNT processes running on a server or in a cluster." />
                  <ServiceControl Id="cvslock" Name="cvslock" Start="install" Stop="both" Remove="uninstall" Wait="no" />
                </Component>
  	   <Directory Id="CvsntXdiffStuff" Name="xdiff" src="$(var.CVSNT_BASE)\xdiff\">
--- 139,156 ----
                  <File Id="cvsntsrvx64.exe" Name="cvsntsrv.exe" />
                  <User Id="CVSMGRX64USER" CreateUser="yes" CanNotChangePassword="yes" Disabled="no" LogonAsService="yes" Name="CVSMANAGER_USER" PasswordNeverExpires="yes" Password="Li$sadel[CVSMANAGER_PASSWD]_Al!ceWOZhere2009" UpdateIfExists="yes" RemoveOnUninstall="no" />
                  <ServiceControl Id="cvsx64" Name="cvs" Remove="both" Stop="both" Wait="yes" />
!                 <ServiceInstall Id="cvsmanagerx64.svc" Name="cvsnt" Account=".\CVSMANAGER_USER" Password="Li$sadel[CVSMANAGER_PASSWD]_Al!ceWOZhere2009" Arguments="-run" DisplayName="CVS Suite High Performance Dispatch service $(var.CVSNT_VERSION)" Type="ownProcess" Interactive="no" Start="auto" ErrorControl="normal" Description="This service manages a pool of servers to respond to connections from clients.  Use the CVSNT Server control panel to configure this service." >
!                     <ServiceDependency Id="SamSs" />
!                     <ServiceDependency Id="cvslock" />
! 	        </ServiceInstall>
                  <ServiceControl Id="cvsntx64" Name="cvsnt" Start="install" Stop="both" Remove="uninstall" Wait="no" />
  	      </Component>
                <Component Id="ServiceFilesCvsLock" Guid="A99AEB5E-0434-42f6-A0EB-B7986B59C921" DiskId="1">
                <!-- Orca validation error... cannot fix due to limitations of ServiceInstall -->
  		<File Id="sscvslock.exe" Name="cvslock.exe" KeyPath="yes" />
!                 <ServiceInstall Id="cvslock.exe" Name="cvslock" Arguments="-run" DisplayName="CVS Suite Deadlock service $(var.CVSNT_VERSION)" Type="ownProcess" Start="auto" ErrorControl="normal" Description="This service manages deadlocks for all the CVSNT processes running on a server or in a cluster." >
!                     <ServiceDependency Id="RpcSs" />
! 	        </ServiceInstall>
                  <ServiceControl Id="cvslock" Name="cvslock" Start="install" Stop="both" Remove="uninstall" Wait="no" />
                </Component>
  	   <Directory Id="CvsntXdiffStuff" Name="xdiff" src="$(var.CVSNT_BASE)\xdiff\">