dion        2003/10/29 10:40:06

  Modified:    eclipse/src/plugin-resources/templates classpath.jelly
  Log:
  Start using pluginVar tag
  
  Revision  Changes    Path
  1.7       +17 -17    
maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly
  
  Index: classpath.jelly
  ===================================================================
  RCS file: 
/home/cvs/maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- classpath.jelly   18 Oct 2003 21:39:43 -0000      1.6
  +++ classpath.jelly   29 Oct 2003 18:40:06 -0000      1.7
  @@ -21,8 +21,7 @@
       <!-- Eclipse supports an output directory per input directory -->
       <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
       <j:if test="${empty testOutputDir}">
  -      <j:set var="testOutputDir" 
  -             
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>  
    
  +      <maven:pluginVar var="testOutputDir" plugin='maven-test-plugin' 
property='maven.test.dest'/>      
       </j:if>
   
       <maven:makeRelativePath var="testOutputDir" basedir="${basedir}" 
path="${testOutputDir}" />
  @@ -47,7 +46,8 @@
         -->
       <j:set var="verX" value="${maven.eclipse.junit}X"/>
   
  -    <j:set 
var="depVersion">${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getDependency('junit').getVersion()}</j:set>
  +    <maven:pluginVar var="testPlugin" plugin='maven-test-plugin' property='plugin' 
/>
  +    <j:set 
var="depVersion">${testPlugin.getDependency('junit').getVersion()}</j:set>
     
       <j:if test="${pom.getDependency('junit') != null}">
         <j:set var="depVersion" value="${pom.getDependency('junit').getVersion()}"/>
  @@ -66,20 +66,20 @@
       </j:if>
     </j:if>
   
  -  <j:set var="cactusSrcDir"
  -      
value="${pom.getPluginContext('maven-cactus-plugin').getVariable('cactus.src.dir')}"/>
  -    <util:available file="${cactusSrcDir}">
  -      <j:set var="cactusSourcePresent" value="true"/>
  -    </util:available>
  -
  -    <j:if test="${cactusSourcePresent == 'true'}">
  -      <ant:echo>Contains Cactus Tests!</ant:echo>
  -      <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" 
path="${cactusSrcDir}" />
  -      <classpathentry kind="src" path="${testSrcDir}"/>
  -    
  -      <j:set 
var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
  -      <classpathentry kind="var" 
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
  -    </j:if>
  +  <maven:pluginVar var="cactusSrcDir" plugin='maven-cactus-plugin' 
property='cactus.src.dir' />
  +  <util:available file="${cactusSrcDir}">
  +    <j:set var="cactusSourcePresent" value="true"/>
  +  </util:available>
  +
  +  <j:if test="${cactusSourcePresent == 'true'}">
  +    <ant:echo>Contains Cactus Tests!</ant:echo>
  +    <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" 
path="${cactusSrcDir}" />
  +    <classpathentry kind="src" path="${testSrcDir}"/>
  +
  +    <maven:pluginVar var="cactusPlugin" plugin='maven-cactus-plugin' 
property='plugin' />
  +    <j:set 
var="depVersion">${cactusPlugin.getDependency('cactus').getVersion()}</j:set>
  +    <classpathentry kind="var" 
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
  +  </j:if>
   
     <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" 
sourcepath="JRE_SRC"/>
       <j:forEach var="lib" items="${pom.artifacts}">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to