tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/iis/installer iisfilter.vbs isapi-redirector-win32-msi.ism
Date Fri, 18 Mar 2005 18:09:49 GMT
mturk       2005/03/18 10:09:49

  Modified:    jk/native/iis/installer iisfilter.vbs
                        isapi-redirector-win32-msi.ism
  Log:
  Update installer.
  
  Revision  Changes    Path
  1.2       +28 -13    jakarta-tomcat-connectors/jk/native/iis/installer/iisfilter.vbs
  
  Index: iisfilter.vbs
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/installer/iisfilter.vbs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- iisfilter.vbs	15 Dec 2004 11:07:09 -0000	1.1
  +++ iisfilter.vbs	18 Mar 2005 18:09:48 -0000	1.2
  @@ -28,10 +28,10 @@
   filterName = "jakarta"
   filterLib = "bin\isapi_redirect.dll"
     
  -Function IISInstallFilter(filterDir)
  +Function IISInstallFilter(filterDir, filterObject)
   
       Dim filters
  -    Set filters = GetObject("IIS://LocalHost/W3SVC/1/Filters")
  +    Set filters = GetObject(filterObject)
       If err Then err.clear
       info "Got Filters " + filters.FilterLoadOrder
       
  @@ -42,13 +42,21 @@
       info "Creating Filter  - " + filterName
       Dim filter
       Set filter = filters.Create( "IISFilter", filterName )
  -    If err then
  +    If err Then
       	err.clear
       	info "Filter exists - deleting"
       	filters.delete "IISFilter", filterName
  -    	If err Then fail "Error Deleting Filter"
  +    	If err Then
  +    	    info "Error Deleting Filter"
  +    	    IISInstallFilter = 0
  +    	    Exit Function
  +    	End If
       	Set filter = filters.Create( "IISFilter", filterName )
  -    	If Err Then fail "Error Creating Filter"
  +    	If Err Then
  +    	    info "Error Creating Filter"
  +    	    IISInstallFilter = 0
  +    	    Exit Function
  +    	End If
       End If
       
       '
  @@ -77,18 +85,18 @@
       	If Len(loadOrders) <> 0  Then loadOrders = loadOrders + ","
       	filters.FilterLoadOrder = loadOrders + filterName
       	filters.SetInfo
  -    	info "Filter added." 
  +    	info "Added Filter " + filterName 
       Else
       	info "Filter already exists in load order - no update required."
       End If
  -    
  -End FUnction
  +    IISInstallFilter = 1
  +End Function
   
   ' 
   ' Helper function for snafus
   '
   Function fail(message)
  -'	MsgBox "E: " + message
  +'	MsgBox " " + message
   	WScript.Quit(1)
   End function
   
  @@ -99,6 +107,13 @@
   '	MsgBox " " + message
   End Function 
   
  -info "Starting..." + Session.Property("INSTALLDIR")
  -IISInstallFilter Session.Property("INSTALLDIR")
  -info "FInished!"
  +info "Installing IIS Filter " + Session.Property("INSTALLDIR")
  +Dim rv
  +rv = 0
  +rv = IISInstallFilter(Session.Property("INSTALLDIR"), "IIS://LocalHost/W3SVC/1/Filters")
  +If rv = 0 Then    
  +    rv = IISInstallFilter(Session.Property("INSTALLDIR"), "/LM/W3SVC/Filters")
  +End If
  +If rv = 0 Then
  +    rv = IISInstallFilter(Session.Property("INSTALLDIR"), "/LM/W3SVC/1/Filters")
  +End If
  
  
  
  1.5       +1 -1      jakarta-tomcat-connectors/jk/native/iis/installer/isapi-redirector-win32-msi.ism
  
  Index: isapi-redirector-win32-msi.ism
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/installer/isapi-redirector-win32-msi.ism,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- isapi-redirector-win32-msi.ism	25 Feb 2005 09:28:59 -0000	1.4
  +++ isapi-redirector-win32-msi.ism	18 Mar 2005 18:09:48 -0000	1.5
  @@ -1040,7 +1040,7 @@
   		<row><td>ISSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFiles</td><td/></row>
   		<row><td>ISSelfRegisterFinalize</td><td>1</td><td>ISSELFREG.DLL</td><td>ISSelfRegisterFinalize</td><td/></row>
   		<row><td>ISUnSelfRegisterFiles</td><td>1025</td><td>ISSELFREG.DLL</td><td>ISUnSelfRegisterFiles</td><td/></row>
  -		<row><td>InstallFilter</td><td>326</td><td>NewBinary19</td><td/><td/></row>
  +		<row><td>InstallFilter</td><td>70</td><td>NewBinary19</td><td/><td/></row>
   		<row><td>SetARPINSTALLLOCATION</td><td>51</td><td>ARPINSTALLLOCATION</td><td>[INSTALLDIR]</td><td/></row>
   		<row><td>SetAllUsersProfileNT</td><td>51</td><td>ALLUSERSPROFILE</td><td>[%SystemRoot]\Profiles\All
Users</td><td/></row>
   		<row><td>caCreateVRoots</td><td>1025</td><td>binIISHelper</td><td>CreateIISVRoots</td><td/></row>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message