cvs commit: maven/src/plugins-build/war/xdocs changes.xml goals.xml
michal 2003/07/05 10:10:45
Modified:src/plugins-build/war plugin.jelly
src/plugins-build/war/xdocs changes.xml goals.xml
Log:
war:clean goal was added
Revision ChangesPath
1.24 +13 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 2 Jul 2003 12:21:00 - 1.23
+++ plugin.jelly 5 Jul 2003 17:10:45 - 1.24
@@ -185,6 +185,19 @@
project=${pom}/
/goal
+
+
+ !--==--
+ !-- Clean--
+ !--==--
+goal name=war:clean
+description=Remove all artifacts created by war plugin
+
+ !-- TODO: delete also snapshot and md5 files --
+ ant:delete dir=${maven.war.webapp.dir}/
+ ant:delete file=${maven.war.build.dir}/${maven.war.final.name}
quiet=true failonerror=false/
+/goal
+
!--==--
!-- Special no-op goal which can be used by other plugin which need --
1.8 +4 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 2 Jul 2003 10:34:48 - 1.7
+++ changes.xml 5 Jul 2003 17:10:45 - 1.8
@@ -9,6 +9,9 @@
release version=1.4 date=in CVS
action dev=michal type=fix
+ Added war:clean goal
+ /action
+ action dev=michal type=fix
war:war goal is simply packaging
(using ant jar task) the directory created
by war:webapp goal. This change simplifies
@@ -16,7 +19,7 @@
and removes code duplication.
/action
action dev=michal type=fix
-Fixes for MAVEN-481.
+Fi xes for MAVEN-481.
Bundling of tlds in war is supported.
/action
action dev=michal type=fix
1.4 +5 -0 maven/src/plugins-build/war/xdocs/goals.xml
Index: goals.xml
===
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/goals.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- goals.xml 2 Jul 2003 10:34:48 - 1.3
+++ goals.xml 5 Jul 2003 17:10:45 - 1.4
@@ -50,6 +50,11 @@
namewar:deploy-snapshot/name
descriptionDeploy the snapshot version of the war to the remote
repository(ies)/description
/goal
+ goal
+namewar:clean/name
+descriptionDelete all artifacts created by war plugin/description
+ /goal
+
/goals
/body
/document
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml goals.xml
Is the dep.type check here really necessary? If the user has added the
war.bundle property, then I say let it go in there. It could be an
ejb-client jar file in which case the type may not be jar.
- ant:lib dir=${maven.repo.local}/${dep.
artifactDirectory}/jars/
-ant:include name=${dep.artifact}/
+j:if test=${dep.getProperty('war.bundle')=='true' and
dep.type =='jar'}
Ditto.
For the moment only jars can go into war.
I made this type-sensitive bundling while I was planning
to support also other types of artifacts (e.g. tld).
Those artifacts sometimes should be bundled is a different way and in some
cases won't go to WEB-INF\lib.
I hope that more complex artifact like webcomponent (e.g collection of
css, js, images) will be supported in near feature.
If you feel that current implementation is to strict we can change it.
BTW: It will be nice to have selectors of artifact
Pom.getArtifcats(jar, war.bundle)
Will return all jars which should be bundled in the war.
Michal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/war/xdocs changes.xml goals.xml
michal 2003/07/01 07:58:52
Modified:src/plugins-build/war plugin.jelly
src/plugins-build/war/xdocs changes.xml goals.xml
Log:
Fixes for MAVEN-518.
Artifact processing in the plugin was slightly changed and now it supports jar
overriding mechanism
Revision ChangesPath
1.21 +14 -11maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 1 Jul 2003 08:43:51 - 1.20
+++ plugin.jelly 1 Jul 2003 14:58:52 - 1.21
@@ -49,21 +49,24 @@
/ant:fileset
/j:if
- j:forEach var=dep items=${pom.dependencies}
+ j:forEach var=lib items=${pom.artifacts}
+j:set var=dep value=${lib.dependency}/
+j:set var=bundle value=false/
j:if test=${dep.getProperty('war.bundle.jar')=='true'}
ant:echo
DEPRECATION WARNING:
-Use : war.bundle instead of war.bundle.jar
+Use : war.bundle instead of war.bundle.jar
/ant:echo
- ant:lib dir=${maven.repo.local}/${dep.artifactDirectory}/jars/
-ant:include name=${dep.artifact}/
- /ant:lib
+ j:set var=bundle value=true/
/j:if
-j:if test=${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }
- ant:lib dir=${maven.repo.local}/${dep.artifactDirectory}/jars/
-ant:include name=${dep.artifact}/
+j:if test=${dep.getProperty('war.bundle')=='true' and dep.type =='jar'}
+ j:set var=bundle value=true/
+/j:if
+j:if test=${bundle == 'true'}
+ ant:lib dir=${lib.file.parent}
+ant:include name=${lib.file.name}/
/ant:lib
-/j:if
+/j:if
/j:forEach
j:if test=${sourcesPresent == 'true'}
@@ -131,7 +134,7 @@
j:set var=dep value=${lib.dependency}/
j:if test=${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }
ant:copy todir=${webapp.build.lib}
-
file=${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}/
+ file=${lib.path}/
/j:if
j:if test=${dep.getProperty('war.bundle.jar')=='true'}
ant:echo
@@ -139,7 +142,7 @@
Use : war.bundle instead of war.bundle.jar
/ant:echo
ant:copy todir=${webapp.build.lib}
- file=${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}/
+ file=${lib.path}/
/j:if
/j:forEach
1.6 +7 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 1 Jul 2003 08:43:51 - 1.5
+++ changes.xml 1 Jul 2003 14:58:52 - 1.6
@@ -8,15 +8,18 @@
body
release version=1.4 date=in CVS
- action dev=dion type=fix due-to=Ben Hogan
-Allow war file to be updated
- /action
action dev=michal type=fix
-Iterating artifacts not depedencies
+Fixes for MAVEN-518.
+Artifact processing in the plugin
+was slightly changed and now
+it supports jar overriding mechanism
/action
action dev=michal type=add
Added deploy, deploy-snapshot and install-snapshot goals
/action
+ action dev=dion type=fix due-to=Ben Hogan
+Allow war file to be updated
+ /action
/release
release version=1.3 date=2002-04-08
1.2 +12 -0 maven/src/plugins-build/war/xdocs/goals.xml
Index: goals.xml
===
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 24 Jan 2003 03:46:24 - 1.1
+++ goals.xml 1 Jul 2003 14:58:52 - 1.2
@@ -20,6 +20,18 @@
descriptionInstall the war in the local repository/description
/goal
goal
+namewar:install-snapshot/name
+descriptionInstall the snapshot version of the war in the local
repository/description
+ /goal
+ goal
+namewar:deploy/name
+descriptionDeploy the war to the remote repository(ies)/description
+ /goal
+ goal
+
