plynch 2003/03/27 09:31:00
Modified: src/plugins-build/webserver/src/plugin-resources
apache-2.x.jelly
Log:
o simplify the Windows specific executable calls by using multiple os attribute
values
Revision Changes Path
1.5 +33 -101
maven/src/plugins-build/webserver/src/plugin-resources/apache-2.x.jelly
Index: apache-2.x.jelly
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/webserver/src/plugin-resources/apache-2.x.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apache-2.x.jelly 30 Jan 2003 22:06:28 -0000 1.4
+++ apache-2.x.jelly 27 Mar 2003 17:31:00 -0000 1.5
@@ -49,27 +49,7 @@
<!-- try to install the service for this project on Windows NT/2000/XP -->
<!-- Windows 98/ME don't use a service -->
<ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows 2000">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k install" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
-
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows NT">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k install" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
-
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows XP">
+ os="Windows NT,Windows 2000,Windows XP">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
<ant:arg value="-f" />
@@ -95,7 +75,8 @@
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
<ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows 2000">
+ os="Windows NT,Windows 2000,Windows XP"
+ resultProperty="maven.webserver.service_installed">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
<ant:arg value="-f" />
@@ -104,30 +85,38 @@
<ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
</ant:exec>
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows NT">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k start" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
+ <j:if test="${context.getVariable('maven.webserver.service_installed') ==
2}" >
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows XP">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k start" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
+ <log:info trim="false">
+Missing service detected. Trying to install a new webserver instance service...
+ </log:info>
+
+ <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
+ os="Windows 2000,Windows NT,Windows XP" failonerror="true">
+ <ant:arg value="-d" />
+ <ant:arg line="${maven.webserver.root}" />
+ <ant:arg value="-f" />
+ <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
+ <ant:arg line="-k install" />
+ <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
+ </ant:exec>
+
+ <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
+ os="Windows 2000,Windows NT,Windows XP" failonerror="true">
+ <ant:arg value="-d" />
+ <ant:arg line="${maven.webserver.root}" />
+ <ant:arg value="-f" />
+ <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
+ <ant:arg line="-k start" />
+ <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
+ </ant:exec>
+
+ </j:if>
</j:when>
<j:otherwise>
- <!-- nix nay on the wi nay assumes default apache install -->
+ <!-- nix nay on the winay assumes default apache install -->
<ant:exec executable="${maven.webserver.home}/bin/apachectl">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
@@ -145,18 +134,9 @@
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows 2000">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k restart" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
<ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows NT">
+ os="Windows NT,Windows 2000,Windows XP">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
<ant:arg value="-f" />
@@ -165,15 +145,6 @@
<ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
</ant:exec>
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows XP">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k restart" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
</j:when>
<j:otherwise>
<ant:exec executable="${maven.webserver.home}/bin/apachectl">
@@ -192,28 +163,9 @@
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows 2000">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k stop" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
-
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows NT">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k stop" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
<ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows XP">
+ os="Windows NT,Windows 2000,Windows XP">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
<ant:arg value="-f" />
@@ -244,27 +196,7 @@
<j:if test="${systemScope['os.name'].startsWith('Windows')}">
<ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows 2000">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k uninstall" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
-
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows NT">
- <ant:arg value="-d" />
- <ant:arg line="${maven.webserver.root}" />
- <ant:arg value="-f" />
- <ant:arg line="${maven.webserver.dir}\conf\httpd.conf" />
- <ant:arg line="-k uninstall" />
- <ant:arg line="-n ${maven.webserver.apache2x.service.name}" />
- </ant:exec>
-
- <ant:exec executable="${maven.webserver.home}\bin\apache.exe"
- os="Windows XP">
+ os="Windows NT,Windows 2000,Windows XP">
<ant:arg value="-d" />
<ant:arg line="${maven.webserver.root}" />
<ant:arg value="-f" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
