Author: brett
Date: Tue Mar 17 13:46:17 2009
New Revision: 755243
URL: http://svn.apache.org/viewvc?rev=755243&view=rev
Log:
clean up warnings in archiva-converter
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java?rev=755243&r1=755242&r2=755243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
Tue Mar 17 13:46:17 2009
@@ -21,6 +21,8 @@
import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.converter.RepositoryConversionException;
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.scanner.RepositoryScanner;
@@ -65,7 +67,7 @@
private RepositoryScanner repoScanner;
public void convertLegacyRepository( File legacyRepositoryDirectory, File
repositoryDirectory,
- List fileExclusionPatterns )
+ List<String> fileExclusionPatterns )
throws RepositoryConversionException
{
try
@@ -85,11 +87,11 @@
legacyConverterConsumer.setExcludes( fileExclusionPatterns );
legacyConverterConsumer.setDestinationRepository( repository );
- List knownConsumers = new ArrayList();
+ List<KnownRepositoryContentConsumer> knownConsumers = new
ArrayList<KnownRepositoryContentConsumer>();
knownConsumers.add( legacyConverterConsumer );
- List invalidConsumers = Collections.EMPTY_LIST;
- List ignoredContent = new ArrayList();
+ List<InvalidRepositoryContentConsumer> invalidConsumers =
Collections.emptyList();
+ List<String> ignoredContent = new ArrayList<String>();
ignoredContent.addAll( Arrays.asList(
RepositoryScanner.IGNORABLE_CONTENT ) );
repoScanner.scan( legacyRepository, knownConsumers,
invalidConsumers, ignoredContent,
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=755243&r1=755242&r2=755243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
Tue Mar 17 13:46:17 2009
@@ -69,13 +69,13 @@
private ArtifactRepository destinationRepository;
- private List includes;
+ private List<String> includes;
- private List excludes;
+ private List<String> excludes;
public LegacyConverterArtifactConsumer()
{
- includes = new ArrayList();
+ includes = new ArrayList<String>();
includes.add( "**/*.jar" );
includes.add( "**/*.ear" );
includes.add( "**/*.war" );
@@ -93,12 +93,12 @@
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return excludes;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return includes;
}
@@ -139,12 +139,12 @@
return false;
}
- public void setExcludes( List excludes )
+ public void setExcludes( List<String> excludes )
{
this.excludes = excludes;
}
- public void setIncludes( List includes )
+ public void setIncludes( List<String> includes )
{
this.includes = includes;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java?rev=755243&r1=755242&r2=755243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
Tue Mar 17 13:46:17 2009
@@ -42,6 +42,6 @@
* @throws RepositoryConversionException
*/
void convertLegacyRepository( File legacyRepositoryDirectory, File
destinationRepositoryDirectory,
- List fileExclusionPatterns )
+ List<String> fileExclusionPatterns )
throws RepositoryConversionException;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java?rev=755243&r1=755242&r2=755243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
Tue Mar 17 13:46:17 2009
@@ -19,21 +19,19 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter;
-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.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Test the repository converter.
*
@@ -51,12 +49,6 @@
private LegacyRepositoryConverter repositoryConverter;
- private ArtifactFactory artifactFactory;
-
- private static final int SLEEP_MILLIS = 100;
-
- private I18N i18n;
-
protected void setUp()
throws Exception
{
@@ -82,10 +74,6 @@
targetRepository.setLayout( "default" );
repositoryConverter = (LegacyRepositoryConverter) lookup(
LegacyRepositoryConverter.ROLE, "default" );
-
- artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
-
- i18n = (I18N) lookup( I18N.ROLE );
}
protected void tearDown()
@@ -146,7 +134,7 @@
{
File legacyRepoDir = new File( sourceRepository.getBasedir() );
File destRepoDir = new File( targetRepository.getLocation() );
- List excludes = new ArrayList();
+ List<String> excludes = new ArrayList<String>();
repositoryConverter.convertLegacyRepository( legacyRepoDir,
destRepoDir, excludes );
}
}
