Return-Path: 
 <win32-msi-cvs-return-207-apmail-httpd-win32-msi-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-win32-msi-cvs-archive@www.apache.org
Received: (qmail 87770 invoked from network); 23 Dec 2007 01:21:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Dec 2007 01:21:30 -0000
Received: (qmail 99961 invoked by uid 500); 23 Dec 2007 01:21:19 -0000
Delivered-To: apmail-httpd-win32-msi-cvs-archive@httpd.apache.org
Received: (qmail 99950 invoked by uid 500); 23 Dec 2007 01:21:19 -0000
Mailing-List: contact win32-msi-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:win32-msi-cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:win32-msi-cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:win32-msi-cvs@httpd.apache.org>
Reply-To: win32-msi-cvs@httpd.apache.org
List-Id: <win32-msi-cvs.httpd.apache.org>
Delivered-To: mailing list win32-msi-cvs@httpd.apache.org
Received: (qmail 99939 invoked by uid 99); 23 Dec 2007 01:21:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Dec 2007 17:21:19 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2007 01:21:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9100F1A9832; Sat, 22 Dec 2007 17:21:06 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r606523 -
 /httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
Date: Sun, 23 Dec 2007 01:21:06 -0000
To: win32-msi-cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071223012106.9100F1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wrowe
Date: Sat Dec 22 17:21:05 2007
New Revision: 606523

URL: http://svn.apache.org/viewvc?rev=606523&view=rev
Log:
Permit ApacheMonitor to not be installed (and the taskbar Startup
shortcut will not be created)

Modified:
    httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism

Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=606523&r1=606522&r2=606523&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Sat Dec 22 17:21:05 2007
@@ -1501,6 +1501,7 @@
 		<col def="S255">ISProFeatureName</col>
 		<row><td>Apache</td><td/><td>##AppProduct##</td><td>##AppProduct_Description##</td><td>3</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>ApacheDocs</td><td>Apache</td><td>##Feature_ApacheDocs##</td><td>##Feature_ApacheDocs_Description##</td><td>3</td><td>11</td><td>MANUAL</td><td>8</td><td/><td/><td/><td/></row>
+		<row><td>ApacheMonitoring</td><td>Apache</td><td>##Feature_ApacheMonitoring##</td><td>##Feature_ApacheMonitoring_Description##</td><td>3</td><td>41</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>ApacheRuntime</td><td>Apache</td><td>##Feature_ApacheRuntime##</td><td>##Feature_ApacheRuntime_Description##</td><td>1</td><td>1</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>BuildFiles</td><td>ApacheRuntime</td><td>##Feature_BuildFiles##</td><td>##Feature_BuildFiles_Description##</td><td>1</td><td>101</td><td>INSTALLDIR</td><td>8</td><td/><td/><td/><td/></row>
 		<row><td>Iconv</td><td>ApacheRuntime</td><td>##Feature_Iconv##</td><td>##Feature_Iconv_Description##</td><td>3</td><td>21</td><td>APACHEICONVDIR</td><td>8</td><td/><td/><td/><td/></row>
@@ -1531,7 +1532,7 @@
 		<row><td>ApacheDocs</td><td>manual_vhosts</td></row>
 		<row><td>ApacheDocs</td><td>read</td></row>
 		<row><td>ApacheRuntime</td><td>ApacheAdmin</td></row>
-		<row><td>ApacheRuntime</td><td>ApacheMonitor</td></row>
+		<row><td>ApacheMonitoring</td><td>ApacheMonitor</td></row>
 		<row><td>ApacheRuntime</td><td>ApacheNonAdmin</td></row>
 		<row><td>ApacheRuntime</td><td>ab</td></row>
 		<row><td>ApacheRuntime</td><td>cgibin</td></row>
@@ -2726,6 +2727,8 @@
 		<row><td>Feature_ApacheDocs_Description</td><td>1033</td><td>This feature installs the Apache webserver documentation to your hard drive</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Feature_ApacheRuntime</td><td>1033</td><td>Apache Runtime</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Feature_ApacheRuntime_Description</td><td>1033</td><td>This feature includes the binaries and configuration to run the Apache webserver including command line tools</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Feature_ApacheMonitoring</td><td>1033</td><td>Apache Service Taskbar Icon</td><td>0</td><td/><td>1360611656</td></row>
+		<row><td>Feature_ApacheMonitoring_Description</td><td>1033</td><td>This feature installs the ApacheMonitor service monitoring taskbar icon and Startup shortcut.</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Feature_BuildFiles</td><td>1033</td><td>Build Headers and Libraries</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Feature_BuildFiles_Description</td><td>1033</td><td>This feature installs the headers and libraries required to compile and link additional modules.</td><td>0</td><td/><td>1360611656</td></row>
 		<row><td>Feature_Iconv</td><td>1033</td><td>APR Iconv Code Pages</td><td>0</td><td/><td>1360611656</td></row>
@@ -4690,6 +4693,7 @@
 		<row><td>ShortcutServerRestart</td><td>ApacheAdmin</td><td/><td>shortcutsservercontrol</td><td>2</td></row>
 		<row><td>ShortcutServerStart</td><td>ApacheAdmin</td><td/><td>shortcutsservercontrol</td><td>2</td></row>
 		<row><td>ShortcutServerStop</td><td>ApacheAdmin</td><td/><td>shortcutsservercontrol</td><td>2</td></row>
+		<row><td>StartupApacheMonitor</td><td>ApacheMonitor</td><td/><td>administerapache</td><td>2</td></row>
 	</table>
 
 	<table name="RemoveIniFile">
@@ -4782,6 +4786,7 @@
 		<row><td>ShortcutServerRestart</td><td>shortcutsservercontrol</td><td>##Shortcut_RestartSvc_ShortLongName##</td><td>ApacheAdmin</td><td>[#httpd.exe]</td><td>-w -n "[SERVICENAME]" -k restart</td><td>##Shortcut_RestartSvcDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutServerStart</td><td>shortcutsservercontrol</td><td>##Shortcut_StartSvc_ShortLongName##</td><td>ApacheAdmin</td><td>[#httpd.exe]</td><td>-w -n "[SERVICENAME]" -k start</td><td>##Shortcut_StartSvcDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
 		<row><td>ShortcutServerStop</td><td>shortcutsservercontrol</td><td>##Shortcut_StopSvc_ShortLongName##</td><td>ApacheAdmin</td><td>[#httpd.exe]</td><td>-w -n "[SERVICENAME]" -k stop </td><td>##Shortcut_StopSvcDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
+		<row><td>StartupApacheMonitor</td><td>StartupFolder</td><td>##Shortcut_ApacheMonitor_ShortLongName##</td><td>ApacheMonitor</td><td>[#ApacheMonitor.exe]</td><td/><td>##Shortcut_ApacheMonitorDesc##</td><td>0</td><td/><td/><td>1</td><td>INSTALLDIR</td><td/><td/><td/></row>
 	</table>
 
 	<table name="Signature">



---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org