Author: joakime
Date: Wed Sep 26 14:13:25 2007
New Revision: 579799
URL: http://svn.apache.org/viewvc?rev=579799&view=rev
Log:
Updating all consumers with JDK5 Generics for Collections.
Correcting report output on model details in ProjectModelToDatabaseConsumer.
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeException.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/AbstractMonitoredConsumer.java
Wed Sep 26 14:13:25 2007
@@ -35,7 +35,7 @@
extends AbstractLogEnabled
implements BaseConsumer
{
- private Set monitors = new HashSet();
+ private Set<ConsumerMonitor> monitors = new HashSet<ConsumerMonitor>();
public void addConsumerMonitor( ConsumerMonitor monitor )
{
@@ -49,9 +49,9 @@
protected void triggerConsumerError( String type, String message )
{
- for ( Iterator itmonitors = monitors.iterator(); itmonitors.hasNext();
)
+ for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator();
itmonitors.hasNext(); )
{
- ConsumerMonitor monitor = (ConsumerMonitor) itmonitors.next();
+ ConsumerMonitor monitor = itmonitors.next();
try
{
monitor.consumerError( this, type, message );
@@ -65,9 +65,9 @@
protected void triggerConsumerWarning( String type, String message )
{
- for ( Iterator itmonitors = monitors.iterator(); itmonitors.hasNext();
)
+ for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator();
itmonitors.hasNext(); )
{
- ConsumerMonitor monitor = (ConsumerMonitor) itmonitors.next();
+ ConsumerMonitor monitor = itmonitors.next();
try
{
monitor.consumerWarning( this, type, message );
@@ -81,9 +81,9 @@
protected void triggerConsumerInfo( String message )
{
- for ( Iterator itmonitors = monitors.iterator(); itmonitors.hasNext();
)
+ for ( Iterator<ConsumerMonitor> itmonitors = monitors.iterator();
itmonitors.hasNext(); )
{
- ConsumerMonitor monitor = (ConsumerMonitor) itmonitors.next();
+ ConsumerMonitor monitor = itmonitors.next();
try
{
monitor.consumerInfo( this, message );
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ArchivaArtifactConsumer.java
Wed Sep 26 14:13:25 2007
@@ -36,7 +36,7 @@
*
* @return the list of ([EMAIL PROTECTED] String}) artifact types to
process.
*/
- public List getIncludedTypes();
+ public List<String> getIncludedTypes();
/**
* <p>
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
Wed Sep 26 14:13:25 2007
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.archiva.common.utils.BaseFile;
import org.apache.maven.archiva.model.ArchivaRepository;
import java.util.List;
@@ -37,14 +36,14 @@
*
* @return the list of [EMAIL PROTECTED] String} patterns. (example:
<code>"**<span />/*.pom"</code>)
*/
- public List getIncludes();
+ public List<String> getIncludes();
/**
* Get the list of excluded file patterns for this consumer.
*
* @return the list of [EMAIL PROTECTED] String} patterns. (example:
<code>"**<span />/*.pom"</code>) - (can be null for no exclusions)
*/
- public List getExcludes();
+ public List<String> getExcludes();
/**
* <p>
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
Wed Sep 26 14:13:25 2007
@@ -105,9 +105,9 @@
private BidirectionalRepositoryLayout layout;
- private List propertyNameTriggers = new ArrayList();
+ private List<String> propertyNameTriggers = new ArrayList<String>();
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
public String getId()
{
@@ -146,12 +146,12 @@
/* do nothing */
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return includes;
}
@@ -215,7 +215,7 @@
public void initialize()
throws InitializationException
{
- propertyNameTriggers = new ArrayList();
+ propertyNameTriggers = new ArrayList<String>();
propertyNameTriggers.add( "repositoryScanning" );
propertyNameTriggers.add( "fileTypes" );
propertyNameTriggers.add( "fileType" );
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
Wed Sep 26 14:13:25 2007
@@ -69,9 +69,9 @@
private File repositoryDir;
- private List propertyNameTriggers = new ArrayList();
+ private List<String> propertyNameTriggers = new ArrayList<String>();
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
public String getId()
{
@@ -99,12 +99,12 @@
/* do nothing */
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return includes;
}
@@ -143,7 +143,7 @@
public void initialize()
throws InitializationException
{
- propertyNameTriggers = new ArrayList();
+ propertyNameTriggers = new ArrayList<String>();
propertyNameTriggers.add( "repositoryScanning" );
propertyNameTriggers.add( "fileTypes" );
propertyNameTriggers.add( "fileType" );
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
Wed Sep 26 14:13:25 2007
@@ -60,9 +60,9 @@
private File repositoryDir;
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
- private Map extensionRenameMap = new HashMap();
+ private Map<String, String> extensionRenameMap = new HashMap<String,
String>();
public AutoRenameConsumer()
{
@@ -101,12 +101,12 @@
/* do nothing */
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return includes;
}
@@ -117,7 +117,7 @@
File file = new File( this.repositoryDir, path );
if ( file.exists() )
{
- Iterator itExtensions =
this.extensionRenameMap.keySet().iterator();
+ Iterator<String> itExtensions =
this.extensionRenameMap.keySet().iterator();
while ( itExtensions.hasNext() )
{
String extension = (String) itExtensions.next();
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
Wed Sep 26 14:13:25 2007
@@ -99,7 +99,7 @@
private BidirectionalRepositoryLayout repositoryLayout;
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
private long scanStartTimestamp = 0;
@@ -113,7 +113,7 @@
return id;
}
- public void setIncludes( List includes )
+ public void setIncludes( List<String> includes )
{
this.includes = includes;
}
@@ -141,12 +141,12 @@
/* do nothing here */
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return this.includes;
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
Wed Sep 26 14:13:25 2007
@@ -75,13 +75,11 @@
/**
* @plexus.requirement role="org.codehaus.plexus.digest.Digester"
*/
- private List digesterList;
-
- private ArchivaRepository repository;
+ private List<Digester> digesterList;
private File repositoryDir;
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
public String getId()
{
@@ -101,7 +99,6 @@
public void beginScan( ArchivaRepository repository )
throws ConsumerException
{
- this.repository = repository;
this.repositoryDir = new File( repository.getUrl().getPath() );
}
@@ -110,12 +107,12 @@
/* nothing to do */
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return this.includes;
}
@@ -149,9 +146,9 @@
public void initialize()
throws InitializationException
{
- for ( Iterator itDigesters = digesterList.iterator();
itDigesters.hasNext(); )
+ for ( Iterator<Digester> itDigesters = digesterList.iterator();
itDigesters.hasNext(); )
{
- Digester digester = (Digester) itDigesters.next();
+ Digester digester = itDigesters.next();
includes.add( "**/*" + digester.getFilenameExtension() );
}
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
Wed Sep 26 14:13:25 2007
@@ -44,6 +44,7 @@
* M2 implementation for cleaning up the released snapshots.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Maria Odea Ching</a>
+ * @version $Id$
*/
public class CleanupReleasedSnapshotsRepositoryPurge
extends AbstractRepositoryPurge
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
Wed Sep 26 14:13:25 2007
@@ -19,17 +19,9 @@
* under the License.
*/
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.model.ArchivaRepository;
-import
org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
-import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.indexer.RepositoryContentIndex;
-
/**
- *
* @author <a href="mailto:[EMAIL PROTECTED]">Maria Odea Ching</a>
- * @version
+ * @version $Id$
*/
public interface RepositoryPurge
{
@@ -40,5 +32,5 @@
*/
public void process( String path )
throws RepositoryPurgeException;
-
+
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
Wed Sep 26 14:13:25 2007
@@ -81,9 +81,9 @@
*/
private FileTypes filetypes;
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
- private List propertyNameTriggers = new ArrayList();
+ private List<String> propertyNameTriggers = new ArrayList<String>();
private RepositoryPurge repoPurge;
@@ -106,12 +106,12 @@
return false;
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return this.includes;
}
@@ -195,7 +195,7 @@
public void initialize()
throws InitializationException
{
- propertyNameTriggers = new ArrayList();
+ propertyNameTriggers = new ArrayList<String>();
propertyNameTriggers.add( "repositoryScanning" );
propertyNameTriggers.add( "fileTypes" );
propertyNameTriggers.add( "fileType" );
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeException.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeException.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeException.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeException.java
Wed Sep 26 14:13:25 2007
@@ -22,7 +22,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Maria Odea Ching</a>
- * @version
+ * @version $Id$
*/
public class RepositoryPurgeException
extends Exception
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Wed Sep 26 14:13:25 2007
@@ -109,7 +109,7 @@
private BidirectionalRepositoryLayout layout;
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
public String getId()
{
@@ -126,12 +126,12 @@
return true;
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return this.includes;
}
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/BytecodeStatsToDatabaseConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveArtifactConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/DatabaseCleanupRemoveProjectConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Wed Sep 26 14:13:25 2007
@@ -107,11 +107,11 @@
*/
private EffectiveProjectModelFilter effectiveModelFilter;
- private List includes;
+ private List<String> includes;
public ProjectModelToDatabaseConsumer()
{
- includes = new ArrayList();
+ includes = new ArrayList<String>();
includes.add( "pom" );
}
@@ -125,7 +125,7 @@
/* nothing to do here */
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
return includes;
}
@@ -291,8 +291,9 @@
{
StringBuffer emsg = new StringBuffer();
emsg.append( "File " ).append( artifactFile.getName() );
- emsg.append( " has an invalid project model [" ).append(
model.toString() ).append( "]: " );
- emsg.append( "The model artifactId [" ).append(
model.getArtifactId() );
+ emsg.append( " has an invalid project model [" );
+ appendModel( emsg, model );
+ emsg.append( "]: The model artifactId [" ).append(
model.getArtifactId() );
emsg.append( "] does not match the artifactId portion of the
filename: " ).append( parts.artifactId );
getLogger().warn(emsg.toString() );
@@ -306,8 +307,9 @@
{
StringBuffer emsg = new StringBuffer();
emsg.append( "File " ).append( artifactFile.getName() );
- emsg.append( " has an invalid project model [" ).append(
model.toString() ).append( "]: " );
- emsg.append( "The model version [" ).append(
model.getVersion() );
+ emsg.append( " has an invalid project model [" );
+ appendModel( emsg, model );
+ emsg.append( "]; The model version [" ).append(
model.getVersion() );
emsg.append( "] does not match the version portion of the
filename: " ).append( parts.version );
getLogger().warn(emsg.toString() );
@@ -323,6 +325,14 @@
}
return true;
+ }
+
+ private void appendModel( StringBuffer buf, ArchivaProjectModel model )
+ {
+ buf.append( "groupId:" ).append( model.getGroupId() );
+ buf.append( "|artifactId:" ).append( model.getArtifactId() );
+ buf.append( "|version:" ).append( model.getVersion() );
+ buf.append( "|packaging:" ).append( model.getPackaging() );
}
private void addProblem( ArchivaArtifact artifact, String msg )
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/VerifyMetadataAgainstDatabaseConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArchiveTableOfContentsConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
Wed Sep 26 14:13:25 2007
@@ -77,14 +77,14 @@
/**
* @plexus.requirement
role="org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout"
*/
- private Map bidirectionalLayoutMap;
+ private Map bidirectionalLayoutMap; // TODO: replace with new
bidir-repo-layout-factory
/**
* @plexus.requirement role-hint="lucene"
*/
private RepositoryContentIndexFactory indexFactory;
- private Map repositoryMap = new HashMap();
+ private Map<String, IndexedRepositoryDetails> repositoryMap = new
HashMap<String, IndexedRepositoryDetails>();
public void beginScan()
{
@@ -96,7 +96,7 @@
/* nothing to do here */
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
return null; // TODO: define these as a list of artifacts.
}
@@ -137,7 +137,7 @@
private IndexedRepositoryDetails getIndexedRepositoryDetails( String id )
{
- return (IndexedRepositoryDetails) this.repositoryMap.get( id );
+ return this.repositoryMap.get( id );
}
public String getDescription()
@@ -181,10 +181,10 @@
{
this.repositoryMap.clear();
- Iterator it =
configuration.getConfiguration().getManagedRepositories().iterator();
+ Iterator<ManagedRepositoryConfiguration> it =
configuration.getConfiguration().getManagedRepositories().iterator();
while ( it.hasNext() )
{
- ManagedRepositoryConfiguration repoconfig =
(ManagedRepositoryConfiguration) it.next();
+ ManagedRepositoryConfiguration repoconfig = it.next();
ArchivaRepository repository =
ArchivaConfigurationAdaptor.toArchivaRepository( repoconfig );
IndexedRepositoryDetails pnl = new IndexedRepositoryDetails();
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
Wed Sep 26 14:13:25 2007
@@ -91,9 +91,9 @@
*/
private BidirectionalRepositoryLayoutFactory layoutFactory;
- private List propertyNameTriggers = new ArrayList();
+ private List<String> propertyNameTriggers = new ArrayList<String>();
- private List includes = new ArrayList();
+ private List<String> includes = new ArrayList<String>();
private RepositoryContentIndex index;
@@ -118,12 +118,12 @@
return false;
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return null;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return this.includes;
}
@@ -208,7 +208,7 @@
public void initialize()
throws InitializationException
{
- propertyNameTriggers = new ArrayList();
+ propertyNameTriggers = new ArrayList<String>();
propertyNameTriggers.add( "repositoryScanning" );
propertyNameTriggers.add( "fileTypes" );
propertyNameTriggers.add( "fileType" );
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java?rev=579799&r1=579798&r2=579799&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/LuceneCleanupRemoveIndexedConsumer.java
Wed Sep 26 14:13:25 2007
@@ -62,7 +62,7 @@
}
- public List getIncludedTypes()
+ public List<String> getIncludedTypes()
{
// TODO Auto-generated method stub
return null;
