o adding context.getVariable qualifications and adding support to copy the conf files with webserver plugin properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113435 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -179,40 +179,77 @@
|
||||
|
||||
<!-- convert all path related properties to their os equivalent -->
|
||||
<ant:property name="maven.appserver.home.path"
|
||||
location="${maven.appserver.home}" />
|
||||
location="${context.getVariable('maven.appserver.home')}" />
|
||||
<ant:property name="maven.appserver.conf.dir.path"
|
||||
location="${maven.appserver.conf.dir}" />
|
||||
location="${context.getVariable('maven.appserver.conf.dir')}" />
|
||||
<ant:property name="maven.appserver.root.path"
|
||||
location="${maven.appserver.root}" />
|
||||
location="${context.getVariable('maven.appserver.root')}" />
|
||||
<ant:property name="maven.appserver.dir.path"
|
||||
location="${maven.appserver.dir}" />
|
||||
location="${context.getVariable('maven.appserver.dir')}" />
|
||||
|
||||
<!-- convert all path related properties to their os equivalent -->
|
||||
<ant:property name="maven.webserver.home.path"
|
||||
location="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.home')}" />
|
||||
<ant:property name="maven.webserver.conf.dir.path"
|
||||
location="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.conf.dir')}" />
|
||||
<ant:property name="maven.webserver.root.path"
|
||||
location="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.root')}" />
|
||||
<ant:property name="maven.webserver.dir.path"
|
||||
location="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.dir')}" />
|
||||
|
||||
<!-- create the filterset to be available to copy tasks that want it -->
|
||||
<ant:filterset id="maven.appserver.filterset.default">
|
||||
<ant:filter token="maven.appserver.home"
|
||||
value="${maven.appserver.home.path}" />
|
||||
value="${context.getVariable('maven.appserver.home.path')}" />
|
||||
<ant:filter token="maven.appserver.name"
|
||||
value="${maven.appserver.name}" />
|
||||
value="${context.getVariable('maven.appserver.name')}" />
|
||||
<ant:filter token="maven.appserver.version"
|
||||
value="${maven.appserver.version}" />
|
||||
value="${context.getVariable('maven.appserver.version')}" />
|
||||
<ant:filter token="maven.appserver.port.http"
|
||||
value="${maven.appserver.port.http}" />
|
||||
value="${context.getVariable('maven.appserver.port.http')}" />
|
||||
<ant:filter token="maven.appserver.port.https"
|
||||
value="${maven.appserver.port.https}" />
|
||||
value="${context.getVariable('maven.appserver.port.https')}" />
|
||||
<ant:filter token="maven.appserver.port.A"
|
||||
value="${maven.appserver.port.A}" />
|
||||
value="${context.getVariable('maven.appserver.port.A')}" />
|
||||
<ant:filter token="maven.appserver.port.B"
|
||||
value="${maven.appserver.port.B}" />
|
||||
value="${context.getVariable('maven.appserver.port.B')}" />
|
||||
<ant:filter token="maven.appserver.port.C"
|
||||
value="${maven.appserver.port.C}" />
|
||||
value="${context.getVariable('maven.appserver.port.C')}" />
|
||||
<ant:filter token="maven.appserver.conf.dir"
|
||||
value="${maven.appserver.conf.dir.path}" />
|
||||
value="${context.getVariable('maven.appserver.conf.dir.path')}" />
|
||||
<ant:filter token="maven.appserver.host"
|
||||
value="${maven.appserver.host}" />
|
||||
value="${context.getVariable('maven.appserver.host')}" />
|
||||
<ant:filter token="maven.appserver.dir"
|
||||
value="${maven.appserver.dir.path}" />
|
||||
value="${context.getVariable('maven.appserver.dir.path')}" />
|
||||
<ant:filter token="maven.appserver.root"
|
||||
value="${maven.appserver.root.path}" />
|
||||
value="${context.getVariable('maven.appserver.root.path')}" />
|
||||
|
||||
<!-- allow integration with the properties of the appserver plugin -->
|
||||
<ant:filter token="maven.webserver.home"
|
||||
value="${context.getVariable('maven.webserver.home.path')}" />
|
||||
<ant:filter token="maven.webserver.name"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.name')}" />
|
||||
<ant:filter token="maven.webserver.version"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.version')}" />
|
||||
<ant:filter token="maven.webserver.port.http"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.port.http')}" />
|
||||
<ant:filter token="maven.webserver.port.https"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.port.https')}" />
|
||||
<ant:filter token="maven.webserver.port.A"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.port.A')}" />
|
||||
<ant:filter token="maven.webserver.port.B"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.port.B')}" />
|
||||
<ant:filter token="maven.webserver.port.C"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.port.C')}" />
|
||||
<ant:filter token="maven.webserver.conf.dir"
|
||||
value="${context.getVariable('maven.webserver.conf.dir.path')}" />
|
||||
<ant:filter token="maven.webserver.host"
|
||||
value="${pom.getPluginContext('maven-webserver-plugin').getVariable('maven.webserver.host')}" />
|
||||
<ant:filter token="maven.webserver.dir"
|
||||
value="${context.getVariable('maven.webserver.dir.path')}" />
|
||||
<ant:filter token="maven.webserver.root"
|
||||
value="${context.getVariable('maven.webserver.root.path')}" />
|
||||
|
||||
</ant:filterset>
|
||||
|
||||
<!-- a flag to see if the appserver is started -->
|
||||
|
||||
Reference in New Issue
Block a user