svn commit: r800493 - in /maven/components/trunk: maven-compat/src/main/java/org/apache/maven/repository/ maven-core/src/main/java/org/apache/maven/project/

[be...@apache.org]

Author: bentmann
Date: Mon Aug  3 18:57:21 2009
New Revision: 800493

URL: http://svn.apache.org/viewvc?rev=800493&view=rev
Log:
o Fixed exception handling

Modified:
    maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
    maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java

Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java?rev=800493&r1=800492&r2=800493&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java Mon Aug  3 18:57:21 2009
@@ -182,7 +182,7 @@
                 // see if this is a negative match
                 if ( repo.length() > 1 && repo.startsWith( "!" ) )
                 {
-                    if ( originalId.equals( repo.substring( 1 ) ) )
+                    if ( repo.substring( 1 ).equals( originalId ) )
                     {
                         // explicitly exclude. Set result and stop processing.
                         result = false;
@@ -190,7 +190,7 @@
                     }
                 }
                 // check for exact match
-                else if ( originalId.equals( repo ) )
+                else if ( repo.equals( originalId ) )
                 {
                     result = true;
                     break;

Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=800493&r1=800492&r2=800493&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Mon Aug  3 18:57:21 2009
@@ -57,6 +57,7 @@
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author Jason van Zyl
@@ -564,8 +565,18 @@
         {
             String id = repo.getId();
 
+            if ( StringUtils.isEmpty( id ) )
+            {
+                throw new InvalidRepositoryException( "Repository identifier missing", "" );
+            }
+
             String url = repo.getUrl();
 
+            if ( StringUtils.isEmpty( url ) )
+            {
+                throw new InvalidRepositoryException( "URL missing for repository " + id, id );
+            }
+
             ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
 
             ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java?rev=800493&r1=800492&r2=800493&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java Mon Aug  3 18:57:21 2009
@@ -21,7 +21,6 @@
 
 import java.util.List;
 
-import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.model.Model;
@@ -114,7 +113,7 @@
             remoteRepositories =
                 projectBuildingHelper.createArtifactRepositories( model.getRepositories(), remoteRepositories );
         }
-        catch ( InvalidRepositoryException e )
+        catch ( Exception e )
         {
             event.getProblems().addError( "Invalid artifact repository: " + e.getMessage(), e );
         }
@@ -124,7 +123,7 @@
             pluginRepositories =
                 projectBuildingHelper.createArtifactRepositories( model.getPluginRepositories(), pluginRepositories );
         }
-        catch ( InvalidRepositoryException e )
+        catch ( Exception e )
         {
             event.getProblems().addError( "Invalid plugin repository: " + e.getMessage(), e );
         }