cvs commit: jakarta-tomcat-connectors/jk/native/iis/installer iisfilter.vbs isapi-redirector-win32-msi.ism
mturk 2005/03/18 10:09:49 Modified:jk/native/iis/installer iisfilter.vbs isapi-redirector-win32-msi.ism Log: Update installer. Revision ChangesPath 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 - 1.1 +++ iisfilter.vbs 18 Mar 2005 18:09:48 - 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.ism25 Feb 2005 09:28:59 - 1.4 +++ isapi-redirector-win32-msi.ism18 Mar 2005 18:09:48 - 1.5 @@ -1040,7 +1040,7 @@ rowtdISSelfRegisterFiles/tdtd1025/tdtdISSELFREG.DLL/tdtdISSelfRegisterFiles/tdtd//row rowtdISSelfRegisterFinalize/tdtd1/tdtdISSELFREG.DLL/tdtdISSelfRegisterFinalize/tdtd//row rowtdISUnSelfRegisterFiles/tdtd1025/tdtdISSELFREG.DLL/tdtdISUnSelfRegisterFiles/tdtd//row - rowtdInstallFilter/tdtd326/tdtdNewBinary19/tdtd/td//row + rowtdInstallFilter/tdtd70/tdtdNewBinary19/tdtd/td//row rowtdSetARPINSTALLLOCATION/tdtd51/tdtdARPINSTALLLOCATION/tdtd[INSTALLDIR]/tdtd//row rowtdSetAllUsersProfileNT/tdtd51/tdtdALLUSERSPROFILE/tdtd[%SystemRoot]\Profiles\All Users/tdtd//row rowtdcaCreateVRoots/tdtd1025/tdtdbinIISHelper/tdtdCreateIISVRoots/tdtd//row - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis/installer iisfilter.vbs isapi-redirector-win32-msi.ism License.rtf LICENSE.TXT tomcat.ico
mturk 2004/12/15 03:07:11
Added: jk/native/iis/installer iisfilter.vbs
isapi-redirector-win32-msi.ism License.rtf
LICENSE.TXT tomcat.ico
Log:
Added isapi redirector installer
Revision ChangesPath
1.1
jakarta-tomcat-connectors/jk/native/iis/installer/iisfilter.vbs
Index: iisfilter.vbs
===
'
' Copyright 1999-2004 The Apache Software Foundation
'
' Licensed under the Apache License, Version 2.0 (the License);
' you may not use this file except in compliance with the License.
' You may obtain a copy of the License at
'
'http://www.apache.org/licenses/LICENSE-2.0
'
' Unless required by applicable law or agreed to in writing, software
' distributed under the License is distributed on an AS IS BASIS,
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
' See the License for the specific language governing permissions and
' limitations under the License.
'
' =
' Description: Install script for Tomcat ISAPI redirector
' Author: Mladen Turk [EMAIL PROTECTED]
' Version: $Revision: 1.1 $
' =
'
' Get a handle to the filters for the server - we process all errors
'
On Error Resume Next
filterName = jakarta
filterLib = bin\isapi_redirect.dll
Function IISInstallFilter(filterDir)
Dim filters
Set filters = GetObject(IIS://LocalHost/W3SVC/1/Filters)
If err Then err.clear
info Got Filters + filters.FilterLoadOrder
'
' Create the filter - if it fails then delete it and try again
'
name = filterName
info Creating Filter - + filterName
Dim filter
Set filter = filters.Create( IISFilter, filterName )
If err then
err.clear
info Filter exists - deleting
filters.delete IISFilter, filterName
If err Then fail Error Deleting Filter
Set filter = filters.Create( IISFilter, filterName )
If Err Then fail Error Creating Filter
End If
'
' Set the filter info and save it
'
filter.FilterPath = filterDir + filterLib
'filter.FilterEnabled = true
filter.FilterDescription = Jakarta Isapi Redirector
filter.NotifyOrderHigh = true
filter.SetInfo
info Created Filter + filterDir + filterLib
'
' Set the load order - only if it's not in the list already
'
On Error goto 0
loadOrders = filters.FilterLoadOrder
list = Split( loadOrders, , )
found = false
For each item in list
If Trim( item ) = filterName Then found = true
Next
If found = false Then
info Filter is not in load order - adding now.
If Len(loadOrders) 0 Then loadOrders = loadOrders + ,
filters.FilterLoadOrder = loadOrders + filterName
filters.SetInfo
info Filter added.
Else
info Filter already exists in load order - no update required.
End If
End FUnction
'
' Helper function for snafus
'
Function fail(message)
' MsgBox E: + message
WScript.Quit(1)
End function
'
' Helper function for info
'
Function info(message)
' MsgBox + message
End Function
info Starting... + Session.Property(INSTALLDIR)
IISInstallFilter Session.Property(INSTALLDIR)
info FInished!
1.1
jakarta-tomcat-connectors/jk/native/iis/installer/isapi-redirector-win32-msi.ism
Binary file
1.1
jakarta-tomcat-connectors/jk/native/iis/installer/License.rtf
Index: License.rtf
===
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
\viewkind4\uc1\pard\qc\lang1033\b\f0\fs18 Apache License\par
Version 2.0, January 2004\par
http://www.apache.org/licenses/\par
\b0\par
\pard TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
\par
\pard\fi-180\li180 1. Definitions.\par
\par
\pard\li180 License shall mean the terms and conditions for use,
reproduction, and distribution as defined by Sections 1 through 9 of this
document.\par
\par
Licensor shall mean the copyright owner or entity authorized by the
copyright owner that is granting the License.\par
\par
Legal Entity shall mean the union of the acting entity and all other
entities that control, are controlled by, or are under common control with that
entity. For the purposes of this definition, control means (i) the power,
direct or indirect, to cause the direction or management of such
