You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2006/04/05 11:43:58 UTC
svn commit: r391576 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
test/java/org/apache/maven/plugin/eclipse/ test/projects/project-15/
Author: fgiust
Date: Wed Apr 5 02:43:56 2006
New Revision: 391576
URL: http://svn.apache.org/viewcvs?rev=391576&view=rev
Log:
MECLIPSE-11 eclipse:eclipse still setting .classpath's output to wrong directory
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/project
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.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/EclipsePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=391576&r1=391575&r2=391576&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Wed Apr 5 02:43:56 2006
@@ -190,7 +190,8 @@
/**
* The default output directory
*
- * @parameter expression="${project.build.outputDirectory}" alias="outputDirectory"
+ * @parameter expression="${outputDirectory}" alias="outputDirectory" default-value="${project.build.outputDirectory}"
+ * @required
*/
private File buildOutputDirectory;
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=391576&r1=391575&r2=391576&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 02:43:56 2006
@@ -77,6 +77,10 @@
testProject( "project-8" );
}
+ /**
+ * Tests with <code>outputDirectory</code> and <code>outputDir</code>
+ * @throws Exception
+ */
public void testProject9()
throws Exception
{
@@ -123,5 +127,17 @@
throws Exception
{
testProject( "project-14" );
+ }
+
+ /**
+ * <code>outputDirectory</code> parameter - MECLIPSE-11
+ * @throws Exception any exception thrown during test
+ */
+ public void testProject15()
+ throws Exception
+ {
+ Properties props = new Properties();
+ props.put( "outputDirectory", "bin" );
+ testProject( "project-15", props );
}
}
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/classpath
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/classpath?rev=391576&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/classpath Wed Apr 5 02:43:56 2006
@@ -0,0 +1,4 @@
+<classpath>
+ <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml?rev=391576&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml Wed Apr 5 02:43:56 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-15</artifactId>
+ <version>15</version>
+ <name>maven-eclipse-plugin-test-project-15</name>
+</project>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/project
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/project?rev=391576&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-15/project Wed Apr 5 02:43:56 2006
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-15</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file