Author: hboutemy
Date: Sat Mar 27 00:33:45 2010
New Revision: 928113
URL: http://svn.apache.org/viewvc?rev=928113&view=rev
Log:
[MANTTASKS-181] updated code to Java 5, with generics
Modified:
maven/ant-tasks/trunk/pom.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/TypesArtifactFilter.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/VersionMapper.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/PomTestCase.java
Modified: maven/ant-tasks/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Sat Mar 27 00:33:45 2010
@@ -221,6 +221,13 @@
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>1.2.1</version>
</plugin>
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Sat Mar 27 00:33:45 2010
@@ -28,7 +28,6 @@ import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -258,10 +257,9 @@ public abstract class AbstractArtifactTa
else
{
// look in ${M2_HOME}/conf
- List env = Execute.getProcEnvironment();
- for ( Iterator iter = env.iterator(); iter.hasNext(); )
+ List<String> env = Execute.getProcEnvironment();
+ for ( String var: env )
{
- String var = (String) iter.next();
if ( var.startsWith( "M2_HOME=" ) )
{
String m2Home = var.substring( "M2_HOME=".length() );
@@ -440,7 +438,7 @@ public abstract class AbstractArtifactTa
repository.addAuthentication( new Authentication( server ) );
}
}
-
+
if ( repository.getProxy() == null )
{
org.apache.maven.settings.Proxy proxy =
getSettings().getActiveProxy();
@@ -514,7 +512,7 @@ public abstract class AbstractArtifactTa
/**
* Tries to initialize the pom. If no pom has been configured, returns
null.
- *
+ *
* @param localArtifactRepository
* @return An initialized pom or null.
*/
@@ -527,7 +525,7 @@ public abstract class AbstractArtifactTa
MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup(
MavenProjectBuilder.ROLE );
pom.initialiseMavenProject( projectBuilder,
localArtifactRepository );
}
-
+
return pom;
}
@@ -539,10 +537,10 @@ public abstract class AbstractArtifactTa
return pom;
}
-
+
/**
* Create a minimal project when no POM is available.
- *
+ *
* @param localRepository
* @return
*/
@@ -561,9 +559,9 @@ public abstract class AbstractArtifactTa
{
throw new BuildException( "Unable to create dummy Pom", e );
}
-
+
}
-
+
protected Artifact createDummyArtifact()
{
ArtifactFactory factory = (ArtifactFactory) lookup(
ArtifactFactory.ROLE );
@@ -575,11 +573,10 @@ public abstract class AbstractArtifactTa
{
try
{
- Map wagonMap = getContainer().lookupMap( Wagon.ROLE );
- List protocols = new ArrayList();
- for ( Iterator iter = wagonMap.entrySet().iterator();
iter.hasNext(); )
+ Map<String,Wagon> wagonMap = getContainer().lookupMap( Wagon.ROLE
);
+ List<String> protocols = new ArrayList<String>();
+ for ( Map.Entry<String,Wagon> entry : wagonMap.entrySet() )
{
- Map.Entry entry = (Map.Entry) iter.next();
protocols.add( entry.getKey() );
}
return (String[]) protocols.toArray( new String[protocols.size()]
);
@@ -594,7 +591,7 @@ public abstract class AbstractArtifactTa
{
return StringUtils.join( getSupportedProtocols(), ", " );
}
-
+
public void diagnoseError( Throwable error )
{
try
@@ -622,16 +619,16 @@ public abstract class AbstractArtifactTa
{
this.pom = pom;
}
-
+
/**
* Try to get the POM from the nested pom element or a pomRefId
- *
+ *
* @return The pom object
*/
public Pom getPom()
{
Pom thePom = this.pom;
-
+
if ( thePom != null && getPomRefId() != null )
{
throw new BuildException( "You cannot specify both a nested
\"pom\" element and a \"pomrefid\" attribute" );
@@ -649,10 +646,10 @@ public abstract class AbstractArtifactTa
throw new BuildException( "Reference '" + pomRefId + "' was
not found." );
}
}
-
+
return thePom;
}
-
+
public String getPomRefId()
{
return pomRefId;
@@ -709,7 +706,7 @@ public abstract class AbstractArtifactTa
{
// Display the version if the log level is verbose
showVersion();
-
+
ClassLoader originalClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
@@ -732,7 +729,7 @@ public abstract class AbstractArtifactTa
Thread.currentThread().setContextClassLoader( originalClassLoader
);
}
}
-
+
/**
* The main entry point for the task.
*/
@@ -742,31 +739,27 @@ public abstract class AbstractArtifactTa
* This method finds a matching mirror for the selected repository. If
there is an exact match,
* this will be used. If there is no exact match, then the list of mirrors
is examined to see if
* a pattern applies.
- *
+ *
* @param mirrors The available mirrors.
* @param repository See if there is a mirror for this repository.
* @return the selected mirror or null if none is found.
*/
- private Mirror getMirror( List mirrors, RemoteRepository repository )
+ private Mirror getMirror( List<Mirror> mirrors, RemoteRepository
repository )
{
String repositoryId = repository.getId();
if ( repositoryId != null )
{
- for ( Iterator it = mirrors.iterator(); it.hasNext(); )
+ for ( Mirror mirror : mirrors )
{
- Mirror mirror = (Mirror) it.next();
-
if ( repositoryId.equals( mirror.getMirrorOf() ) )
{
return mirror;
}
}
- for ( Iterator it = mirrors.iterator(); it.hasNext(); )
+ for ( Mirror mirror : mirrors )
{
- Mirror mirror = (Mirror) it.next();
-
if ( matchPattern( repository, mirror.getMirrorOf() ) )
{
return mirror;
@@ -781,7 +774,7 @@ public abstract class AbstractArtifactTa
* This method checks if the pattern matches the originalRepository. Valid
patterns: * =
* everything external:* = everything not on the localhost and not file
based. repo,repo1 = repo
* or repo1 *,!repo1 = everything except repo1
- *
+ *
* @param originalRepository to compare for a match.
* @param pattern used for match. Currently only '*' is supported.
* @return true if the repository is a match to this pattern.
@@ -800,11 +793,11 @@ public abstract class AbstractArtifactTa
{
// process the list
String[] repos = pattern.split( "," );
-
+
for ( int i = 0; i < repos.length; i++ )
{
String repo = repos[i];
-
+
// see if this is a negative match
if ( repo.length() > 1 && repo.startsWith( "!" ) )
{
@@ -839,7 +832,7 @@ public abstract class AbstractArtifactTa
/**
* Checks the URL to see if this repository refers to an external
repository
- *
+ *
* @param originalRepository
* @return true if external.
*/
@@ -862,11 +855,11 @@ public abstract class AbstractArtifactTa
*/
protected void showVersion()
{
-
+
Properties properties = new Properties();
final String antTasksPropertiesPath =
"META-INF/maven/org.apache.maven/maven-ant-tasks/pom.properties";
InputStream resourceAsStream =
AbstractArtifactTask.class.getClassLoader().getResourceAsStream(
antTasksPropertiesPath );
-
+
try
{
if ( resourceAsStream != null )
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
Sat Mar 27 00:33:45 2010
@@ -22,15 +22,15 @@ package org.apache.maven.artifact.ant;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Repository;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
/**
- * Base class for atifact tasks that are able to download artifact from repote
repositories.
+ * Base class for atifact tasks that are able to download artifact from repote
repositories.
* @version $Id$
*/
public abstract class AbstractArtifactWithRepositoryTask
@@ -39,11 +39,11 @@ public abstract class AbstractArtifactWi
/**
* List of Ant Tasks RemoteRepository-ies
*/
- private List remoteRepositories = new ArrayList();
+ private List<RemoteRepository> remoteRepositories = new
ArrayList<RemoteRepository>();
/**
* Get the default remote repository.
- * @return central repository
+ * @return central repository
*/
private static RemoteRepository getDefaultRemoteRepository()
{
@@ -62,7 +62,7 @@ public abstract class AbstractArtifactWi
return ( policy == null ) || policy.isEnabled() ? "enabled" :
"disabled";
}
- protected List createRemoteArtifactRepositories()
+ protected List<ArtifactRepository> createRemoteArtifactRepositories()
{
return createRemoteArtifactRepositories( null );
}
@@ -74,9 +74,9 @@ public abstract class AbstractArtifactWi
* @return the list of ArtifactRepository-ies
* @see #createRemoteArtifactRepository(RemoteRepository)
*/
- protected List createRemoteArtifactRepositories( List pomRepositories )
+ protected List<ArtifactRepository> createRemoteArtifactRepositories(
List<Repository> pomRepositories )
{
- List remoteRepositories = new ArrayList();
+ List<RemoteRepository> remoteRepositories = new
ArrayList<RemoteRepository>();
remoteRepositories.addAll( getRemoteRepositories() );
if ( getRemoteRepositories().isEmpty() )
@@ -86,21 +86,18 @@ public abstract class AbstractArtifactWi
if ( pomRepositories != null )
{
- for ( Iterator i = pomRepositories.iterator(); i.hasNext(); )
+ for ( Repository pomRepository : pomRepositories )
{
- Repository pomRepository = (Repository) i.next();
-
remoteRepositories.add( createAntRemoteRepository(
pomRepository ) );
}
}
log( "Using remote repositories:", Project.MSG_VERBOSE );
- List list = new ArrayList();
- for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); )
+ List<ArtifactRepository> list = new ArrayList<ArtifactRepository>();
+ for ( RemoteRepository remoteRepository : remoteRepositories )
{
- RemoteRepository remoteRepository = (RemoteRepository) i.next();
updateRepositoryWithSettings( remoteRepository );
-
+
StringBuffer msg = new StringBuffer();
msg.append( " - id=" + remoteRepository.getId() );
msg.append( ", url=" + remoteRepository.getUrl() );
@@ -115,22 +112,22 @@ public abstract class AbstractArtifactWi
msg.append( ", proxy=" + remoteRepository.getProxy().getHost()
);
}
getProject().log( msg.toString(), Project.MSG_VERBOSE );
-
+
list.add( createRemoteArtifactRepository( remoteRepository ) );
}
return list;
}
- public List getRemoteRepositories()
+ public List<RemoteRepository> getRemoteRepositories()
{
return remoteRepositories;
}
/**
* This is called automatically by ant when the task is initialized.
- * Need to use "addConfigured..." instead of "add..." because the
+ * Need to use "addConfigured..." instead of "add..." because the
* repository Id and URL need to be set before the method is called.
- *
+ *
* @param remoteRepository
*/
public void addConfiguredRemoteRepository( RemoteRepository
remoteRepository )
@@ -149,16 +146,16 @@ public abstract class AbstractArtifactWi
}
remoteRepositories.add( remoteRepository );
}
-
+
public final String MD5_ALGO_NAME = "MD5";
-
+
public final String UTF_ENC_NAME = "UTF-8";
-
+
/**
* Generates an MD5 digest based on the url of the repository.
- * This is safer to use for the id than the url.
+ * This is safer to use for the id than the url.
* MANTTASKS-142
- *
+ *
* @param repository
* @return
*/
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Sat Mar 27 00:33:45 2010
@@ -65,7 +65,7 @@ public class DependenciesTask
public static final String DEFAULT_ANT_BUILD_FILE =
"target/build-dependencies.xml";
- private List dependencies = new ArrayList();
+ private List<Dependency> dependencies = new ArrayList<Dependency>();
/**
* The id of the path object containing a list of all dependencies.
@@ -184,18 +184,18 @@ public class DependenciesTask
ArtifactResolutionResult result;
- List remoteArtifactRepositories = createRemoteArtifactRepositories(
pom.getRepositories() );
+ List<ArtifactRepository> remoteArtifactRepositories =
createRemoteArtifactRepositories( pom.getRepositories() );
try
{
- Set artifacts = MavenMetadataSource.createArtifacts(
artifactFactory, dependencies, null, null, null );
+ Set<Artifact> artifacts = MavenMetadataSource.createArtifacts(
artifactFactory, dependencies, null, null, null );
Artifact pomArtifact = artifactFactory.createBuildArtifact(
pom.getGroupId(), pom.getArtifactId(),
pom.getVersion(), pom.getPackaging() );
- List listeners = Collections.singletonList( new
AntResolutionListener( getProject() ) );
+ List<AntResolutionListener> listeners = Collections.singletonList(
new AntResolutionListener( getProject() ) );
- Map managedDependencies =
pom.getMavenProject().getManagedVersionMap();
+ Map<String,Artifact> managedDependencies =
pom.getMavenProject().getManagedVersionMap();
ArtifactFilter filter = null;
if ( useScope != null )
@@ -246,9 +246,9 @@ public class DependenciesTask
Path dependencyPath = new Path( getProject() );
- Set versions = new HashSet();
+ Set<String> versions = new HashSet<String>();
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = result.getArtifacts().iterator();
i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
@@ -303,8 +303,7 @@ public class DependenciesTask
antBuildWriter.openTarget( "init-dependencies" );
antBuildWriter.writeEcho( "Loading dependency paths from file:
" + antBuildFile.getAbsolutePath() );
- Iterator i = result.getArtifacts().iterator();
- while ( i.hasNext() )
+ for ( Iterator<Artifact> i = result.getArtifacts().iterator();
i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
String conflictId = artifact.getDependencyConflictId();
@@ -449,7 +448,7 @@ public class DependenciesTask
}
private void resolveSource( ArtifactFactory artifactFactory,
ArtifactResolver resolver,
- List remoteArtifactRepositories,
ArtifactRepository localRepo,
+ List<ArtifactRepository>
remoteArtifactRepositories, ArtifactRepository localRepo,
Artifact artifact, String classifier, FileSet
sourcesFileSet )
{
Artifact sourceArtifact =
@@ -471,7 +470,7 @@ public class DependenciesTask
}
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
return dependencies;
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
Sat Mar 27 00:33:45 2010
@@ -31,8 +31,6 @@ import org.apache.maven.project.artifact
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import java.util.Iterator;
-
/**
* Deploy task, using maven-artifact.
*
@@ -57,7 +55,7 @@ public class DeployTask
{
if ( repository.getId().equals( repository.getUrl() ) )
{
- // MANTTASKS-103: avoid default id set to the url, since it is
used for maven-metadata-<id>.xml
+ // MANTTASKS-103: avoid default id set to the url, since it is
used for maven-metadata-<id>.xml
repository.setId( "remote" );
}
@@ -94,7 +92,7 @@ public class DeployTask
throw new BuildException( "You must specify a file and/or an
attached artifact "
+ "to deploy to the repository." );
}
-
+
ArtifactRepository localRepo = createLocalArtifactRepository();
Pom pom = initializePom( localRepo );
@@ -103,7 +101,7 @@ public class DeployTask
{
throw new BuildException( "A POM element is required to deploy to
the repository" );
}
-
+
Artifact artifact = pom.getArtifact();
// Deploy the POM
@@ -135,11 +133,8 @@ public class DeployTask
// Deploy any attached artifacts
if ( attachedArtifacts != null )
{
- Iterator iter = pom.getAttachedArtifacts().iterator();
-
- while ( iter.hasNext() )
+ for ( Artifact attachedArtifact : pom.getAttachedArtifacts() )
{
- Artifact attachedArtifact = (Artifact) iter.next();
deployer.deploy( attachedArtifact.getFile(),
attachedArtifact, deploymentRepository, localRepo );
}
}
@@ -150,7 +145,7 @@ public class DeployTask
"Error deploying artifact '" +
artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
}
}
-
+
private ArtifactRepository getDeploymentRepository( Pom pom, Artifact
artifact )
{
DistributionManagement distributionManagement =
pom.getDistributionManagement();
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
Sat Mar 27 00:33:45 2010
@@ -21,7 +21,6 @@ package org.apache.maven.artifact.ant;
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -43,7 +42,7 @@ public abstract class InstallDeployTaskS
/**
* Additional attached artifacts to install/deploy
*/
- protected List attachedArtifacts = new ArrayList();
+ protected List<AttachedArtifact> attachedArtifacts = new
ArrayList<AttachedArtifact>();
public File getFile()
{
@@ -54,7 +53,7 @@ public abstract class InstallDeployTaskS
{
this.file = file;
}
-
+
public Pom initializePom( ArtifactRepository localArtifactRepository )
{
Pom pom = super.initializePom( localArtifactRepository );
@@ -62,15 +61,12 @@ public abstract class InstallDeployTaskS
// attach artifacts
if ( attachedArtifacts != null )
{
- Iterator iter = attachedArtifacts.iterator();
-
- while ( iter.hasNext() )
+ for ( AttachedArtifact attached : attachedArtifacts )
{
- AttachedArtifact attached = (AttachedArtifact) iter.next();
pom.attach( attached );
}
}
-
+
return pom;
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
Sat Mar 27 00:33:45 2010
@@ -27,8 +27,6 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.tools.ant.BuildException;
-import java.util.Iterator;
-
/**
* Install task, using maven-artifact.
*
@@ -46,7 +44,7 @@ public class InstallTask
throw new BuildException( "You must specify a file and/or an
attached artifact "
+ "to install to the local repository." );
}
-
+
ArtifactRepository localRepo = createLocalArtifactRepository();
Pom pom = initializePom( localRepo );
@@ -55,7 +53,7 @@ public class InstallTask
{
throw new BuildException( "A POM element is required to install to
the local repository" );
}
-
+
Artifact artifact = pom.getArtifact();
boolean isPomArtifact = "pom".equals( pom.getPackaging() );
@@ -83,11 +81,8 @@ public class InstallTask
// Install any attached artifacts
if ( attachedArtifacts != null )
{
- Iterator iter = pom.getAttachedArtifacts().iterator();
-
- while ( iter.hasNext() )
+ for ( Artifact attachedArtifact : pom.getAttachedArtifacts() )
{
- Artifact attachedArtifact = (Artifact) iter.next();
installer.install( attachedArtifact.getFile(),
attachedArtifact, localRepo );
}
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
Sat Mar 27 00:33:45 2010
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -57,7 +58,7 @@ public class InstallWagonProviderTask
{
return groupId;
}
-
+
public void setGroupId( String groupId )
{
this.groupId = groupId;
@@ -107,7 +108,7 @@ public class InstallWagonProviderTask
{
MavenMetadataSource metadataSource = (MavenMetadataSource) lookup(
ArtifactMetadataSource.ROLE );
ArtifactResolver resolver = (ArtifactResolver) lookup(
ArtifactResolver.ROLE );
- List remoteRepositories = createRemoteArtifactRepositories();
+ List<ArtifactRepository> remoteRepositories =
createRemoteArtifactRepositories();
result = resolver.resolveTransitively( Collections.singleton(
providerArtifact ),
createDummyArtifact(),
createLocalArtifactRepository(),
@@ -125,7 +126,7 @@ public class InstallWagonProviderTask
try
{
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = result.getArtifacts().iterator();
i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -136,7 +137,7 @@ public class InstallWagonProviderTask
{
throw new BuildException( "Unable to locate wagon provider in
remote repository", e );
}
-
+
log( "Protocols now supported: " + getSupportedProtocolsAsString(),
Project.MSG_VERBOSE );
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
(original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
Sat Mar 27 00:33:45 2010
@@ -190,7 +190,7 @@ public class Pom
}
}
- public List getAttachedArtifacts()
+ public List<Artifact> getAttachedArtifacts()
{
return getMavenProject().getAttachedArtifacts();
}
@@ -245,7 +245,7 @@ public class Pom
return getMavenProject().getContributors();
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
return getMavenProject().getDependencies();
}
@@ -330,7 +330,7 @@ public class Pom
return getMavenProject().getReporting();
}
- public List getRepositories()
+ public List<Repository> getRepositories()
{
return getMavenProject().getRepositories();
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/TypesArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/TypesArtifactFilter.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/TypesArtifactFilter.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/TypesArtifactFilter.java
Sat Mar 27 00:33:45 2010
@@ -27,16 +27,16 @@ import java.util.List;
/**
* Artifact Filter which filters on artifact types.
- *
+ *
*/
public class TypesArtifactFilter
implements ArtifactFilter
{
- private List types = new ArrayList();
+ private List<String> types = new ArrayList<String>();
- /**
+ /**
* Accepts a comma separated list of types
- *
+ *
* @param types
*/
public TypesArtifactFilter( String types )
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/VersionMapper.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/VersionMapper.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/VersionMapper.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/VersionMapper.java
Sat Mar 27 00:33:45 2010
@@ -22,7 +22,6 @@ package org.apache.maven.artifact.ant;
import java.io.File;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import org.apache.tools.ant.util.FileNameMapper;
@@ -34,18 +33,17 @@ import org.codehaus.plexus.util.StringUt
* @author <a href="mailto:[email protected]";>Herve Boutemy</a>
* @version $Id$
*/
-public class VersionMapper implements FileNameMapper, Comparator
+public class VersionMapper implements FileNameMapper, Comparator<String>
{
- private List versions;
+ private List<String> versions;
private String to;
public String[] mapFileName( String sourceFileName )
{
String originalFileName = new java.io.File( sourceFileName ).getName();
- for ( Iterator iter = versions.iterator(); iter.hasNext(); )
+ for ( String version : versions )
{
- String version = (String) iter.next();
int index = originalFileName.indexOf( version );
if ( index >= 0 )
{
@@ -84,10 +82,8 @@ public class VersionMapper implements Fi
this.to = to;
}
- public int compare( Object o1, Object o2 )
+ public int compare( String s1, String s2 )
{
- String s1 = (String) o1;
- String s2 = (String) o2;
int lengthDiff = s2.length() - s1.length();
return ( lengthDiff != 0 ) ? lengthDiff : s1.compareTo( s2 );
}
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
(original)
+++
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/util/AntUtil.java
Sat Mar 27 00:33:45 2010
@@ -49,12 +49,11 @@ public class AntUtil
* @param props properties <code>Hashtable</code> to copy to the new
project.
* @param project the project where the properties are added
*/
- public static void copyProperties( Hashtable props, Project project )
+ public static void copyProperties( Hashtable<String,String> props, Project
project )
{
- Enumeration e = props.keys();
- while ( e.hasMoreElements() )
+ for ( Enumeration<String> e = props.keys(); e.hasMoreElements(); )
{
- String key = e.nextElement().toString();
+ String key = e.nextElement();
if ( "basedir".equals( key ) || "ant.file".equals( key ) )
{
// basedir and ant.file get special treatment in execute()
@@ -89,12 +88,11 @@ public class AntUtil
* @param refs
* @param project
*/
- public static void copyReferences( Hashtable refs, Project project )
+ public static void copyReferences( Hashtable<String,String> refs, Project
project )
{
- Enumeration e = refs.keys();
- while ( e.hasMoreElements() )
+ for ( Enumeration<String> e = refs.keys(); e.hasMoreElements(); )
{
- String key = e.nextElement().toString();
+ String key = e.nextElement();
// don't overwrite existing references
if ( project.getReference( key ) == null )
{
Modified:
maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/PomTestCase.java
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/PomTestCase.java?rev=928113&r1=928112&r2=928113&view=diff
==============================================================================
---
maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/PomTestCase.java
(original)
+++
maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/PomTestCase.java
Sat Mar 27 00:33:45 2010
@@ -10,12 +10,12 @@ public class PomTestCase
{
RemoteRepository repo = new RemoteRepository();
repo.setUrl( "file:///home/test/stuff" );
-
+
Pom task = new Pom();
String defaultId = task.generateDefaultRepositoryId( repo );
if ( defaultId.equals( repo.getUrl() ) )
{
- this.fail( "MD5 digest not calculated" );
+ fail( "MD5 digest not calculated" );
}
}
}
