Dion! Can you check my second commit from yesterday? I hope that I fixed all the issues.
Michal > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Wednesday, July 02, 2003 2:57 AM > To: Maven Developers List > Subject: Re: cvs commit: maven/src/plugins-build/ear/xdocs changes.xml > > [EMAIL PROTECTED] wrote on 01/07/2003 06:45:14 PM: > > > michal 2003/07/01 01:45:14 > > > > Modified: src/plugins-build/ear plugin.jelly > > src/plugins-build/ear/xdocs changes.xml > > Log: > > o Iterating over artifacts not deps > > > > o Added deploy, deploy-snapshot and install-shapshot goals > > > > Revision Changes Path > > 1.9 +77 -21 maven/src/plugins-build/ear/plugin.jelly > > > > Index: plugin.jelly > > =================================================================== > > RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v > > retrieving revision 1.8 > > retrieving revision 1.9 > > diff -u -r1.8 -r1.9 > > --- plugin.jelly 17 Jun 2003 17:57:47 -0000 1.8 > > +++ plugin.jelly 1 Jul 2003 08:45:13 -0000 1.9 > > @@ -6,6 +6,7 @@ > > xmlns:license="license" > > xmlns:util="jelly:util" > > xmlns:x="jelly:xml" > > + xmlns:artifact="artifact" > > > > > > > > <!--==================================================================--> > > @@ -48,7 +49,8 @@ > > excludes="**/META-INF/application.xml"/> > > > > <!-- include marked dependencies --> > > - <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('ear.bundle')=='true'}"> > > <ant:echo>Bundling: ${dep.type}</ant:echo> > > <j:choose> > > @@ -57,8 +59,8 @@ > > <ant:include name="${dep.artifact}"/> > > </ant:fileset> > > </j:when> > > - <j:when test="${dep.type == 'war' }"> > > - <ant:fileset dir="${maven.repo.local}/${dep. > > artifactDirectory}/wars/"> > > + <j:when test="${dep.type == 'ear' }"> > > + <ant:fileset dir="${maven.repo.local}/${dep. > > artifactDirectory}/ears/"> > I don't get this. Since when do ears get bundled into ear files?? Why was > this changed from war? > > And do we really want to use dep.artifactDirectory again rather than > artifact.path? > > [snip] > > > <!--==================================================================--> > > <!-- Creates ear descriptor - application.xml file --> > > @@ -132,14 +121,15 @@ > > > > > <x:element name="application"> > > <x:element > name="display-name">${maven.ear.displayname}</x:element> > > - <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('ear.bundle')=='true'}"> > > <j:choose> > > - <j:when test="${dep.type=='war'}"> > > + <j:when test="${dep.type=='ear'}"> > Again, > why is an ear file being bundled within an ear? This makes no sense... > > > -- > dIon Gillard, Multitask Consulting > Blog: http://blogs.codehaus.org/people/dion/ > Work: http://www.multitask.com.au --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
