Author: ogusakov Date: Tue Feb 10 21:59:53 2009 New Revision: 743124 URL: http://svn.apache.org/viewvc?rev=743124&view=rev Log: added a test for supplied root to be a directory to the constructor
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java?rev=743124&r1=743123&r2=743124&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java Tue Feb 10 21:59:53 2009 @@ -28,11 +28,15 @@ import org.apache.maven.mercury.repository.api.RepositoryReader; import org.apache.maven.mercury.repository.api.RepositoryWriter; import org.apache.maven.mercury.transport.api.Server; +import org.codehaus.plexus.lang.DefaultLanguage; +import org.codehaus.plexus.lang.Language; public class LocalRepositoryM2 extends AbstractRepository implements LocalRepository { + private static final Language LANG = new DefaultLanguage( LocalRepositoryM2.class ); + private File directory; public static final String METADATA_FILE_NAME = "maven-metadata-local.xml"; @@ -41,11 +45,14 @@ private void setDirectory( File directory ) { if( directory == null ) - throw new IllegalArgumentException( "null.directory" ); + throw new IllegalArgumentException( LANG.getMessage( "null.directory" ) ); if( !directory.exists() ) directory.mkdirs(); + if( !directory.isDirectory() ) + throw new IllegalArgumentException( LANG.getMessage( "file.directory", directory.getAbsolutePath() ) ); + this.directory = directory; } //---------------------------------------------------------------------------------- Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties?rev=743124&r1=743123&r2=743124&view=diff ============================================================================== --- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties (original) +++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties Tue Feb 10 21:59:53 2009 @@ -30,4 +30,7 @@ signature.failed=Signature "{0}": verification failed for file {1} cannot.read.signature.file=Cannot read signature file {0}, error: {1} cannot.lock.gav=Cannot lock GAV folder {0} in {1} millis -file.is.empty=File {0} exists, but is empty. Data corruption somewhere - please repair metadata. \ No newline at end of file +file.is.empty=File {0} exists, but is empty. Data corruption somewhere - please repair metadata. + +null.directory=supplied local repo root is null +file.directory=supplied local repo root is not a folder: {0} \ No newline at end of file