evenisse 2004/06/08 21:51:38
Modified: eclipse project.xml
eclipse/src/plugin-resources/templates classpath.jelly
eclipse/xdocs changes.xml
Log:
MPECLIPSE-29. Fix classpath generation when tests are not present.
Revision Changes Path
1.33 +1 -1 maven-plugins/eclipse/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 16 May 2004 01:37:37 -0000 1.32
+++ project.xml 9 Jun 2004 04:51:38 -0000 1.33
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-eclipse-plugin</id>
<name>Maven Eclipse Plugin</name>
- <currentVersion>1.7</currentVersion>
+ <currentVersion>1.8-SNAPSHOT</currentVersion>
<description>A plugin to generate various files for the Eclipse IDE and ease the
use of Maven within that environment. Requires Maven 1.0 RC2.</description>
<shortDescription>Eclipse Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/eclipse/</url>
1.13 +15 -8
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- classpath.jelly 25 Apr 2004 16:05:08 -0000 1.12
+++ classpath.jelly 9 Jun 2004 04:51:38 -0000 1.13
@@ -47,6 +47,21 @@
</j:forEach>
<classpathentry kind="src" path="${srcDir}" excluding="${excluding}" />
</j:if>
+
+
+ <!-- Moved out from unitTestSourcePrsent condition since 1.12-->
+
+ <!-- Add the list of additional directories for the classpath from
${maven.eclipse.classpath.include}-->
+
+ <u:tokenize var="maven.eclipse.classpath.include.split"
delim=",">${maven.eclipse.classpath.include}</u:tokenize>
+
+ <!-- add extra directories to be included in the classpath -->
+ <j:forEach var="res" items="${maven.eclipse.classpath.include.split}">
+ <classpathentry kind="src" path="${res}"/>
+ </j:forEach>
+
+
+
<j:if test="${unitTestSourcesPresent}">
<ant:echo>Contains JUnit tests</ant:echo>
@@ -63,14 +78,6 @@
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
<classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
- <!-- split the list of additional directories for the classpath -->
-
- <u:tokenize var="maven.eclipse.classpath.include.split"
delim=",">${maven.eclipse.classpath.include}</u:tokenize>
-
- <!-- add extra directories to be included in the classpath -->
- <j:forEach var="res" items="${maven.eclipse.classpath.include.split}">
- <classpathentry kind="src" path="${res}"/>
- </j:forEach>
<!-- Here are the rules:
If the project has maven.eclipse.junit property, add that ver of junit
1.20 +3 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 16 May 2004 01:37:37 -0000 1.19
+++ changes.xml 9 Jun 2004 04:51:38 -0000 1.20
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.8" date="In CVS">
+ <action dev="evenisse" type="fix" issue="MPECLIPSE-29" due-to="Marc-Antoine
Garrigue">Fix classpath generation when tests are not present</action>
+ </release>
<release version="1.7" date="2004-05-15">
<action dev="dion" type="update" issue="MPECLIPSE-23" due-to="Miguel
Griffa">Document the eclipse.dependency property of the dependency element</action>
<action dev="dion" type="update" issue="MPECLIPSE-25" due-to="Miguel
Griffa">Add maven.eclipse.buildcommands and maven.eclipse.projectnatures properties,
docs and test cases</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
