fix the plexus requirement

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437170 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 1 deletions

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
index 6485c52b6..3ba777715 100644
--- a/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
@@ -38,7 +38,7 @@ public class DefaultConfiguredRepositoryFactory
     implements ConfiguredRepositoryFactory
 {
     /**
-     * @plexus.requirement role="org.apache.maven.artifact.archiva.layout.ArtifactRepositoryLayout"
+     * @plexus.requirement role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
      */
     private Map repositoryLayouts;
 
@@ -70,6 +70,12 @@ public class DefaultConfiguredRepositoryFactory
             new ArtifactRepositoryPolicy( enabled, updatePolicy, ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL );
 
         ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( configuration.getLayout() );
+
+        if ( layout == null )
+        {
+            throw new IllegalArgumentException( "Invalid layout: " + configuration.getLayout() );
+        }
+
         ArtifactRepository artifactRepository = repoFactory.createArtifactRepository( configuration.getId(),
                                                                                       configuration.getUrl(), layout,
                                                                                       snapshotsPolicy, releasesPolicy );