cvs commit: maven/src/plugins-build/war/xdocs changes.xml
vmassol 2003/09/29 08:14:19
Modified:src/plugins-build/war plugin.jelly project.xml
src/plugins-build/war/xdocs changes.xml
Log:
Use the new caller plugin
Revision ChangesPath
1.31 +3 -2 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plugin.jelly 24 Sep 2003 05:34:50 - 1.30
+++ plugin.jelly 29 Sep 2003 15:14:19 - 1.31
@@ -4,7 +4,8 @@
xmlns:license=license
xmlns:util=jelly:util
xmlns:ant=jelly:ant
- xmlns:artifact=artifact
+ xmlns:artifact=artifact
+ xmlns:caller=caller
!--==--
!-- Default goal : Builds a war file --
@@ -21,7 +22,7 @@
file=${maven.war.src}/
j:if test=${sourcesPresent == 'true'}
- attainGoal name=java:compile/
+ caller:call goalInterface=compile-java/
attainGoal name=test:test/
/j:if
1.15 +10 -4 maven/src/plugins-build/war/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven/src/plugins-build/war/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 29 Sep 2003 05:19:14 - 1.14
+++ project.xml 29 Sep 2003 15:14:19 - 1.15
@@ -5,7 +5,7 @@
pomVersion3/pomVersion
idmaven-war-plugin/id
nameMaven WAR Plugin/name
- currentVersion1.4/currentVersion
+ currentVersion1.5-SNAPSHOT/currentVersion
descriptionWar Plugin for Maven/description
shortDescriptionWar Plugin for Maven/shortDescription
urlhttp://maven.apache.org/reference/plugins/war//url
@@ -14,7 +14,13 @@
connectionscm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/war//connection
urlhttp://cvs.apache.org/viewcvs/maven/src/plugins-build/war//url
/repository
- versions/
+ versions
+version
+ id1.5/id
+ name1.5/name
+ tagHEAD/tag
+/version
+ /versions
branches/
mailingLists/
developers
@@ -39,8 +45,8 @@
developer
nameVincent Massol/name
idvmassol/id
- email[EMAIL PROTECTED]/email
- organizationOcto Technology/organization
+ email[EMAIL PROTECTED]/email
+ organizationPivolis/organization
roles
roleJava Developer/role
/roles
1.15 +8 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 29 Sep 2003 06:27:58 - 1.14
+++ changes.xml 29 Sep 2003 15:14:19 - 1.15
@@ -2,10 +2,17 @@
document
properties
titleChanges/title
-author email=[EMAIL PROTECTED]Vincent Massol/author
+author email=[EMAIL PROTECTED]Vincent Massol/author
/properties
body
+
+release version=1.5 date=in CVS
+ action dev=vmassol type=add
+Use the new codecaller/code plugin to isolate the
+java compilation goal called from its implementation.
+ /action
+/release
release version=1.4 date=2003-09-29
action dev=dion type=update
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven/src/plugins-build/war/xdocs changes.xml
dion2003/09/23 07:46:53 Modified:src/plugins-build/war/xdocs changes.xml Log: Use sample project as test bed Revision ChangesPath 1.12 +1 -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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- changes.xml 3 Sep 2003 09:23:55 - 1.11 +++ changes.xml 23 Sep 2003 14:46:52 - 1.12 @@ -8,6 +8,7 @@ body release version=1.4 date=in CVS + action dev=dion type=updateAdd test project/action action dev=evenisse type=add Added maven.war.index property. /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/war/xdocs changes.xml properties.xml
[EMAIL PROTECTED] wrote: Index: plugin.properties === RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin.properties 3 Sep 2003 08:31:02 - 1.5 +++ plugin.properties 3 Sep 2003 09:23:55 - 1.6 @@ -3,6 +3,7 @@ # --- # War plugin. # --- +maven.jar.index=true ^^^ typo R. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven/src/plugins-build/war/xdocs changes.xml properties.xml
Done. Thanks. - Original Message - From: Rafal Krzewski [EMAIL PROTECTED] To: Maven Developers List [EMAIL PROTECTED] Sent: Wednesday, September 03, 2003 3:22 PM Subject: Re: cvs commit: maven/src/plugins-build/war/xdocs changes.xml properties.xml [EMAIL PROTECTED] wrote: Index: plugin.properties === RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin.properties 3 Sep 2003 08:31:02 - 1.5 +++ plugin.properties 3 Sep 2003 09:23:55 - 1.6 @@ -3,6 +3,7 @@ # --- # War plugin. # --- +maven.jar.index=true ^^^ typo R. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France _ Envie de discuter en live avec vos amis ? Télécharger MSN Messenger http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France - 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/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
michal 2003/07/01 01:43:52
Modified:src/plugins-build/war plugin.jelly project.xml
src/plugins-build/war/xdocs changes.xml
Log:
Iterating over artifacts not deps
Revision ChangesPath
1.20 +4 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 19 Jun 2003 14:01:51 - 1.19
+++ plugin.jelly 1 Jul 2003 08:43:51 - 1.20
@@ -125,8 +125,10 @@
/ant:copy
/j:if
-j:forEach var=dep items=${pom.dependencies}
-
+
+
+j:forEach var=lib items=${pom.artifacts}
+ 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}/
1.12 +10 -1 maven/src/plugins-build/war/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven/src/plugins-build/war/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 13 Apr 2003 02:32:15 - 1.11
+++ project.xml 1 Jul 2003 08:43:51 - 1.12
@@ -28,6 +28,15 @@
/roles
/developer
developer
+ nameMichal Maczka/name
+ idmichal/id
+ email[EMAIL PROTECTED]/email
+ organizationDimatics/organization
+ roles
+roleJava Developer/role
+ /roles
+/developer
+developer
nameVincent Massol/name
idvmassol/id
email[EMAIL PROTECTED]/email
@@ -35,7 +44,7 @@
roles
roleJava Developer/role
/roles
-/developer
+/developer
/developers
dependencies/
/project
1.5 +6 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 13 Apr 2003 02:35:12 - 1.4
+++ changes.xml 1 Jul 2003 08:43:51 - 1.5
@@ -11,6 +11,12 @@
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
+ /action
+ action dev=michal type=add
+Added deploy, deploy-snapshot and install-snapshot goals
+ /action
/release
release version=1.3 date=2002-04-08
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml
Hi Michal, -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 01 July 2003 10:44 To: [EMAIL PROTECTED] Subject: cvs commit: maven/src/plugins-build/war/xdocs changes.xml [snip] Index: changes.xml === RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 13 Apr 2003 02:35:12 - 1.4 +++ changes.xml 1 Jul 2003 08:43:51 - 1.5 @@ -11,6 +11,12 @@ 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 + /action Can you please explain better in changes.xml why you did that (the reason for it)? There are also some typos: Iterating over artifacts and dependencies. Also, I think the rule is to have new changes added first in the list so that the list always contains the latest changes first. Thanks -Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml
Sorry! I'll try to be clearer next time. I will also fix/improve those comments It was a fix for Issue#518 regards Michal -Original Message- From: Vincent Massol [mailto:[EMAIL PROTECTED] Sent: Tuesday, July 01, 2003 11:52 AM To: 'Maven Developers List' Subject: RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml Hi Michal, -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 01 July 2003 10:44 To: [EMAIL PROTECTED] Subject: cvs commit: maven/src/plugins-build/war/xdocs changes.xml [snip] Index: changes.xml === RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 13 Apr 2003 02:35:12 - 1.4 +++ changes.xml 1 Jul 2003 08:43:51 - 1.5 @@ -11,6 +11,12 @@ 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 + /action Can you please explain better in changes.xml why you did that (the reason for it)? There are also some typos: Iterating over artifacts and dependencies. Also, I think the rule is to have new changes added first in the list so that the list always contains the latest changes first. Thanks -Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml
I am working on other problems with war plugin to completely fix Issue 518 ... so don't worry Vincent! mm -Original Message- From: Michal Maczka [mailto:[EMAIL PROTECTED] Sent: Tuesday, July 01, 2003 12:47 PM To: 'Maven Developers List' Subject: RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml Sorry! I'll try to be clearer next time. I will also fix/improve those comments It was a fix for Issue#518 regards Michal -Original Message- From: Vincent Massol [mailto:[EMAIL PROTECTED] Sent: Tuesday, July 01, 2003 11:52 AM To: 'Maven Developers List' Subject: RE: cvs commit: maven/src/plugins-build/war/xdocs changes.xml Hi Michal, -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 01 July 2003 10:44 To: [EMAIL PROTECTED] Subject: cvs commit: maven/src/plugins-build/war/xdocs changes.xml [snip] Index: changes.xml === RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 13 Apr 2003 02:35:12 - 1.4 +++ changes.xml 1 Jul 2003 08:43:51 - 1.5 @@ -11,6 +11,12 @@ 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 + /action Can you please explain better in changes.xml why you did that (the reason for it)? There are also some typos: Iterating over artifacts and dependencies. Also, I think the rule is to have new changes added first in the list so that the list always contains the latest changes first. Thanks -Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - 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
+
