Author: brett
Date: Sun Jan 8 19:27:30 2006
New Revision: 367174
URL: http://svn.apache.org/viewcvs?rev=367174&view=rev
Log:
remove unnecessary methods on index
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java?rev=367174&r1=367173&r2=367174&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndex.java
Sun Jan 8 19:27:30 2006
@@ -89,25 +89,6 @@
}
/**
- * generic method for indexing
- *
- * @param obj the object to be indexed by this indexer
- */
- public void index( Object obj )
- throws RepositoryIndexException
- {
- if ( obj instanceof Artifact )
- {
- indexArtifact( (Artifact) obj );
- }
- else
- {
- throw new RepositoryIndexException(
- "This instance of indexer cannot index instances of " +
obj.getClass().getName() );
- }
- }
-
- /**
* method to index a given artifact
*
* @param artifact the Artifact object to be indexed
@@ -126,12 +107,10 @@
String sha1sum;
String md5sum;
- ZipFile jar;
try
{
sha1sum = digester.createChecksum( artifact.getFile(),
Digester.SHA1 );
md5sum = digester.createChecksum( artifact.getFile(), Digester.MD5
);
- jar = new ZipFile( artifact.getFile() );
}
catch ( NoSuchAlgorithmException e )
{
@@ -141,23 +120,36 @@
{
throw new RepositoryIndexException( "Error reading from artifact
file", e );
}
- catch ( ZipException e )
- {
- throw new RepositoryIndexException( "Error reading from artifact
file", e );
- }
catch ( IOException e )
{
throw new RepositoryIndexException( "Error reading from artifact
file", e );
}
- for ( Enumeration entries = jar.entries(); entries.hasMoreElements(); )
+ try
{
- ZipEntry entry = (ZipEntry) entries.nextElement();
- if ( addIfClassEntry( entry, classes ) )
+ // TODO: improve
+ if ( "jar".equals( artifact.getType() ) )
{
- addClassPackage( entry.getName(), packages );
+ 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 );
+ }
}
- addFile( entry, files );
+ }
+ catch ( ZipException e )
+ {
+ throw new RepositoryIndexException( "Error reading from artifact
file: " + artifact.getFile(), e );
+ }
+ catch ( IOException e )
+ {
+ throw new RepositoryIndexException( "Error reading from artifact
file", e );
}
//@todo should some of these fields be Keyword instead of Text ?
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java?rev=367174&r1=367173&r2=367174&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndex.java
Sun Jan 8 19:27:30 2006
@@ -24,12 +24,7 @@
*/
public interface RepositoryIndex
{
- String ROLE = RepositoryIndex.class.getName();
-
boolean isOpen();
-
- void index( Object obj )
- throws RepositoryIndexException;
void close()
throws RepositoryIndexException;
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=367174&r1=367173&r2=367174&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Sun Jan 8 19:27:30 2006
@@ -136,16 +136,6 @@
indexer = factory.createArtifactRepositoryIndex( indexPath, repository
);
- try
- {
- indexer.index( "should fail" );
- fail( "Must throw exception on add non-Artifact object." );
- }
- catch ( RepositoryIndexException e )
- {
- // expected
- }
-
indexer.close();
}
@@ -170,7 +160,7 @@
artifact = getArtifact( "test", "test-artifactId", "1.0" );
artifact.setFile( new File( repository.getBasedir(),
repository.pathOf( artifact ) ) );
- indexer.index( artifact );
+ indexer.indexArtifact( artifact );
indexer.optimize();
indexer.close();
