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 2010/04/06 22:52:36 UTC
svn commit: r931322 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
test/java/org/apache/maven/plugin/eclipse/
test/resources/projects/project-58-MECLIPSE-621/
test/resources/projects/project-58-MECLIPSE-6...
Author: fgiust
Date: Tue Apr 6 20:52:34 2010
New Revision: 931322
URL: http://svn.apache.org/viewvc?rev=931322&view=rev
Log:
MECLIPSE-621 handles merging of resource directories gracefully, no matters if they have different filtering configuration (just warn the user, but don't block)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml (with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java (with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
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/EclipseSourceDirTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=931322&r1=931321&r2=931322&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 Tue Apr 6 20:52:34 2010
@@ -1646,10 +1646,23 @@ public class EclipsePlugin
if ( !directories.add( resourceDir ) )
{
EclipseSourceDir originalDir = (EclipseSourceDir) get( directories, resourceDir );
- getLog().info(
- "Resource directory's path matches an existing source directory. Resources will be merged with the source directory "
- + originalDir.getPath() );
- originalDir.merge( resourceDir );
+
+ boolean merged = originalDir.merge(resourceDir);
+ if (merged)
+ {
+ getLog().info(
+ "Resource directory's path matches an existing source directory. Resources have been merged with the source directory "
+ + originalDir.getPath());
+ }
+ else
+ {
+ getLog()
+ .info(
+ "Resource directory's path matches an existing source directory but \"test\", \"filtering\" or \"output\" were different."
+ + "The resulting eclipse configuration may not accurately reflect the project configuration for "
+ + originalDir.getPath());
+ }
+
}
}
}
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=931322&r1=931321&r2=931322&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 Tue Apr 6 20:52:34 2010
@@ -230,6 +230,15 @@ public class EclipseSourceDir
}
/**
+ * Wheter this resource should be copied with filtering.
+ * @param filtering filter resources
+ */
+ public void setFiltering(boolean filtering)
+ {
+ this.filtering = filtering;
+ }
+
+ /**
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals( Object obj )
@@ -289,19 +298,9 @@ public class EclipseSourceDir
* @throws MojoExecutionException test or filtering values are not identical, or isResource true and output are not
* identical
*/
- public void merge( EclipseSourceDir mergeWith )
+ public boolean merge( EclipseSourceDir mergeWith )
throws MojoExecutionException
{
- if ( test != mergeWith.test )
- {
- throw new MojoExecutionException( "Request to merge when 'test' is not identical. Original=" + toString()
- + ", merging with=" + mergeWith.toString() );
- }
- if ( filtering != mergeWith.filtering )
- {
- throw new MojoExecutionException( "Request to merge when 'filtering' is not identical. Original="
- + toString() + ", merging with=" + mergeWith.toString() );
- }
if ( isResource != mergeWith.isResource )
{
@@ -317,15 +316,17 @@ public class EclipseSourceDir
}
else
{
- if ( !StringUtils.equals( output, mergeWith.output ) )
+
+ LinkedHashSet includesAsSet = new LinkedHashSet();
+
+ // if the orginal or merged dir have an empty "include" this means all is included,
+ // so merge includes only if both are not empty
+ if (!include.isEmpty() && !mergeWith.include.isEmpty())
{
- throw new MojoExecutionException( "Request to merge when 'output' is not identical. Original="
- + toString() + ", merging with=" + mergeWith.toString() );
+ includesAsSet.addAll(include);
+ includesAsSet.addAll(mergeWith.include);
}
- LinkedHashSet includesAsSet = new LinkedHashSet();
- includesAsSet.addAll( include );
- includesAsSet.addAll( mergeWith.include );
include = new ArrayList( includesAsSet );
LinkedHashSet excludesAsSet = new LinkedHashSet();
@@ -333,5 +334,24 @@ public class EclipseSourceDir
excludesAsSet.addAll( mergeWith.exclude );
exclude = new ArrayList( excludesAsSet );
}
+
+ if (!StringUtils.equals(output, mergeWith.output))
+ {
+ // Request to merge when 'output' is not identical
+ return false;
+ }
+
+ if (test != mergeWith.test)
+ {
+ // Request to merge when 'test' is not identical
+ return false;
+ }
+
+ if (filtering != mergeWith.filtering)
+ {
+ // Request to merge when 'filtering' is not identical
+ return false;
+ }
+ return true;
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java?rev=931322&r1=931321&r2=931322&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java Tue Apr 6 20:52:34 2010
@@ -159,4 +159,46 @@ public class EclipseSourceDirTest
objectUnderTest.toString() );
}
+ public void testMergWhenFilteringIsNotIdentical() throws Exception
+ {
+ EclipseSourceDir resource1 = testFixture_src_main_resources();
+ EclipseSourceDir resource2 = testFixture_src_main_resources();
+
+ resource1.getInclude().add("**/*.dup");
+ resource1.getInclude().add("**/*.txt");
+ resource1.getExclude().add("**/*.svn");
+ resource1.getExclude().add("**/*~");
+
+ resource2.getInclude().add("**/*.xml");
+ resource2.getInclude().add("**/*.dup");
+ resource2.getExclude().add("**/*.cvs");
+ resource2.getExclude().add("**/*~");
+ resource2.setFiltering(true);
+
+ boolean result = resource1.merge(resource2);
+
+ assertFalse("Resource dirs should not have been merged successfully", result);
+
+ assertEquals(
+ "resource /src/main/resources: output=target/classes, include=[**/*.dup|**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*~|**/*.cvs], test=false, filtering=false",
+ resource1.toString());
+ }
+
+ public void testMergWhenFilteringIsNotIdenticalOverlapping() throws Exception
+ {
+ EclipseSourceDir resource1 = testFixture_src_main_resources();
+ EclipseSourceDir resource2 = testFixture_src_main_resources();
+
+ resource2.getInclude().add("**/*.properties");
+ resource2.setFiltering(true);
+
+ boolean result = resource1.merge(resource2);
+
+ assertFalse("Resource dirs should not have been merged successfully", result);
+
+ assertEquals(
+ "resource /src/main/resources: output=target/classes, include=[], exclude=[**/*.java], test=false, filtering=false",
+ resource1.toString());
+ }
+
}
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.classpath Tue Apr 6 20:52:34 2010
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" including="**/*.properties" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <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/resources/projects/project-58-MECLIPSE-621/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.project?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/.project Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.classpath Tue Apr 6 20:52:34 2010
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" including="**/*.properties" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <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/resources/projects/project-58-MECLIPSE-621/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.project?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/expected/.project Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml Tue Apr 6 20:52:34 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<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>com.mycompany.samples</groupId>
+ <artifactId>maven-eclipse-plugin-resources-testcase</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+package com.mycompany.samples;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties?rev=931322&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml?rev=931322&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java Tue Apr 6 20:52:34 2010
@@ -0,0 +1,38 @@
+package com.mycompany.samples;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-58-MECLIPSE-621/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.classpath Tue Apr 6 20:52:34 2010
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" including="**/*.properties" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <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/resources/projects/project-59-MECLIPSE-576/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.project?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/.project Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.classpath Tue Apr 6 20:52:34 2010
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <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/resources/projects/project-59-MECLIPSE-576/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.project?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.project (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/expected/.project Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml Tue Apr 6 20:52:34 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<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>com.mycompany.samples</groupId>
+ <artifactId>maven-eclipse-plugin-resources-testcase</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>maven-eclipse-plugin-resources-testcase</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java Tue Apr 6 20:52:34 2010
@@ -0,0 +1,13 @@
+package com.mycompany.samples;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/java/com/mycompany/samples/App.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties?rev=931322&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/bar.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml?rev=931322&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/main/resources/foo.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java?rev=931322&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java Tue Apr 6 20:52:34 2010
@@ -0,0 +1,38 @@
+package com.mycompany.samples;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-59-MECLIPSE-576/src/test/java/com/mycompany/samples/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain