You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/03/06 12:16:32 UTC

svn commit: r383515 - in /maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea: AbstractIdeaMojo.java IdeaModuleMojo.java

Author: epunzalan
Date: Mon Mar  6 03:16:29 2006
New Revision: 383515

URL: http://svn.apache.org/viewcvs?rev=383515&view=rev
Log:
Fixed a bug on generated-sources not being included when the target directory have dirs other than generated-sources.

Improved message reporting when an error occurred during dependency resolution.

Forced exclusions of non-existent dirs so that it will still be excluded if it suddently appeared.

Modified:
    maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
    maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java?rev=383515&r1=383514&r2=383515&view=diff
==============================================================================
--- maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/AbstractIdeaMojo.java Mon Mar  6 03:16:29 2006
@@ -237,11 +237,31 @@
             }
             catch ( ArtifactNotFoundException e )
             {
-                getLog().debug( e.toString() );
+                getLog().debug( e.getMessage(), e );
+
+                StringBuffer msg = new StringBuffer();
+                msg.append( "An error occurred during dependency resolution.\n\n" );
+                msg.append( "    Failed to retrieve " + e.getDownloadUrl() + "\n" );
+                msg.append( "from the following repositories:" );
+                for( Iterator repositories = e.getRemoteRepositories().iterator(); repositories.hasNext(); )
+                {
+                    ArtifactRepository repository = (ArtifactRepository) repositories.next();
+                    msg.append( "\n    " + repository.getId() + "(" + repository.getUrl() + ")" );
+                }
+                msg.append( "\nCaused by: " + e.getMessage() );
+
+                getLog().warn( msg );
             }
             catch ( ArtifactResolutionException e )
             {
-                getLog().debug( e.toString() );
+                getLog().debug( e.getMessage(), e );
+
+                StringBuffer msg = new StringBuffer();
+                msg.append( "An error occurred during dependency resolution of the following artifact:\n\n" );
+                msg.append( "    " + e.getGroupId() + ":" + e.getArtifactId() + e.getVersion() + "\n\n" );
+                msg.append( "Caused by: " + e.getMessage() );
+
+                getLog().warn( msg );
             }
         }
     }

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=383515&r1=383514&r2=383515&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 Mon Mar  6 03:16:29 2006
@@ -554,7 +554,8 @@
     private List getExcludedDirectories( File target, List excludeList, List sourceFolders )
     {
         List foundFolders = new ArrayList();
-        int dirs = 0;
+
+        int totalDirs = 0, excludedDirs = 0;
 
         if ( target.exists() && !excludeList.contains( target.getAbsolutePath() ) )
         {
@@ -565,40 +566,49 @@
                 File file = files[i];
                 if ( file.isDirectory() && !excludeList.contains( file.getAbsolutePath() ) )
                 {
+                    totalDirs++;
+
                     String absolutePath = file.getAbsolutePath();
                     String url = getModuleFileUrl( absolutePath );
 
+                    boolean addToExclude = true;
                     for ( Iterator sources = sourceFolders.iterator(); sources.hasNext(); )
                     {
                         String source = ( (Xpp3Dom) sources.next() ).getAttribute( "url" );
                         if ( source.equals( url ) )
                         {
-                            dirs++;
+                            addToExclude = false;
                             break;
                         }
                         else if ( source.indexOf( url ) == 0 )
                         {
-                            dirs++;
                             foundFolders.addAll(
                                 getExcludedDirectories( new File( absolutePath ), excludeList, sourceFolders ) );
+                            addToExclude = false;
                             break;
                         }
-                        else
-                        {
-                            foundFolders.add( absolutePath );
-                        }
+                    }
+                    if ( addToExclude )
+                    {
+                        excludedDirs++;
+                        foundFolders.add( absolutePath );
                     }
                 }
             }
 
             //if all directories are excluded, then just exclude the parent directory
-            if ( dirs == 0 )
+            if ( totalDirs > 0 && totalDirs == excludedDirs )
             {
                 foundFolders.clear();
 
                 foundFolders.add( target.getAbsolutePath() );
             }
         }
+        else if ( !target.exists() )
+        {
+            //might as well exclude a non-existent dir so that it won't show when it suddenly appears
+            foundFolders.add( target.getAbsolutePath() );
+        }
 
         return foundFolders;
     }
@@ -741,11 +751,8 @@
 
     private void addExcludeFolder( Xpp3Dom content, String directory )
     {
-        if ( !StringUtils.isEmpty( directory ) && new File( directory ).isDirectory() )
-        {
-            Xpp3Dom excludeFolder = createElement( content, "excludeFolder" );
-            excludeFolder.setAttribute( "url", getModuleFileUrl( directory ) );
-        }
+        Xpp3Dom excludeFolder = createElement( content, "excludeFolder" );
+        excludeFolder.setAttribute( "url", getModuleFileUrl( directory ) );
     }
 
     /**