You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by bw...@apache.org on 2003/02/03 10:21:58 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/eclipse/xdocs properties.xml

bwalding    2003/02/03 01:21:58

  Modified:    src/plugins-build/eclipse plugin.jelly plugin.properties
               src/plugins-build/eclipse/xdocs properties.xml
  Log:
  MAVEN-247: Add JUnit to classpath as required
  
  Revision  Changes    Path
  1.2       +8 -2      jakarta-turbine-maven/src/plugins-build/eclipse/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/eclipse/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly	24 Jan 2003 03:45:09 -0000	1.1
  +++ plugin.jelly	3 Feb 2003 09:21:58 -0000	1.2
  @@ -34,8 +34,10 @@
   	</j:file>
   
       <echo>Creating ${basedir}/.classpath ...</echo>
  -
  -	<j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
  +    <j:set var="maven-eclipse-junit"
  +       value="${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit')}"/>
  +	<echo>${pom.getPluginContext('maven-eclipse-plugin').getVariables()}</echo>
  +    <j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
         <classpath>
   
           <j:if test="${sourcesPresent}">
  @@ -44,6 +46,10 @@
   
           <j:if test="${unitTestSourcesPresent}">
             <classpathentry kind="src" path="${pom.build.unitTestSourceDirectory}"/>
  +	      
  +	      <j:if test="${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit') != ''}">
  +	        <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit')}.jar"/>
  +          </j:if>
           </j:if>
   
           <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
  
  
  
  1.2       +1 -0      jakarta-turbine-maven/src/plugins-build/eclipse/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/eclipse/plugin.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.properties	24 Jan 2003 03:45:09 -0000	1.1
  +++ plugin.properties	3 Feb 2003 09:21:58 -0000	1.2
  @@ -8,3 +8,4 @@
   # This accepts two values: 'all' for all the goals, 
   # and 'plugins' to generate only the plugins' default goals.
   maven.eclipse.goals = plugins
  +maven.eclipse.junit = 3.8.1
  \ No newline at end of file
  
  
  
  1.2       +9 -0      jakarta-turbine-maven/src/plugins-build/eclipse/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/eclipse/xdocs/properties.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- properties.xml	24 Jan 2003 03:45:09 -0000	1.1
  +++ properties.xml	3 Feb 2003 09:21:58 -0000	1.2
  @@ -29,6 +29,15 @@
               </p>
             </td>
           </tr>
  +        <tr>
  +          <td>maven.eclipse.junit</td>
  +          <td>Yes (default=3.8.1)</td>
  +          <td>
  +			The version of JUnit you want added to your project. If this
  +			property is set to an empty string, JUnit will not be added to your 
  +			build classpath.
  +          </td>
  +        </tr>
         </table>
   	  <p>
   		Note that you will need to defined a <code>MAVEN_REPO</code> Java