*/
public void testKickoutWrongDirectory()
{
- List metadataPaths = discoverer.discoverMetadata( repositoryLocation, null );
+ discoverer.discoverMetadata( repositoryLocation, null );
Iterator iter = discoverer.getKickedOutPathsIterator();
boolean found = false;
while ( iter.hasNext() && !found )
*/
public void testKickoutBlankMetadata()
{
- List metadataPaths = discoverer.discoverMetadata( repositoryLocation, null );
+ discoverer.discoverMetadata( repositoryLocation, null );
Iterator iter = discoverer.getKickedOutPathsIterator();
boolean found = false;
while ( iter.hasNext() && !found )
private IndexReader indexReader;
- protected IndexWriter indexWriter;
+ private IndexWriter indexWriter;
/**
* method to encapsulate the optimize() method for lucene
return indexPath;
}
- protected void getIndexWriter()
+ protected IndexWriter getIndexWriter()
throws IOException
{
if ( indexWriter == null )
{
indexWriter = new IndexWriter( indexPath, getAnalyzer(), false );
}
+ return indexWriter;
}
- private void getIndexReader()
+ private IndexReader getIndexReader()
throws IOException
{
if ( indexReader == null )
{
indexReader = IndexReader.open( indexPath );
}
+ return indexReader;
}
/**
File indexDir = new File( indexPath );
if ( IndexReader.indexExists( indexDir ) )
{
- getIndexReader();
+ IndexReader indexReader = getIndexReader();
if ( indexReader.numDocs() > 0 )
{
Collection fields = indexReader.getFieldNames();
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexWriter;
import org.apache.maven.artifact.Artifact;
-import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
import java.util.zip.ZipFile;
* Class used to index Artifact objects in a specified repository
*
* @author Edwin Punzalan
- *
* @plexus.component role="org.apache.maven.repository.indexing.RepositoryIndex" role-hint="artifact" instantiation-strategy="per-lookup"
*/
public class ArtifactRepositoryIndex
private Analyzer analyzer;
- private StringBuffer classes;
-
- private StringBuffer packages;
-
- private StringBuffer files;
-
private static final int CHEKCSUM_BUFFER_SIZE = 256;
/**
try
{
- getIndexWriter();
+ IndexWriter indexWriter = getIndexWriter();
- processArtifactContents( artifact.getFile() );
+ StringBuffer classes = new StringBuffer();
+ StringBuffer packages = new StringBuffer();
+ StringBuffer files = new StringBuffer();
+ ZipFile jar = new ZipFile( artifact.getFile() );
+ for ( Enumeration entries = jar.entries(); entries.hasMoreElements(); )
+ {
+ ZipEntry entry = (ZipEntry) entries.nextElement();
+ if ( addIfClassEntry( entry, classes ) )
+ {
+ addClassPackage( entry.getName(), packages );
+ }
+ addFile( entry, files );
+ }
//@todo should some of these fields be Keyword instead of Text ?
Document doc = new Document();
doc.add( Field.Text( PACKAGES, packages.toString() ) );
doc.add( Field.Text( FILES, files.toString() ) );
indexWriter.addDocument( doc );
-
- removeBuffers();
}
catch ( Exception e )
{
return complete.digest();
}
- private void initBuffers()
- {
- classes = new StringBuffer();
- packages = new StringBuffer();
- files = new StringBuffer();
- }
-
- private void removeBuffers()
- {
- classes = null;
- packages = null;
- files = null;
- }
-
- private void processArtifactContents( File artifact )
- throws IOException, ZipException
- {
- initBuffers();
- ZipFile jar = new ZipFile( artifact );
- for ( Enumeration entries = jar.entries(); entries.hasMoreElements(); )
- {
- ZipEntry entry = (ZipEntry) entries.nextElement();
- if ( addIfClassEntry( entry ) )
- {
- addClassPackage( entry.getName() );
- }
- addFile( entry );
- }
- }
-
- private boolean addIfClassEntry( ZipEntry entry )
+ private boolean addIfClassEntry( ZipEntry entry, StringBuffer classes )
{
boolean isAdded = false;
return isAdded;
}
- private boolean addClassPackage( String name )
+ private boolean addClassPackage( String name, StringBuffer packages )
{
boolean isAdded = false;
return isAdded;
}
- private boolean addFile( ZipEntry entry )
+ private boolean addFile( ZipEntry entry, StringBuffer files )
{
String name = entry.getName();
int idx = name.lastIndexOf( '/' );
private static final String VERSION = "version";
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private ArtifactFactory factory;
/**
*
* @param queryString
* @param searchField
- * @return
*/
public List search( RepositoryIndex index, String queryString, String searchField )
throws RepositoryIndexSearchException
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
-import java.util.Iterator;
import java.util.List;
/**
private static final String VERSION = "version";
- private static final String SHA1 = "sha1";
-
- private static final String MD5 = "md5";
-
private static final String CLASSES = "classes";
private static final String PACKAGES = "packages";
private static final String FILES = "files";
- private ArtifactRepositoryIndex indexer;
-
private ArtifactFactory artifactFactory;
private ArtifactRepository repository;
public void testIndexerExceptions()
throws Exception
{
+ ArtifactRepositoryIndex indexer;
try
{
String notIndexDir = new File( "pom.xml" ).getAbsolutePath();
throws Exception
{
//indexer = (ArtifactRepositoryIndex) factory.getArtifactRepositoryIndexer( indexPath, repository );
- indexer = (ArtifactRepositoryIndex) lookup( RepositoryIndex.ROLE, "artifact" );
+ ArtifactRepositoryIndex indexer = (ArtifactRepositoryIndex) lookup( RepositoryIndex.ROLE, "artifact" );
indexer.open( indexPath );
Artifact artifact = getArtifact( "org.apache.maven", "maven-artifact", "2.0.1" );
artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) );
indexer.index( artifact );
indexer.close();
+
+ // TODO: assert something!
}
public void testSearch()
throws Exception
{
- indexer = (ArtifactRepositoryIndex) lookup( RepositoryIndex.ROLE, "artifact" );
+ ArtifactRepositoryIndex indexer = (ArtifactRepositoryIndex) lookup( RepositoryIndex.ROLE, "artifact" );
indexer.open( getTestPath( "src/test/index" ) );
- //repoSearcher = new ArtifactRepositoryIndexSearcher( indexer, indexPath, repository );
RepositoryIndexSearcher repoSearcher =
(RepositoryIndexSearcher) lookup( RepositoryIndexSearcher.ROLE, "artifact" );
artifacts = repoSearcher.search( indexer, "pom.xml", FILES );
assertEquals( 3, artifacts.size() );
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = (Artifact) iter.next();
- File f = artifact.getFile();
- //assertNotNull( f );
- //assertTrue( f.exists() );
- }
-
artifacts = repoSearcher.search( indexer, "org.apache.maven", GROUPID );
assertEquals( 2, artifacts.size() );
protected Metadata getMetadata( Artifact artifact )
throws RepositoryQueryLayerException
{
- Metadata metadata = null;
+ Metadata metadata;
ArtifactRepositoryMetadata repositoryMetadata = new ArtifactRepositoryMetadata( artifact );
String path = repository.pathOfRemoteRepositoryMetadata( repositoryMetadata );
{
try
{
- checkPluginMetadata( metadata, repository, reporter );
+ hasFailures = checkPluginMetadata( metadata, repository, reporter );
}
catch ( IOException e )
{
if ( metadata.storedInArtifactVersionDirectory() )
{
- checkSnapshotMetadata( metadata, repository, reporter );
+ hasFailures |= checkSnapshotMetadata( metadata, repository, reporter );
}
else
{
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.model.Model;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
* It validates MD5 and SHA-1 checksums.
*
* @todo remove stateful parts, change to singleton instantiation
- * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="checksum" instantiation-strategy="per-lookup"
+ * @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="checksum"
*/
public class ChecksumArtifactReporter
implements ArtifactReportProcessor
{
- private InputStream md5InputStream;
-
- private InputStream sha1InputStream;
-
- private boolean isLocal = true;
-
private static final int BYTE_MASK = 0xFF;
private static final int CHECKSUM_BUFFER_SIZE = 256;
* @param artifact
* @param reporter
* @param repository
- * @todo fix repo paths
*/
public void processArtifact( Model model, Artifact artifact, ArtifactReporter reporter,
ArtifactRepository repository )
{
- String repositoryUrl;
-
if ( !"file".equals( repository.getProtocol() ) )
{
- isLocal = false;
- repositoryUrl = repository.getUrl();
- }
- else
- {
- repositoryUrl = repository.getBasedir();
+ // We can't check other types of URLs yet. Need to use Wagon, with an exists() method.
+ throw new UnsupportedOperationException(
+ "Can't process repository '" + repository.getUrl() + "'. Only file based repositories are supported" );
}
- String artifactUrl = repositoryUrl + artifact.getGroupId() + "/" + artifact.getArtifactId() + "/" +
- artifact.getBaseVersion() + "/" + artifact.getArtifactId() + "-" + artifact.getBaseVersion() + "." +
- artifact.getType();
-
//check if checksum files exist
- boolean md5Exists = getMD5File( artifactUrl );
- boolean sha1Exists = getSHA1File( artifactUrl );
+ String path = repository.pathOf( artifact );
+ File file = new File( repository.getBasedir(), path );
- if ( md5Exists )
+ File md5File = new File( repository.getBasedir(), path + ".md5" );
+ if ( md5File.exists() )
{
- if ( validateChecksum( artifactUrl, "MD5" ) )
+ try
{
- reporter.addSuccess( artifact );
+ if ( validateChecksum( file, md5File, "MD5" ) )
+ {
+ reporter.addSuccess( artifact );
+ }
+ else
+ {
+ reporter.addFailure( artifact, "MD5 checksum does not match." );
+ }
}
- else
+ catch ( NoSuchAlgorithmException e )
{
- reporter.addFailure( artifact, "MD5 checksum does not match." );
+ reporter.addFailure( artifact, "Unable to read MD5: " + e.getMessage() );
+ }
+ catch ( IOException e )
+ {
+ reporter.addFailure( artifact, "Unable to read MD5: " + e.getMessage() );
}
}
else
reporter.addFailure( artifact, "MD5 checksum file does not exist." );
}
- if ( sha1Exists )
+ File sha1File = new File( repository.getBasedir(), path + ".sha1" );
+ if ( sha1File.exists() )
{
- if ( validateChecksum( artifactUrl, "SHA-1" ) )
+ try
{
- reporter.addSuccess( artifact );
+ if ( validateChecksum( file, sha1File, "SHA-1" ) )
+ {
+ reporter.addSuccess( artifact );
+ }
+ else
+ {
+ reporter.addFailure( artifact, "SHA-1 checksum does not match." );
+ }
}
- else
+ catch ( NoSuchAlgorithmException e )
{
- reporter.addFailure( artifact, "SHA-1 checksum does not match." );
+ reporter.addFailure( artifact, "Unable to read SHA-1: " + e.getMessage() );
+ }
+ catch ( IOException e )
+ {
+ reporter.addFailure( artifact, "Unable to read SHA-1: " + e.getMessage() );
}
}
else
/**
* Validate the checksums of the metadata. Get the metadata file from the
* repository then validate the checksum.
- *
- * @todo fix repo paths
*/
public void processMetadata( RepositoryMetadata metadata, ArtifactRepository repository, ArtifactReporter reporter )
{
- String repositoryUrl;
- String filename;
if ( !"file".equals( repository.getProtocol() ) )
{
- isLocal = false;
- repositoryUrl = repository.getUrl() + "/";
- filename = metadata.getRemoteFilename();
- }
- else
- {
- repositoryUrl = repository.getBasedir() + "/";
- filename = metadata.getLocalFilename( repository );
- }
- String metadataUrl;
-
- if ( metadata.storedInArtifactVersionDirectory() && !metadata.storedInGroupDirectory() )
- {
- //version metadata
- metadataUrl = repositoryUrl + metadata.getGroupId() + "/" + metadata.getArtifactId() + "/" +
- metadata.getBaseVersion() + "/";
- }
- else if ( !metadata.storedInArtifactVersionDirectory() && metadata.storedInGroupDirectory() )
- {
- //group metadata
- metadataUrl = repositoryUrl + metadata.getGroupId() + "/";
- }
- else
- {
- //artifact metadata
- metadataUrl = repositoryUrl + metadata.getGroupId() + "/" + metadata.getArtifactId() + "/";
+ // We can't check other types of URLs yet. Need to use Wagon, with an exists() method.
+ throw new UnsupportedOperationException(
+ "Can't process repository '" + repository.getUrl() + "'. Only file based repositories are supported" );
}
- //add the file name of the metadata
- metadataUrl = metadataUrl + filename;
-
//check if checksum files exist
- boolean md5Exists = getMD5File( metadataUrl );
- boolean sha1Exists = getSHA1File( metadataUrl );
+ String path = repository.pathOfRemoteRepositoryMetadata( metadata );
+ File file = new File( repository.getBasedir(), path );
- if ( md5Exists )
+ File md5File = new File( repository.getBasedir(), path + ".md5" );
+ if ( md5File.exists() )
{
- if ( validateChecksum( metadataUrl, "MD5" ) )
- {
- reporter.addSuccess( metadata );
- }
- else
+ try
{
- reporter.addFailure( metadata, "MD5 checksum does not match." );
+ if ( validateChecksum( file, md5File, "MD5" ) )
+ {
+ reporter.addSuccess( metadata );
+ }
+ else
+ {
+ reporter.addFailure( metadata, "MD5 checksum does not match." );
+ }
}
- }
- else
- {
- reporter.addFailure( metadata, "MD5 checksum file does not exist." );
- }
-
- if ( sha1Exists )
- {
- if ( validateChecksum( metadataUrl, "SHA-1" ) )
+ catch ( NoSuchAlgorithmException e )
{
- reporter.addSuccess( metadata );
+ reporter.addFailure( metadata, "Unable to read MD5: " + e.getMessage() );
}
- else
+ catch ( IOException e )
{
- reporter.addFailure( metadata, "SHA-1 checksum does not match." );
+ reporter.addFailure( metadata, "Unable to read MD5: " + e.getMessage() );
}
}
else
{
- reporter.addFailure( metadata, "SHA-1 checksum file does not exist." );
+ reporter.addFailure( metadata, "MD5 checksum file does not exist." );
}
- }
-
- /**
- * Get the MD5 Checksum file. If not found, return false.
- *
- * @param filename The name of the artifact whose MD5 Checksum file will be retrieved.
- * @todo fix this erroneous object state
- */
- private boolean getMD5File( String filename )
- {
- try
+ File sha1File = new File( repository.getBasedir(), path + ".sha1" );
+ if ( sha1File.exists() )
{
- if ( isLocal )
+ try
{
- md5InputStream = new FileInputStream( filename + ".md5" );
+ if ( validateChecksum( file, sha1File, "SHA-1" ) )
+ {
+ reporter.addSuccess( metadata );
+ }
+ else
+ {
+ reporter.addFailure( metadata, "SHA-1 checksum does not match." );
+ }
}
- else
+ catch ( NoSuchAlgorithmException e )
{
- URL url = new URL( filename );
- md5InputStream = url.openStream();
+ reporter.addFailure( metadata, "Unable to read SHA1: " + e.getMessage() );
}
-
- md5InputStream.close();
- }
- catch ( Exception e )
- {
- return false;
- }
- return true;
- }
-
- /**
- * Get the SHA1 Checksum file. If not found, return false.
- *
- * @param filename The name of the artifact whose SHA-1 Checksum file will be retrieved.
- * @todo fix this erroneous object state
- */
- private boolean getSHA1File( String filename )
- {
- try
- {
- if ( isLocal )
+ catch ( IOException e )
{
- sha1InputStream = new FileInputStream( filename + ".sha1" );
+ reporter.addFailure( metadata, "Unable to read SHA1: " + e.getMessage() );
}
- else
- {
- URL url = new URL( filename );
- sha1InputStream = url.openStream();
- }
- sha1InputStream.close();
}
- catch ( Exception e )
+ else
{
- return false;
+ reporter.addFailure( metadata, "SHA-1 checksum file does not exist." );
}
- return true;
+
}
/**
* Validate the checksum of the file.
*
- * @param fileUrl The file to be validated.
- * @param algo The checksum algorithm used.
+ * @param file The file to be validated.
+ * @param checksumFile the checksum to validate against
+ * @param algo The checksum algorithm used.
*/
- private boolean validateChecksum( String fileUrl, String algo )
+ private boolean validateChecksum( File file, File checksumFile, String algo )
+ throws NoSuchAlgorithmException, IOException
{
boolean valid = false;
- try
- {
- //Create checksum for jar file
- String ext = ".md5";
- if ( "SHA-1".equals( algo ) )
- {
- ext = ".sha1";
- }
- byte[] chk1 = createChecksum( fileUrl, algo );
- if ( chk1 != null )
- {
-
- //read the md5 file
- File f = new File( fileUrl + ext );
- InputStream is;
-
- //check whether the file is located locally or remotely
- if ( isLocal )
- {
- is = new FileInputStream( f );
- }
- else
- {
- URL url = new URL( fileUrl + ext );
- is = url.openStream();
- }
-
- char[] chars = new char[is.available()];
- InputStreamReader isr = new InputStreamReader( is );
- isr.read( chars );
- isr.close();
-
- String chk2Str = new String( chars );
-
- valid = chk2Str.toUpperCase().equals( byteArrayToHexStr( chk1 ).toUpperCase() );
- }
- }
- catch ( Exception e )
+ //Create checksum for jar file
+ byte[] chk1 = createChecksum( file, algo );
+ if ( chk1 != null )
{
- // TODO: fix this error handling
+ //read the checksum file
+ String checksum = FileUtils.fileRead( checksumFile );
+ valid = checksum.toUpperCase().equals( byteArrayToHexStr( chk1 ).toUpperCase() );
}
return valid;
}
/**
* Create a checksum from the specified metadata file.
*
- * @param filename The file that will be created a checksum.
- * @param algo The algorithm to be used (MD5, SHA-1)
+ * @param file The file that will be created a checksum.
+ * @param algo The algorithm to be used (MD5, SHA-1)
* @return
* @throws FileNotFoundException
* @throws NoSuchAlgorithmException
* @throws IOException
* @todo move to utility class
*/
- private byte[] createChecksum( String filename, String algo )
+ private byte[] createChecksum( File file, String algo )
throws FileNotFoundException, NoSuchAlgorithmException, IOException
{
- InputStream fis;
+ MessageDigest digest = MessageDigest.getInstance( algo );
- //check whether file is located locally or remotely
- if ( isLocal )
- {
- fis = new FileInputStream( filename );
- }
- else
- {
- URL url = new URL( filename );
- fis = url.openStream();
- }
- byte[] buffer = new byte[CHECKSUM_BUFFER_SIZE];
-
- MessageDigest complete = MessageDigest.getInstance( algo );
- int numRead;
- do
+ InputStream fis = new FileInputStream( file );
+ try
{
- numRead = fis.read( buffer );
- if ( numRead > 0 )
+ byte[] buffer = new byte[CHECKSUM_BUFFER_SIZE];
+ int numRead;
+ do
{
- complete.update( buffer, 0, numRead );
+ numRead = fis.read( buffer );
+ if ( numRead > 0 )
+ {
+ digest.update( buffer, 0, numRead );
+ }
}
+ while ( numRead != -1 );
+ }
+ finally
+ {
+ fis.close();
}
- while ( numRead != -1 );
- fis.close();
- return complete.digest();
+ return digest.digest();
}
/**
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.FileInputStream;
+import java.io.File;
import java.io.FileNotFoundException;
+import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
/**
* This class validates well-formedness of pom xml file.
+ *
* @plexus.component role="org.apache.maven.repository.reporting.ArtifactReportProcessor" role-hint="invalid-pom"
*/
public class InvalidPomArtifactReportProcessor
public void processArtifact( Model model, Artifact artifact, ArtifactReporter reporter,
ArtifactRepository repository )
{
+ if ( !"file".equals( repository.getProtocol() ) )
+ {
+ // We can't check other types of URLs yet. Need to use Wagon, with an exists() method.
+ throw new UnsupportedOperationException(
+ "Can't process repository '" + repository.getUrl() + "'. Only file based repositories are supported" );
+ }
+
if ( "pom".equals( artifact.getType().toLowerCase() ) )
{
- InputStream is = null;
+ File f = new File( repository.getBasedir(), repository.pathOf( artifact ) );
- if ( "file".equals( repository.getProtocol() ) )
+ if ( !f.exists() )
+ {
+ reporter.addFailure( artifact, "Artifact not found." );
+ }
+ else
{
+ Reader reader = null;
+
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+
try
{
- is = new FileInputStream( repository.getBasedir() + artifact.getGroupId() + "/" +
- artifact.getArtifactId() + "/" + artifact.getBaseVersion() + "/" + artifact.getArtifactId() +
- "-" + artifact.getBaseVersion() + "." + artifact.getType() );
+ reader = new FileReader( f );
+ pomReader.read( reader );
+ reporter.addSuccess( artifact );
}
- catch ( FileNotFoundException fe )
+ catch ( XmlPullParserException e )
{
- reporter.addFailure( artifact, "Artifact not found." );
+ reporter.addFailure( artifact, "The pom xml file is not well-formed. Error while parsing: " +
+ e.getMessage() );
}
- }
- else
- {
- try
+ catch ( FileNotFoundException e )
{
- URL url = new URL( repository.getUrl() + artifact.getGroupId() + "/" + artifact.getArtifactId() +
- "/" + artifact.getBaseVersion() + "/" + artifact.getArtifactId() + "-" +
- artifact.getBaseVersion() + "." + artifact.getType() );
- is = url.openStream();
-
+ reporter.addFailure( artifact, "Error while reading the pom xml file: " + e.getMessage() );
}
- catch ( MalformedURLException me )
+ catch ( IOException e )
{
- reporter.addFailure( artifact, "Error retrieving artifact from remote repository." );
+ reporter.addFailure( artifact, "Error while reading the pom xml file: " + e.getMessage() );
}
- catch ( IOException ie )
+ finally
{
- reporter.addFailure( artifact, "Error retrieving artifact from remote repository." );
+ IOUtil.close( reader );
}
}
-
- Reader reader = new InputStreamReader( is );
- MavenXpp3Reader pomReader = new MavenXpp3Reader();
-
- try
- {
- pomReader.read( reader );
- reporter.addSuccess( artifact );
- }
- catch ( XmlPullParserException xe )
- {
- reporter.addFailure( artifact, "The pom xml file is not well-formed. Error while parsing." );
- }
- catch ( IOException oe )
- {
- reporter.addFailure( artifact, "Error while reading the pom xml file." );
- }
-
}
else
{
private static final String[] invalidArtifactChecksumJars = {"invalidArtifact-1.0"};
- private static final String metadataChecksumFilename = "maven-metadata-repository";
+ private static final String metadataChecksumFilename = "maven-metadata";
private static final int CHECKSUM_BUFFER_SIZE = 256;
super.setUp();
}
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
/**
* Create checksum files.
*
*
* @param dir The directory to be deleted.
*/
- protected boolean deleteTestDirectory( File dir )
+ protected void deleteTestDirectory( File dir )
{
- boolean b;
-
try
{
FileUtils.deleteDirectory( dir );
- b = true;
}
- catch ( IOException ioe )
+ catch ( IOException e )
{
- b = false;
+ // ignore
}
-
- return b;
}
private void deleteFile( String filename )
+++ /dev/null
-package org.apache.maven.repository.reporting;
-
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.repository.metadata.Snapshot;
-import org.codehaus.plexus.PlexusTestCase;
-
-import java.io.File;
-import java.util.List;
-
-/**
- *
- */
-public abstract class AbstractRepositoryQueryLayerTest
- extends PlexusTestCase
-{
- private ArtifactFactory artifactFactory;
-
- protected ArtifactRepository repository;
-
- protected CachedRepositoryQueryLayer queryLayer;
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- File repositoryDirectory = getTestFile( "src/test/repository" );
-
- artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- ArtifactRepositoryFactory factory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
- ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
-
- repository =
- factory.createArtifactRepository( "test", repositoryDirectory.toURL().toString(), layout, null, null );
- }
-
- public void testContainsArtifactTrue()
- {
- Artifact artifact = getArtifact( "groupId", "artifactId", "1.0-alpha-1" );
-
- assertTrue( "check artifact", queryLayer.containsArtifact( artifact ) );
- }
-
- public void testContainsArtifactFalse()
- {
- Artifact artifact = getArtifact( "groupId", "artifactId", "1.0-beta-1" );
-
- assertFalse( "check non-existent artifact", queryLayer.containsArtifact( artifact ) );
- }
-
- public void testContainsSnapshotArtifactTrue()
- {
- Snapshot snapshot = new Snapshot();
- snapshot.setTimestamp( "20050611.202024" );
- snapshot.setBuildNumber( 1 );
-
- Artifact artifact = getArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT" );
- assertTrue( "check for snapshot artifact", queryLayer.containsArtifact( artifact, snapshot ) );
- }
-
- public void testContainsSnapshotArtifactFalse()
- {
- Snapshot snapshot = new Snapshot();
- snapshot.setTimestamp( "20050611.202024" );
- snapshot.setBuildNumber( 2 );
-
- Artifact artifact = getArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT" );
- assertFalse( "check for non-existent snapshot artifact", queryLayer.containsArtifact( artifact, snapshot ) );
- }
-
- public void testArtifactVersionsTrue()
- throws Exception
- {
- Artifact artifact = getArtifact( "groupId", "artifactId", "ignored" );
-
- List versions = queryLayer.getVersions( artifact );
-
- assertTrue( "check version 1.0-alpha-1", versions.contains( "1.0-alpha-1" ) );
- assertTrue( "check version 1.0-alpha-2", versions.contains( "1.0-alpha-2" ) );
- assertFalse( "check version 1.0-alpha-3", versions.contains( "1.0-alpha-3" ) );
- }
-
- public void testArtifactVersionsFalse()
- throws Exception
- {
- Artifact artifact = getArtifact( "groupId", "artifactId", "ignored" );
-
- List versions = queryLayer.getVersions( artifact );
-
- assertTrue( "check version 1.0-alpha-1", versions.contains( "1.0-alpha-1" ) );
- assertTrue( "check version 1.0-alpha-2", versions.contains( "1.0-alpha-2" ) );
- assertFalse( "check version 1.0-alpha-3", versions.contains( "1.0-alpha-3" ) );
- }
-
- public void testArtifactVersionsError()
- {
- Artifact artifact = getArtifact( "groupId", "none", "ignored" );
-
- try
- {
- queryLayer.getVersions( artifact );
- fail( "expected error not thrown" );
- }
- catch ( RepositoryQueryLayerException e )
- {
- //expected
- }
- }
-
- private Artifact getArtifact( String groupId, String artifactId, String version )
- {
- return artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" );
- }
-
- protected void tearDown()
- throws Exception
- {
- release( artifactFactory );
- super.tearDown();
- artifactFactory = null;
- repository = null;
- }
-}
--- /dev/null
+package org.apache.maven.repository.reporting;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.repository.metadata.Snapshot;
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ *
+ */
+public abstract class AbstractRepositoryQueryLayerTestCase
+ extends PlexusTestCase
+{
+ private ArtifactFactory artifactFactory;
+
+ protected ArtifactRepository repository;
+
+ protected CachedRepositoryQueryLayer queryLayer;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ File repositoryDirectory = getTestFile( "src/test/repository" );
+
+ artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ ArtifactRepositoryFactory factory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
+ ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
+
+ repository =
+ factory.createArtifactRepository( "test", repositoryDirectory.toURL().toString(), layout, null, null );
+ }
+
+ public void testContainsArtifactTrue()
+ {
+ Artifact artifact = getArtifact( "groupId", "artifactId", "1.0-alpha-1" );
+
+ assertTrue( "check artifact", queryLayer.containsArtifact( artifact ) );
+ }
+
+ public void testContainsArtifactFalse()
+ {
+ Artifact artifact = getArtifact( "groupId", "artifactId", "1.0-beta-1" );
+
+ assertFalse( "check non-existent artifact", queryLayer.containsArtifact( artifact ) );
+ }
+
+ public void testContainsSnapshotArtifactTrue()
+ {
+ Snapshot snapshot = new Snapshot();
+ snapshot.setTimestamp( "20050611.202024" );
+ snapshot.setBuildNumber( 1 );
+
+ Artifact artifact = getArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT" );
+ assertTrue( "check for snapshot artifact", queryLayer.containsArtifact( artifact, snapshot ) );
+ }
+
+ public void testContainsSnapshotArtifactFalse()
+ {
+ Snapshot snapshot = new Snapshot();
+ snapshot.setTimestamp( "20050611.202024" );
+ snapshot.setBuildNumber( 2 );
+
+ Artifact artifact = getArtifact( "groupId", "snapshot-artifact", "1.0-alpha-1-SNAPSHOT" );
+ assertFalse( "check for non-existent snapshot artifact", queryLayer.containsArtifact( artifact, snapshot ) );
+ }
+
+ public void testArtifactVersionsTrue()
+ throws Exception
+ {
+ Artifact artifact = getArtifact( "groupId", "artifactId", "ignored" );
+
+ List versions = queryLayer.getVersions( artifact );
+
+ assertTrue( "check version 1.0-alpha-1", versions.contains( "1.0-alpha-1" ) );
+ assertTrue( "check version 1.0-alpha-2", versions.contains( "1.0-alpha-2" ) );
+ assertFalse( "check version 1.0-alpha-3", versions.contains( "1.0-alpha-3" ) );
+ }
+
+ public void testArtifactVersionsFalse()
+ throws Exception
+ {
+ Artifact artifact = getArtifact( "groupId", "artifactId", "ignored" );
+
+ List versions = queryLayer.getVersions( artifact );
+
+ assertTrue( "check version 1.0-alpha-1", versions.contains( "1.0-alpha-1" ) );
+ assertTrue( "check version 1.0-alpha-2", versions.contains( "1.0-alpha-2" ) );
+ assertFalse( "check version 1.0-alpha-3", versions.contains( "1.0-alpha-3" ) );
+ }
+
+ public void testArtifactVersionsError()
+ {
+ Artifact artifact = getArtifact( "groupId", "none", "ignored" );
+
+ try
+ {
+ queryLayer.getVersions( artifact );
+ fail( "expected error not thrown" );
+ }
+ catch ( RepositoryQueryLayerException e )
+ {
+ //expected
+ }
+ }
+
+ private Artifact getArtifact( String groupId, String artifactId, String version )
+ {
+ return artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" );
+ }
+
+ protected void tearDown()
+ throws Exception
+ {
+ release( artifactFactory );
+ super.tearDown();
+ artifactFactory = null;
+ repository = null;
+ }
+}
{
private ArtifactReporter reporter;
- private ArtifactFactory artifactFactory;
-
private Artifact artifact;
private MockArtifactReportProcessor processor;
- private Versioning versioning;
-
private Model model;
protected void setUp()
{
super.setUp();
reporter = new DefaultArtifactReporter();
- artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
artifact = artifactFactory.createBuildArtifact( "groupId", "artifactId", "1.0-alpha-1", "type" );
processor = new MockArtifactReportProcessor();
- versioning = new Versioning();
+ Versioning versioning = new Versioning();
versioning.addVersion( "1.0-alpha-1" );
versioning.setLastUpdated( "20050611.202020" );
model = new Model();
processor.processArtifact( model, artifact, reporter, null );
Iterator success = reporter.getArtifactSuccessIterator();
assertTrue( success.hasNext() );
- assertTrue( reporter.getSuccesses() == 1 );
+ assertEquals( 1, reporter.getSuccesses() );
Artifact result = ( (ArtifactResult) success.next() ).getArtifact();
- assertTrue( "groupId".equals( result.getGroupId() ) );
- assertTrue( "artifactId".equals( result.getArtifactId() ) );
- assertTrue( "1.0-alpha-1".equals( result.getVersion() ) );
+ assertEquals( "groupId", result.getGroupId() );
+ assertEquals( "artifactId", result.getArtifactId() );
+ assertEquals( "1.0-alpha-1", result.getVersion() );
assertFalse( success.hasNext() );
}
{
success.next();
}
- assertTrue( i == 3 );
- assertTrue( reporter.getSuccesses() == 3 );
- assertTrue( reporter.getFailures() == 0 );
- assertTrue( reporter.getWarnings() == 0 );
+ assertEquals( 3, i );
+ assertEquals( 3, reporter.getSuccesses() );
+ assertEquals( 0, reporter.getFailures() );
+ assertEquals( 0, reporter.getWarnings() );
}
public void testArtifactReporterSingleFailure()
assertTrue( failure.hasNext() );
failure.next();
assertFalse( failure.hasNext() );
- assertTrue( reporter.getSuccesses() == 0 );
- assertTrue( reporter.getFailures() == 1 );
- assertTrue( reporter.getWarnings() == 0 );
+ assertEquals( 0, reporter.getSuccesses() );
+ assertEquals( 1, reporter.getFailures() );
+ assertEquals( 0, reporter.getWarnings() );
}
public void testArtifactReporterMultipleFailure()
{
failure.next();
}
- assertTrue( i == 3 );
- assertTrue( reporter.getSuccesses() == 0 );
- assertTrue( reporter.getFailures() == 3 );
- assertTrue( reporter.getWarnings() == 0 );
+ assertEquals( 3, i );
+ assertEquals( 0, reporter.getSuccesses() );
+ assertEquals( 3, reporter.getFailures() );
+ assertEquals( 0, reporter.getWarnings() );
}
public void testFailureMessages()
processor.addReturnValue( ReportCondition.FAILURE, artifact, "failed thrice" );
processor.processArtifact( model, artifact, reporter, null );
Iterator failure = reporter.getArtifactFailureIterator();
- assertTrue( "failed once".equals( ( (ArtifactResult) failure.next() ).getReason() ) );
- assertTrue( "failed twice".equals( ( (ArtifactResult) failure.next() ).getReason() ) );
- assertTrue( "failed thrice".equals( ( (ArtifactResult) failure.next() ).getReason() ) );
+ assertEquals( "failed once", ( (ArtifactResult) failure.next() ).getReason() );
+ assertEquals( "failed twice", ( (ArtifactResult) failure.next() ).getReason() );
+ assertEquals( "failed thrice", ( (ArtifactResult) failure.next() ).getReason() );
}
public void testArtifactReporterSingleWarning()
assertTrue( warning.hasNext() );
warning.next();
assertFalse( warning.hasNext() );
- assertTrue( reporter.getSuccesses() == 0 );
- assertTrue( reporter.getFailures() == 0 );
- assertTrue( reporter.getWarnings() == 1 );
+ assertEquals( 0, reporter.getSuccesses() );
+ assertEquals( 0, reporter.getFailures() );
+ assertEquals( 1, reporter.getWarnings() );
}
public void testArtifactReporterMultipleWarning()
{
warning.next();
}
- assertTrue( i == 3 );
- assertTrue( reporter.getSuccesses() == 0 );
- assertTrue( reporter.getFailures() == 0 );
- assertTrue( reporter.getWarnings() == 3 );
+ assertEquals( 3, i );
+ assertEquals( 0, reporter.getSuccesses() );
+ assertEquals( 0, reporter.getFailures() );
+ assertEquals( 3, reporter.getWarnings() );
}
public void testWarningMessages()
processor.addReturnValue( ReportCondition.WARNING, artifact, "all right... that does it!" );
processor.processArtifact( model, artifact, reporter, null );
Iterator warning = reporter.getArtifactWarningIterator();
- assertTrue( "i'm warning you".equals( ( (ArtifactResult) warning.next() ).getReason() ) );
- assertTrue( "you have to stop now".equals( ( (ArtifactResult) warning.next() ).getReason() ) );
- assertTrue( "all right... that does it!".equals( ( (ArtifactResult) warning.next() ).getReason() ) );
+ assertEquals( "i'm warning you", ( (ArtifactResult) warning.next() ).getReason() );
+ assertEquals( "you have to stop now", ( (ArtifactResult) warning.next() ).getReason() );
+ assertEquals( "all right... that does it!", ( (ArtifactResult) warning.next() ).getReason() );
}
protected void tearDown()
throws Exception
{
model = null;
- versioning = null;
processor.clearList();
processor = null;
- artifactFactory = null;
reporter = null;
super.tearDown();
}
*
*/
public class CachedRepositoryQueryLayerTest
- extends AbstractRepositoryQueryLayerTest
+ extends AbstractRepositoryQueryLayerTestCase
{
// TODO: share
private static final double CACHE_HIT_RATIO = 0.5;
Versioning versioning = new Versioning();
versioning.addVersion( "1.0-alpha-1" );
versioning.addVersion( "1.0-alpha-2" );
- RepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact, versioning );
}
protected void tearDown()
artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "invalid-pom" );
}
- public void tearDown()
- throws Exception
- {
- super.tearDown();
- }
-
/**
* Test the InvalidPomArtifactReportProcessor when the artifact is an invalid pom.
*/
public void testInvalidPomArtifactReportProcessorFailure()
+ throws ReportProcessorException
{
+ ArtifactHandler handler = new DefaultArtifactHandler( "pom" );
+ VersionRange version = VersionRange.createFromVersion( "1.0-alpha-3" );
+ Artifact artifact =
+ new DefaultArtifact( "org.apache.maven", "artifactId", version, "compile", "pom", "", handler );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "pom" );
- VersionRange version = VersionRange.createFromVersion( "1.0-alpha-3" );
- Artifact artifact =
- new DefaultArtifact( "org.apache.maven", "artifactId", version, "compile", "pom", "", handler );
-
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- assertTrue( reporter.getFailures() == 1 );
- //System.out.println("INVALID POM ARTIFACT FAILURES --->> " + reporter.getFailures());
-
- }
- catch ( Exception e )
- {
-
- }
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 1, reporter.getFailures() );
}
* Test the InvalidPomArtifactReportProcessor when the artifact is a valid pom.
*/
public void testInvalidPomArtifactReportProcessorSuccess()
+ throws ReportProcessorException
{
+ ArtifactHandler handler = new DefaultArtifactHandler( "pom" );
+ VersionRange version = VersionRange.createFromVersion( "1.0-alpha-2" );
+ Artifact artifact = new DefaultArtifact( "groupId", "artifactId", version, "compile", "pom", "", handler );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "pom" );
- VersionRange version = VersionRange.createFromVersion( "1.0-alpha-2" );
- Artifact artifact = new DefaultArtifact( "groupId", "artifactId", version, "compile", "pom", "", handler );
-
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- assertTrue( reporter.getSuccesses() == 1 );
- //System.out.println("VALID POM ARTIFACT SUCCESS --->> " + reporter.getSuccesses());
-
- }
- catch ( Exception e )
- {
-
- }
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 1, reporter.getSuccesses() );
}
* Test the InvalidPomArtifactReportProcessor when the artifact is not a pom.
*/
public void testNotAPomArtifactReportProcessorSuccess()
+ throws ReportProcessorException
{
+ ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
+ VersionRange version = VersionRange.createFromVersion( "1.0-alpha-1" );
+ Artifact artifact = new DefaultArtifact( "groupId", "artifactId", version, "compile", "jar", "", handler );
- try
- {
- ArtifactHandler handler = new DefaultArtifactHandler( "jar" );
- VersionRange version = VersionRange.createFromVersion( "1.0-alpha-1" );
- Artifact artifact = new DefaultArtifact( "groupId", "artifactId", version, "compile", "jar", "", handler );
-
- artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
- assertTrue( reporter.getWarnings() == 1 );
- //System.out.println("NOT A POM ARTIFACT WARNINGS --->> " + reporter.getWarnings());
-
- }
- catch ( Exception e )
- {
-
- }
+ artifactReportProcessor.processArtifact( null, artifact, reporter, repository );
+ assertEquals( 1, reporter.getWarnings() );
}
/**
if(reporter.getSuccesses() == 1)
assertTrue(reporter.getSuccesses() == 1);
- //System.out.println("Remote pom SUCCESS --> " + reporter.getSuccesses());
}catch(Exception e){
}
if ( reporter.getSuccesses() > 0 )
assertTrue( reporter.getSuccesses() == 1 );
- // System.out.println("REMOTE ARTIFACT MATCH SUCCESSES ---> " + reporter.getSuccesses());
-
}
catch ( Exception e )
{
import java.util.List;
/**
- *
+ * @noinspection ReturnOfNull
*/
public class MockArtifact
implements Artifact
import org.apache.maven.artifact.versioning.VersionRange;
/**
- *
+ * @noinspection ReturnOfNull
*/
public class MockArtifactFactory
implements ArtifactFactory
import org.apache.maven.artifact.repository.metadata.Snapshot;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
return containsArtifact( artifact );
}
- public boolean containsArtifactVersion( Artifact artifact, String version )
- {
- return false;
- }
-
public List getVersions( Artifact artifact )
{
- return null;
+ return Collections.EMPTY_LIST;
}
}
+++ /dev/null
-<!--
- ~ Copyright 2005-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<metadata>
- <groupId>checksumTest</groupId>
- <artifactId>invalidArtifact</artifactId>
- <version>1.0</version>
-</metadata>
--- /dev/null
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<metadata>
+ <groupId>checksumTest</groupId>
+ <artifactId>invalidArtifact</artifactId>
+ <version>1.0</version>
+</metadata>
projects / archiva.git / commitdiff