oh yes, sorry.

Emmanuel

----- Original Message ----- 
From: "Eric Pugh" <[EMAIL PROTECTED]>
To: "Maven Developers List" <[EMAIL PROTECTED]>
Sent: Friday, October 15, 2004 10:40 AM
Subject: RE: cvs commit: maven-plugins/eclipse/xdocs changes.xml


> Should this be using this syntax:
> 
>   <maven:makeRelativePath var="srcDir" basedir="${basedir}"
> path="${pom.build.sourceDirectory}" separator="/"/>
> 
> instead of the invokeStatic:
> 
>         <j:invokeStatic var="resourceDirectory"
> className="org.apache.maven.MavenUtils" method="makeRelativePath">
>           <j:arg value="${file}"/>
>           <j:arg value="${resource.directory}"/>
>         </j:invokeStatic>
> 
> Not sure if there was a reason to not use this?
> 
> Eric
> 
> > -----Original Message-----
> > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> > Sent: Thursday, October 14, 2004 4:25 PM
> > To: [EMAIL PROTECTED]
> > Subject: cvs commit: maven-plugins/eclipse/xdocs changes.xml
> >
> >
> > evenisse    2004/10/14 08:24:51
> >
> >   Modified:    eclipse/src/plugin-resources/templates classpath.jelly
> >                eclipse/xdocs changes.xml
> >   Log:
> >   MPECLIPSE-47. Add resources directories and test resources
> > directories to .classpath.
> >
> >   Revision  Changes    Path
> >   1.23      +28 -0
> > maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly
> >
> >   Index: classpath.jelly
> >   ===================================================================
> >   RCS file:
> > /home/cvs/maven-plugins/eclipse/src/plugin-resources/templates/cla
> > sspath.jelly,v
> >   retrieving revision 1.22
> >   retrieving revision 1.23
> >   diff -u -r1.22 -r1.23
> >   --- classpath.jelly 8 Oct 2004 15:46:48 -0000 1.22
> >   +++ classpath.jelly 14 Oct 2004 15:24:51 -0000 1.23
> >   @@ -54,6 +54,19 @@
> >          </j:if>
> >        </j:forEach>
> >        <classpathentry kind="src" path="${srcDir}"
> > excluding="${excluding}" />
> >   +
> >   +    <j:if test="${!pom.build.resources.isEmpty()}">
> >   +      <j:forEach var="resource" items="${pom.build.resources}">
> >   +        <j:new var="file" className="java.io.File">
> >   +          <j:arg value="${basedir}"/>
> >   +        </j:new>
> >   +        <j:invokeStatic var="resourceDirectory"
> > className="org.apache.maven.MavenUtils" method="makeRelativePath">
> >   +          <j:arg value="${file}"/>
> >   +          <j:arg value="${resource.directory}"/>
> >   +        </j:invokeStatic>
> >   +        <classpathentry kind="src" path="${resourceDirectory}"/>
> >   +      </j:forEach>
> >   +    </j:if>
> >      </j:if>
> >
> >      <!-- Add the list of additional directories for the
> > classpath from ${maven.eclipse.classpath.include}-->
> >   @@ -108,6 +121,21 @@
> >        <j:if test="${depVersion != 'none'}">
> >          <j:set var="ignoreJUnit" value="true" />
> >          <classpathentry kind="var"
> > path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
> >   +    </j:if>
> >   +
> >   +    <j:if test="${pom.build.unitTest != null}">
> >   +      <j:if test="${!pom.build.unitTest.resources.isEmpty()}">
> >   +        <j:forEach var="resource"
> > items="${pom.build.unitTest.resources}">
> >   +          <j:new var="file" className="java.io.File">
> >   +            <j:arg value="${basedir}"/>
> >   +          </j:new>
> >   +          <j:invokeStatic var="resourceDirectory"
> > className="org.apache.maven.MavenUtils" method="makeRelativePath">
> >   +            <j:arg value="${file}"/>
> >   +            <j:arg value="${resource.directory}"/>
> >   +          </j:invokeStatic>
> >   +          <classpathentry kind="src"
> > path="${resourceDirectory}" output="${testOutputDir}"/>
> >   +        </j:forEach>
> >   +      </j:if>
> >        </j:if>
> >      </j:if>
> >
> >
> >
> >
> >   1.32      +1 -0      maven-plugins/eclipse/xdocs/changes.xml
> >
> >   Index: changes.xml
> >   ===================================================================
> >   RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
> >   retrieving revision 1.31
> >   retrieving revision 1.32
> >   diff -u -r1.31 -r1.32
> >   --- changes.xml 8 Oct 2004 15:46:48 -0000 1.31
> >   +++ changes.xml 14 Oct 2004 15:24:51 -0000 1.32
> >   @@ -25,6 +25,7 @@
> >      </properties>
> >      <body>
> >        <release version="1.9" date="in cvs">
> >   +      <action dev="evenisse" type="fix"
> > issue="MPECLIPSE-47">Add resources directories and test resources
> > directories to .classpath.</action>
> >          <action dev="epugh" type="fix" issue="MPECLIPSE-46"
> > due-to="Archimedes Trajano">Overriden jar that resides outside
> > maven repo doesn't get resolved properly.</action>
> >          <action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar
> > overrides are now properly supported.</action>
> >        </release>
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > 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]

Reply via email to