svn commit: r391529 - in /maven/plugins/trunk/maven-idea-plugin/src: main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java test/module-plugin-configs/plugin-config-exclude.xml

[epunzalan]

Author: epunzalan
Date: Tue Apr  4 23:11:39 2006
New Revision: 391529

URL: http://svn.apache.org/viewcvs?rev=391529&view=rev
Log:
PR: MIDEA-48

Fixed for bug on using excludes

Modified:
    
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
    
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
    
maven/plugins/trunk/maven-idea-plugin/src/test/module-plugin-configs/plugin-config-exclude.xml

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java?rev=391529&r1=391528&r2=391529&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
 Tue Apr  4 23:11:39 2006
@@ -334,14 +334,20 @@
             for ( Iterator i = filteredExcludes.iterator(); i.hasNext(); )
             {
                 String dirToExclude = i.next().toString();
+                String dirToExcludeTemp = dirToExclude.replace( '\\', '/' );
                 boolean addExclude = true;
                 for ( Iterator iterator = actuallyExcluded.iterator(); 
iterator.hasNext(); )
                 {
-                    String dir = (String) iterator.next();
-                    if ( dirToExclude.startsWith( dir ) )
+                    String dir = iterator.next().toString();
+                    String dirTemp = dir.replace( '\\', '/' );
+                    if ( dirToExcludeTemp.startsWith( dirTemp + "/" ) )
                     {
                         addExclude = false;
                         break;
+                    }
+                    else if ( dir.startsWith( dirToExcludeTemp + "/" ) )
+                    {
+                        actuallyExcluded.remove( dir );
                     }
                 }
 

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java?rev=391529&r1=391528&r2=391529&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
 Tue Apr  4 23:11:39 2006
@@ -165,8 +165,8 @@
         throws Exception
     {
         List expectedExcludes = new ArrayList();
-        expectedExcludes.add( "src/main/excluded" );
-        expectedExcludes.add( "src/main/excluded-too" );
+        expectedExcludes.add( 
"file://$MODULE_DIR$/src/main/resources/excluded" );
+        expectedExcludes.add( 
"file://$MODULE_DIR$/src/main/resources/excluded-too" );
 
         Document imlDocument = executeMojo( 
"src/test/module-plugin-configs/plugin-config-exclude.xml" );
 
@@ -181,14 +181,18 @@
 
             String excluded = exclude.attributeValue( "url" );
 
+            if ( excluded.equals( "file://$MODULE_DIR$/src/main/excluded" ) )
+            {
+
+            }
+
             if ( expectedExcludes.contains( excluded ) )
             {
                 expectedExcludes.remove( excluded );
             }
         }
 
-        // commented for MIDEA-48
-        //assertTrue( "Test all excludes", expectedExcludes.size() == 0 );
+        assertEquals( "Test all excludes", 0, expectedExcludes.size() );
     }
 
     protected Document executeMojo( String pluginXml )

Modified: 
maven/plugins/trunk/maven-idea-plugin/src/test/module-plugin-configs/plugin-config-exclude.xml
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/module-plugin-configs/plugin-config-exclude.xml?rev=391529&r1=391528&r2=391529&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-idea-plugin/src/test/module-plugin-configs/plugin-config-exclude.xml
 (original)
+++ 
maven/plugins/trunk/maven-idea-plugin/src/test/module-plugin-configs/plugin-config-exclude.xml
 Tue Apr  4 23:11:39 2006
@@ -23,7 +23,7 @@
           <downloadJavadocs>false</downloadJavadocs>
           <javadocClassifier>javadoc</javadocClassifier>
           <dependenciesAsLibraries>true</dependenciesAsLibraries>
-          
<exclude>src/main/resources/excluded,src/main/resources/excluded-too</exclude>
+          
<exclude>src/main/resources/excluded,src/main/resources/excluded-too,src/main/resources/excluded/sub</exclude>
         </configuration>
       </plugin>
     </plugins>