Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o adjusted logging for maven status

Browse Source 
o changed additional port names
o added stricter validation that requires at least one of http or https port


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113392 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
plynch
2003-05-02 17:55:29 +00:00
parent dc9d35785f
commit 77d3286445
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
webserver/plugin.jelly
View File

@@ -148,6 +148,22 @@
<exception:requiredPropertyMissing propname="maven.webserver.root" />
</j:if>
<!-- sanity check for preset variables -->
<j:choose>
<j:when test="${context.getVariable('maven.webserver.port.http') == null}">
<j:if test="${context.getVariable('maven.webserver.port.https') == null}">
<exception:requiredPropertyMissing
propname="maven.webserver.port.http OR maven.webserver.port.https" />
</j:if>
</j:when>
<j:when test="${context.getVariable('maven.webserver.port.https') == null}">
<j:if test="${context.getVariable('maven.webserver.port.http') == null}">
<exception:requiredPropertyMissing
propname="maven.webserver.port.http OR maven.webserver.port.https" />
</j:if>
</j:when>
</j:choose>
<!-- These are special cases where the user should not override -->
<j:if test="${context.getVariable('maven.webserver.fullname') == null}">
<exception:requiredPropertyMissing propname="maven.webserver.fullname" />
@@ -183,12 +199,12 @@
value="${maven.webserver.port.http}" />
<ant:filter token="maven.webserver.port.https"
value="${maven.webserver.port.https}" />
<ant:filter token="maven.webserver.port.one"
value="${maven.webserver.port.one}" />
<ant:filter token="maven.webserver.port.two"
value="${maven.webserver.port.two}" />
<ant:filter token="maven.webserver.port.three"
value="${maven.webserver.port.three}" />
<ant:filter token="maven.webserver.port.A"
value="${maven.webserver.port.A}" />
<ant:filter token="maven.webserver.port.B"
value="${maven.webserver.port.B}" />
<ant:filter token="maven.webserver.port.C"
value="${maven.webserver.port.C}" />
<ant:filter token="maven.webserver.conf.dir"
value="${maven.webserver.conf.dir.path}" />
<ant:filter token="maven.webserver.host"
@@ -247,7 +263,7 @@ Maven has determined your <j:expr value="${maven.webserver.fullname}"/> webserve
<j:if test="${context.getVariable('maven.webserver.test.url') == null}">
<log:info trim="false">
Maven has determined your <j:expr value="${maven.webserver.fullname}"/> webserver instance is <j:expr value="${maven.webserver.installed.msg}"/> in directory [ <j:expr value="${maven.webserver.dir}"/> ] and <j:expr value="${maven.webserver.started.msg}"/> using socket <j:expr value="${maven.webserver.port.http}"/> on host <j:expr value="${maven.webserver.host}"/>.
Maven has determined your <j:expr value="${maven.webserver.fullname}"/> webserver instance is <j:expr value="${maven.webserver.installed.msg}"/> in directory [ <j:expr value="${maven.webserver.dir}"/> ] and <j:expr value="${maven.webserver.started.msg}"/> using socket <j:expr value="${maven.webserver.test.socket}"/> on host <j:expr value="${maven.webserver.host}"/>.
</log:info>
</j:if>