svn commit: r453961 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse: EclipsePlugin.java EclipseSourceDir.java writers/EclipseClasspathWriter.java

[kenney]

Author: kenney
Date: Sat Oct  7 09:56:01 2006
New Revision: 453961

URL: http://svn.apache.org/viewvc?view=rev&rev=453961
Log:
Add exclusion on java files for resource directories to prevent compilation 
errors on src/test/resources/unit/.../*.java due to wrong package

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/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.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?view=diff&rev=453961&r1=453960&r2=453961
==============================================================================
--- 
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
 Sat Oct  7 09:56:01 2006
@@ -772,7 +772,7 @@
                 String sourceRoot = IdeUtils.toRelativeAndFixSeparator( 
projectBaseDir, sourceRootFile, !projectBaseDir
                     .equals( basedir ) );
 
-                directories.add( new EclipseSourceDir( sourceRoot, output, 
test, null, null ) );
+                directories.add( new EclipseSourceDir( sourceRoot, output, 
true, test, null, null ) );
             }
         }
     }
@@ -847,7 +847,7 @@
                 output = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, 
outputFile, false );
             }
 
-            directories.add( new EclipseSourceDir( resourceDir, output, test, 
includePattern, excludePattern ) );
+            directories.add( new EclipseSourceDir( resourceDir, output, true, 
test, includePattern, excludePattern ) );
         }
     }
 

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?view=diff&rev=453961&r1=453960&r2=453961
==============================================================================
--- 
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
 Sat Oct  7 09:56:01 2006
@@ -34,12 +34,24 @@
 
     private String exclude;
 
+    private boolean isResource;
+
     private boolean test;
 
+    /**
+     * @deprecated Use the other constructor
+     */
     public EclipseSourceDir( String path, String output, boolean test, String 
include, String exclude )
     {
+        this(path, output, test, false, include, exclude);
+    }
+
+
+    public EclipseSourceDir( String path, String output, boolean isResource, 
boolean test, String include, String exclude )
+    {
         this.path = path;
         this.output = output;
+        this.isResource = isResource;
         this.test = test;
         this.include = include;
         this.exclude = exclude;

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?view=diff&rev=453961&r1=453960&r2=453961
==============================================================================
--- 
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
 Sat Oct  7 09:56:01 2006
@@ -94,6 +94,11 @@
     private static final String ATTR_CON = "con"; //$NON-NLS-1$     
 
     /**
+     * Attribute name for source file excludes in a path.
+     */
+    private static final String ATTR_EXCLUDING = "excluding";
+
+    /**
      * Element for classpathentry.
      */
     private static final String ELT_CLASSPATHENTRY = "classpathentry"; 
//$NON-NLS-1$
@@ -148,6 +153,11 @@
             if ( dir.getOutput() != null && !defaultOutput.equals( 
dir.getOutput() ) )
             {
                 writer.addAttribute( ATTR_OUTPUT, dir.getOutput() );
+            }
+
+            if ( dir.isResource() )
+            {
+                writer.addAttribute( ATTR_EXCLUDING, "**/*.java" );
             }
 
             writer.endElement();