You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2003/09/02 15:37:03 UTC
cvs commit: maven/src/plugins-build/war/xdocs changes.xml properties.xml
evenisse 2003/09/02 06:37:03
Modified: src/plugins-build/war plugin.jelly plugin.properties
src/plugins-build/war/xdocs changes.xml properties.xml
Log:
MAVEN-764. Accept includes/excludes patterns over maven.war.src.
Thanks to Rafal Krzewski.
Revision Changes Path
1.27 +4 -1 maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plugin.jelly 19 Aug 2003 04:45:05 -0000 1.26
+++ plugin.jelly 2 Sep 2003 13:37:03 -0000 1.27
@@ -92,7 +92,10 @@
<j:if test="${webSourcesPresent == 'true'}">
<ant:copy todir="${maven.war.webapp.dir}">
- <ant:fileset dir="${maven.war.src}"/>
+ <ant:fileset dir="${maven.war.src}"
+ includes="${maven.war.src.includes}"
+ excludes="${maven.war.src.excludes}">
+ </ant:fileset>
</ant:copy>
</j:if>
1.4 +4 -0 maven/src/plugins-build/war/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 2 Jul 2003 10:34:48 -0000 1.3
+++ plugin.properties 2 Sep 2003 13:37:03 -0000 1.4
@@ -19,3 +19,7 @@
# ${maven.war.build.dir}/${pom.artifactId}
maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
maven.war.tld.dir=WEB-INF/tld
+# Files to include and exclude from ejb
+# Note: Files are relative to build.dir
+maven.war.src.includes=**
+maven.war.src.excludes=**/package.html
1.10 +3 -0 maven/src/plugins-build/war/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 5 Aug 2003 09:24:30 -0000 1.9
+++ changes.xml 2 Sep 2003 13:37:03 -0000 1.10
@@ -8,6 +8,9 @@
<body>
<release version="1.4" date="in CVS">
+ <action dev="rafal" type="add">
+ Accept includes/excludes patterns over maven.war.src.
+ </action>
<action dev="evenisse" type="fix">
Allow webapp creation if project doesn't have sources.
</action>
1.5 +20 -0 maven/src/plugins-build/war/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 1 Aug 2003 04:21:02 -0000 1.4
+++ properties.xml 2 Sep 2003 13:37:03 -0000 1.5
@@ -21,6 +21,26 @@
</td>
</tr>
<tr>
+ <td>maven.war.src.includes</td>
+ <td>Yes</td>
+ <td>
+ Comma or space separated list of Ant path patterns specifycing
+ what files and directories from <code>${maven.war.src}</code>
+ should be included in the web application. All files are included
+ by default.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.war.src.excludes</td>
+ <td>Yes</td>
+ <td>
+ Comma or space separated list of Ant path patterns specifycing
+ what files and directories from <code>${maven.war.src}</code>
+ should be exluded from the web application. No files are excluded
+ by default.
+ </td>
+ </tr>
+ <tr>
<td>maven.war.webxml</td>
<td>Yes</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/plugins-build/war/xdocs changes.xml
properties.xml
Posted by di...@multitask.com.au.
> +maven.war.src.excludes=**/package.html
and
> + <td>maven.war.src.excludes</td>
> + <td>Yes</td>
> + <td>
> + Comma or space separated list of Ant path patterns
specifycing
> + what files and directories from
<code>${maven.war.src}</code>
> + should be exluded from the web application. No files
> are excluded
> + by default.
> + </td>
Conflict with each other.
There's also a typo on the spelling of 'exclude' above, and
> +# Files to include and exclude from ejb
> +# Note: Files are relative to build.dir
the files are from the war not the ejb and
are not relative to the build directory.
--
dIon Gillard, Multitask Consulting
Blog: http://blogs.codehaus.org/people/dion/
evenisse@apache.org wrote on 02/09/2003 11:37:03 PM:
> evenisse 2003/09/02 06:37:03
>
> Modified: src/plugins-build/war plugin.jelly plugin.properties
> src/plugins-build/war/xdocs changes.xml properties.xml
> Log:
> MAVEN-764. Accept includes/excludes patterns over maven.war.src.
> Thanks to Rafal Krzewski.
>
> Revision Changes Path
> 1.27 +4 -1 maven/src/plugins-build/war/plugin.jelly
>
> Index: plugin.jelly
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
> retrieving revision 1.26
> retrieving revision 1.27
> diff -u -r1.26 -r1.27
> --- plugin.jelly 19 Aug 2003 04:45:05 -0000 1.26
> +++ plugin.jelly 2 Sep 2003 13:37:03 -0000 1.27
> @@ -92,7 +92,10 @@
>
> <j:if test="${webSourcesPresent == 'true'}">
> <ant:copy todir="${maven.war.webapp.dir}">
> - <ant:fileset dir="${maven.war.src}"/>
> + <ant:fileset dir="${maven.war.src}"
> + includes="${maven.war.src.includes}"
> + excludes="${maven.war.src.excludes}">
> + </ant:fileset>
> </ant:copy>
> </j:if>
>
>
>
>
> 1.4 +4 -0 maven/src/plugins-build/war/plugin.properties
>
> Index: plugin.properties
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- plugin.properties 2 Jul 2003 10:34:48 -0000 1.3
> +++ plugin.properties 2 Sep 2003 13:37:03 -0000 1.4
> @@ -19,3 +19,7 @@
> # ${maven.war.build.dir}/${pom.artifactId}
> maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
> maven.war.tld.dir=WEB-INF/tld
> +# Files to include and exclude from ejb
> +# Note: Files are relative to build.dir
> +maven.war.src.includes=**
> +maven.war.src.excludes=**/package.html
>
>
>
> 1.10 +3 -0 maven/src/plugins-build/war/xdocs/changes.xml
>
> Index: changes.xml
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- changes.xml 5 Aug 2003 09:24:30 -0000 1.9
> +++ changes.xml 2 Sep 2003 13:37:03 -0000 1.10
> @@ -8,6 +8,9 @@
> <body>
>
> <release version="1.4" date="in CVS">
> + <action dev="rafal" type="add">
> + Accept includes/excludes patterns over maven.war.src.
> + </action>
> <action dev="evenisse" type="fix">
> Allow webapp creation if project doesn't have sources.
> </action>
>
>
>
> 1.5 +20 -0 maven/src/plugins-build/war/xdocs/properties.xml
>
> Index: properties.xml
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/properties.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- properties.xml 1 Aug 2003 04:21:02 -0000 1.4
> +++ properties.xml 2 Sep 2003 13:37:03 -0000 1.5
> @@ -21,6 +21,26 @@
> </td>
> </tr>
> <tr>
> + <td>maven.war.src.includes</td>
> + <td>Yes</td>
> + <td>
> + Comma or space separated list of Ant path patterns
specifycing
> + what files and directories from
<code>${maven.war.src}</code>
> + should be included in the web application. All files
> are included
> + by default.
> + </td>
> + </tr>
> + <tr>
> + <td>maven.war.src.excludes</td>
> + <td>Yes</td>
> + <td>
> + Comma or space separated list of Ant path patterns
specifycing
> + what files and directories from
<code>${maven.war.src}</code>
> + should be exluded from the web application. No files
> are excluded
> + by default.
> + </td>
> + </tr>
> + <tr>
> <td>maven.war.webxml</td>
> <td>Yes</td>
> <td>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>