Author: fgiust
Date: Wed Apr 5 15:20:15 2006
New Revision: 391833
URL: http://svn.apache.org/viewcvs?rev=391833&view=rev
Log:
MECLIPSE-89 Eclipse plugin should not try to resolve system dependencies paths
relatively to project location.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/sysdep.jar
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java?rev=391833&r1=391832&r2=391833&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
Wed Apr 5 15:20:15 2006
@@ -199,7 +199,7 @@
if ( dep.isSystemScoped() )
{
handle = "module:/classpath/lib/" //$NON-NLS-1$
- + IdeUtils.toRelativeAndFixSeparator( basedir, repoFile,
false );
+ + IdeUtils.toRelativeAndFixSeparator(
getEclipseProjectDirectory(), repoFile, false );
}
else
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=391833&r1=391832&r2=391833&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Wed Apr 5 15:20:15 2006
@@ -169,7 +169,7 @@
if ( dep.isAddedToClasspath() )
{
- addDependency( writer, dep, localRepository, projectBaseDir );
+ addDependency( writer, dep, localRepository );
}
}
@@ -179,8 +179,7 @@
}
- private void addDependency( XMLWriter writer, IdeDependency dep,
ArtifactRepository localRepository,
- File projectBaseDir )
+ private void addDependency( XMLWriter writer, IdeDependency dep,
ArtifactRepository localRepository )
throws MojoExecutionException
{
@@ -206,7 +205,7 @@
if ( dep.isSystemScoped() )
{
- path = IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
artifactPath, false );
+ path = IdeUtils.toRelativeAndFixSeparator(
getEclipseProjectDirectory(), artifactPath, false );
if ( getLog().isDebugEnabled() )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=391833&r1=391832&r2=391833&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Apr 5 15:20:15 2006
@@ -162,4 +162,14 @@
testProject( "project-17" );
}
+ /**
+ * relative location of system dependencies - MECLIPSE-89
+ * @throws Exception any exception thrown during test
+ */
+ public void testProject18()
+ throws Exception
+ {
+ testProject( "project-18" );
+ }
+
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/classpath
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/classpath?rev=391833&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/classpath
Wed Apr 5 15:20:15 2006
@@ -0,0 +1,5 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib"
path="${basedir}/src/test/projects/project-18/sysdep.jar"/>
+</classpath>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml?rev=391833&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
Wed Apr 5 15:20:15 2006
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-18</artifactId>
+ <version>18</version>
+ <name>maven-eclipse-plugin-test-project-18</name>
+ <dependencies>
+ <dependency>
+ <groupId>sysdep</groupId>
+ <artifactId>sysdep</artifactId>
+ <version>98.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/sysdep.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <outputDir>../../../../target/project-18-test/</outputDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/project
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/project?rev=391833&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/project
Wed Apr 5 15:20:15 2006
@@ -0,0 +1,21 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-18</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>pom.xml</name>
+ <type>1</type>
+
<location>D:/apps/maven/plugins/maven-eclipse-plugin/src/test/projects/project-18/pom.xml</location>
+ </link>
+ </linkedResources>
+</projectDescription>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/sysdep.jar
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-18/sysdep.jar?rev=391833&view=auto
==============================================================================
(empty)
