diff --git a/war/plugin.jelly b/war/plugin.jelly index 77a5d5c9..b7199946 100644 --- a/war/plugin.jelly +++ b/war/plugin.jelly @@ -33,14 +33,10 @@ - + - - diff --git a/war/plugin.properties b/war/plugin.properties index 7010c78b..09e65447 100644 --- a/war/plugin.properties +++ b/war/plugin.properties @@ -19,27 +19,38 @@ # ------------------------------------------------------------------- # War plugin. # ------------------------------------------------------------------- + maven.war.index=false + # Location of where the webapp is located in the source tree. The # WEB-INF directory is located right under ${maven.war.src}. maven.war.src=${maven.src.dir}/webapp + # Files to include and exclude from war # Note: Files are relative to maven.war.src maven.war.src.includes=** maven.war.src.excludes= + # Location of web.xml file maven.war.webxml=${maven.war.src}/WEB-INF/web.xml + # Classes to include and exclude from WEB-INF/classes # Note: Classes are relative to build.dir maven.war.classes.includes=** maven.war.classes.excludes=**/package.html + # Location where the war will be created. Defaults to # ${maven.build.dir} maven.war.build.dir = ${maven.build.dir} + +# Name of the generated war file (without the path). +maven.war.final.name = ${pom.artifactId}.war + # Location where the webapp will be created. Defaults to # ${maven.war.build.dir}/${pom.artifactId} maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId} + maven.war.tld.dir=WEB-INF/tld # Location of the manifest file to be used -maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF \ No newline at end of file +maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml index 892af3df..1ff60a3e 100644 --- a/war/xdocs/changes.xml +++ b/war/xdocs/changes.xml @@ -25,6 +25,12 @@ + + Made the maven.war.final.name property public as it is + required by several other plugins and before this change the only + way is for these plugins was to call the non-public + war:init goal. + Splitted war:webapp in war:war-resources and war:webapp. Deprecated war:load hook goal diff --git a/war/xdocs/properties.xml b/war/xdocs/properties.xml index d29cec2f..15dd9c87 100644 --- a/war/xdocs/properties.xml +++ b/war/xdocs/properties.xml @@ -1,4 +1,5 @@ +