Author: baerrach
Date: Thu Sep 11 21:39:45 2008
New Revision: 694602
URL: http://svn.apache.org/viewvc?rev=694602&view=rev
Log:
Changed EclipseSourceDir so that path is always stored with / and not \s.
Modified unit test to use input path containing \\ and check that the results
does not contain \\ but uses /
Changed expected .classpath for project-34 to use /s in file.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=694602&r1=694601&r2=694602&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
Thu Sep 11 21:39:45 2008
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugin.eclipse;
+import org.apache.maven.plugin.ide.IdeUtils;
+
/**
* Represent an eclipse source dir. Eclipse has no "main", "test" or
"resource" concepts, so two source dirs with the
* same path are equal.
@@ -45,7 +47,7 @@
public EclipseSourceDir( String path, String output, boolean isResource,
boolean test, String include,
String exclude, boolean filtering )
{
- this.path = path;
+ setPath( path );
this.output = output;
this.isResource = isResource;
this.test = test;
@@ -126,12 +128,13 @@
/**
* Setter for <code>path</code>.
+ * Converts \\ to / in path.
*
* @param path The path to set.
*/
public void setPath( String path )
{
- this.path = path;
+ this.path = IdeUtils.fixSeparator( path );
}
/**
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=694602&r1=694601&r2=694602&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
Thu Sep 11 21:39:45 2008
@@ -74,7 +74,7 @@
EclipseSourceDir dir =
new EclipseSourceDir( "src/main/resources", "target/classes",
true, false, null, null, false );
EclipseSourceDir testDir =
- new EclipseSourceDir( "src/test/resources",
"target/classes/test-resources", true, true, null, null, false );
+ new EclipseSourceDir( "src\\test\\resources",
"target/classes/test-resources", true, true, null, null, false );
EclipseSourceDir[] dirs = { dir, testDir };
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath?rev=694602&r1=694601&r2=694602&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
Thu Sep 11 21:39:45 2008
@@ -1,6 +1,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="target\generated-resources\eclipse"
excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"
excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
