You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/04/22 18:14:22 UTC
svn commit: r767581 - in /maven/components/branches/maven-2.1.x:
maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/
maven-artifact/src/main/java/org/apache/maven/artifact/
maven-artifact/src/main/java/org/apache/maven/artifact/tr...
Author: jdcasey
Date: Wed Apr 22 16:14:21 2009
New Revision: 767581
URL: http://svn.apache.org/viewvc?rev=767581&view=rev
Log:
rolling back -r 767324:767321 to keep things simple. This generics conversion work has been moved to 2.2.x branch.
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Wed Apr 22 16:14:21 2009
@@ -48,7 +48,7 @@
protected WagonManager wagonManager;
- protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ protected String resolveVersion( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws RepositoryMetadataResolutionException
{
RepositoryMetadata metadata;
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Wed Apr 22 16:14:21 2009
@@ -28,30 +28,32 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import java.util.Iterator;
import java.util.List;
public class DefaultArtifactTransformationManager
implements ArtifactTransformationManager, Initializable
{
- private List<ArtifactTransformation> artifactTransformations;
+ private List artifactTransformations;
public void initialize() throws InitializationException {
// TODO this is a hack until plexus can fix the ordering of the arrays
- ArtifactTransformation transforms[] = artifactTransformations.toArray( new ArtifactTransformation[]{} );
- for (int x = 0; x < transforms.length; x++)
+ Object obj[] = artifactTransformations.toArray();
+ for (int x = 0; x < obj.length; x++)
{
- if (transforms[x].getClass().getName().indexOf("Snapshot") != -1) {
- artifactTransformations.remove(transforms[x]);
- artifactTransformations.add(transforms[x]);
+ if (obj[x].getClass().getName().indexOf("Snapshot") != -1) {
+ artifactTransformations.remove(obj[x]);
+ artifactTransformations.add(obj[x]);
}
}
}
- public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- for ( ArtifactTransformation transform : artifactTransformations )
+ for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
+ ArtifactTransformation transform = (ArtifactTransformation) i.next();
transform.transformForResolve( artifact, remoteRepositories, localRepository );
}
}
@@ -59,8 +61,9 @@
public void transformForInstall( Artifact artifact, ArtifactRepository localRepository )
throws ArtifactInstallationException
{
- for ( ArtifactTransformation transform : artifactTransformations )
+ for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
+ ArtifactTransformation transform = (ArtifactTransformation) i.next();
transform.transformForInstall( artifact, localRepository );
}
}
@@ -69,8 +72,9 @@
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
- for ( ArtifactTransformation transform : artifactTransformations )
+ for ( Iterator i = artifactTransformations.iterator(); i.hasNext(); )
{
+ ArtifactTransformation transform = (ArtifactTransformation) i.next();
transform.transformForDeployment( artifact, remoteRepository, localRepository );
}
}
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Wed Apr 22 16:14:21 2009
@@ -31,7 +31,7 @@
public class LatestArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.LATEST_VERSION.equals( artifact.getVersion() ) )
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Wed Apr 22 16:14:21 2009
@@ -39,7 +39,7 @@
public class ReleaseArtifactTransformation
extends AbstractVersionTransformation
{
- public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Wed Apr 22 16:14:21 2009
@@ -52,7 +52,7 @@
private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss";
- public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException
{
// Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not 1.0-20050607.123456)
Modified: maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java Wed Apr 22 16:14:21 2009
@@ -39,7 +39,7 @@
* @todo get rid of the multiple states we can have (project, parent, etc artifacts, file == null, snapshot, etc) - construct subclasses and use accordingly?
*/
public interface Artifact
- extends Comparable<Artifact>
+ extends Comparable
{
String LATEST_VERSION = "LATEST";
@@ -105,9 +105,9 @@
void addMetadata( ArtifactMetadata metadata );
- ArtifactMetadata getMetadata( Class<?> metadataClass );
+ ArtifactMetadata getMetadata( Class metadataClass );
- Collection<ArtifactMetadata> getMetadataList();
+ Collection getMetadataList();
void setRepository( ArtifactRepository remoteRepository );
@@ -128,12 +128,12 @@
/**
* @return {@link List} < {@link String} > with artifact ids
*/
- List<String> getDependencyTrail();
+ List getDependencyTrail();
/**
* @param dependencyTrail {@link List} < {@link String} > with artifact ids
*/
- void setDependencyTrail( List<String> dependencyTrail );
+ void setDependencyTrail( List dependencyTrail );
void setScope( String scope );
@@ -164,9 +164,9 @@
void setRelease( boolean release );
- List<ArtifactVersion> getAvailableVersions();
+ List getAvailableVersions();
- void setAvailableVersions( List<ArtifactVersion> versions );
+ void setAvailableVersions( List versions );
boolean isOptional();
Modified: maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Wed Apr 22 16:14:21 2009
@@ -32,6 +32,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -71,7 +72,7 @@
private ArtifactHandler artifactHandler;
- private List<String> dependencyTrail;
+ private List dependencyTrail;
private String version;
@@ -81,9 +82,9 @@
private boolean release;
- private List<ArtifactVersion> availableVersions;
+ private List availableVersions;
- private Map<Object, ArtifactMetadata> metadataMap;
+ private Map metadataMap;
private boolean optional;
@@ -250,7 +251,7 @@
{
if ( metadataMap == null )
{
- metadataMap = new HashMap<Object, ArtifactMetadata>();
+ metadataMap = new HashMap();
}
ArtifactMetadata m = (ArtifactMetadata) metadataMap.get( metadata.getKey() );
@@ -264,14 +265,15 @@
}
}
- public ArtifactMetadata getMetadata( Class<?> metadataClass )
+ public ArtifactMetadata getMetadata( Class metadataClass )
{
- Collection<ArtifactMetadata> metadata = getMetadataList();
+ Collection metadata = getMetadataList();
if ( metadata != null )
{
- for ( ArtifactMetadata m : metadata )
+ for ( Iterator it = metadata.iterator(); it.hasNext(); )
{
+ ArtifactMetadata m = (ArtifactMetadata) it.next();
if ( metadataClass.isAssignableFrom( m.getClass() ) )
{
return m;
@@ -282,19 +284,9 @@
return null;
}
- public Collection<ArtifactMetadata> getMetadataList()
+ public Collection getMetadataList()
{
- Collection<ArtifactMetadata> result;
- if ( metadataMap == null )
- {
- result = Collections.emptyList();
- }
- else
- {
- result = metadataMap.values();
- }
-
- return result;
+ return metadataMap == null ? Collections.EMPTY_LIST : metadataMap.values();
}
// ----------------------------------------------------------------------
@@ -422,8 +414,10 @@
}
}
- public int compareTo( Artifact a )
+ public int compareTo( Object o )
{
+ Artifact a = (Artifact) o;
+
int result = groupId.compareTo( a.getGroupId() );
if ( result == 0 )
{
@@ -493,12 +487,12 @@
return artifactHandler;
}
- public List<String> getDependencyTrail()
+ public List getDependencyTrail()
{
return dependencyTrail;
}
- public void setDependencyTrail( List<String> dependencyTrail )
+ public void setDependencyTrail( List dependencyTrail )
{
this.dependencyTrail = dependencyTrail;
}
@@ -600,12 +594,12 @@
return release;
}
- public List<ArtifactVersion> getAvailableVersions()
+ public List getAvailableVersions()
{
return availableVersions;
}
- public void setAvailableVersions( List<ArtifactVersion> availableVersions )
+ public void setAvailableVersions( List availableVersions )
{
this.availableVersions = availableVersions;
}
Modified: maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Wed Apr 22 16:14:21 2009
@@ -45,7 +45,7 @@
* @param remoteRepositories the repositories to check
* @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
Modified: maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Wed Apr 22 16:14:21 2009
@@ -43,7 +43,7 @@
* @param remoteRepositories the repositories to check
* @param localRepository the local repository
*/
- void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java Wed Apr 22 16:14:21 2009
@@ -151,7 +151,7 @@
}
/** {@inheritDoc} */
- public Collection<ArtifactMetadata> getMetadataList()
+ public Collection getMetadataList()
{
return artifact.getMetadataList();
}
@@ -205,13 +205,13 @@
}
/** {@inheritDoc} */
- public List<String> getDependencyTrail()
+ public List getDependencyTrail()
{
return artifact.getDependencyTrail();
}
/** {@inheritDoc} */
- public void setDependencyTrail( List<String> dependencyTrail )
+ public void setDependencyTrail( List dependencyTrail )
{
artifact.setDependencyTrail( dependencyTrail );
}
@@ -259,9 +259,9 @@
}
/** {@inheritDoc} */
- public int compareTo( Artifact a )
+ public int compareTo( Object o )
{
- return artifact.compareTo( a );
+ return artifact.compareTo( o );
}
/** {@inheritDoc} */
@@ -307,13 +307,13 @@
}
/** {@inheritDoc} */
- public List<ArtifactVersion> getAvailableVersions()
+ public List getAvailableVersions()
{
return artifact.getAvailableVersions();
}
/** {@inheritDoc} */
- public void setAvailableVersions( List<ArtifactVersion> versions )
+ public void setAvailableVersions( List versions )
{
artifact.setAvailableVersions( versions );
}
@@ -400,7 +400,7 @@
return true;
}
- public ArtifactMetadata getMetadata( Class<?> metadataClass )
+ public ArtifactMetadata getMetadata( Class metadataClass )
{
return artifact.getMetadata( metadataClass );
}
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java Wed Apr 22 16:14:21 2009
@@ -235,7 +235,7 @@
}
}
- public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+ public void transformForResolve( Artifact artifact, List remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java Wed Apr 22 16:14:21 2009
@@ -19,6 +19,18 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
@@ -42,17 +54,6 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
/**
* Use a regular expression search to find and resolve expressions within the POM.
*
@@ -64,13 +65,13 @@
extends AbstractLogEnabled
implements ModelInterpolator, Initializable
{
- private static final List<String> PROJECT_PREFIXES = Arrays.asList( new String[]{ "pom.", "project." } );
+ private static final List PROJECT_PREFIXES = Arrays.asList( new String[]{ "pom.", "project." } );
- private static final List<String> TRANSLATED_PATH_EXPRESSIONS;
+ private static final List TRANSLATED_PATH_EXPRESSIONS;
static
{
- List<String> translatedPrefixes = new ArrayList<String>();
+ List translatedPrefixes = new ArrayList();
// MNG-1927, MNG-2124, MNG-3355:
// If the build section is present and the project directory is non-null, we should make
@@ -108,7 +109,7 @@
{
}
- public Model interpolate( Model model, Map<String, ?> context )
+ public Model interpolate( Model model, Map context )
throws ModelInterpolationException
{
return interpolate( model, context, true );
@@ -126,7 +127,7 @@
*
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
*/
- public Model interpolate( Model model, Map<String, ?> context, boolean strict )
+ public Model interpolate( Model model, Map context, boolean strict )
throws ModelInterpolationException
{
Properties props = new Properties();
@@ -203,8 +204,8 @@
{
try
{
- List<ValueSource> valueSources = createValueSources( model, projectDir, config );
- List<InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
+ List valueSources = createValueSources( model, projectDir, config );
+ List postProcessors = createPostProcessors( model, projectDir, config );
return interpolateInternal( src, valueSources, postProcessors, debug );
}
@@ -214,7 +215,7 @@
}
}
- protected List<ValueSource> createValueSources( final Model model, final File projectDir, final ProjectBuilderConfiguration config )
+ protected List createValueSources( final Model model, final File projectDir, final ProjectBuilderConfiguration config )
{
String timestampFormat = DEFAULT_BUILD_TIMESTAMP_FORMAT;
@@ -250,7 +251,7 @@
},
PROJECT_PREFIXES, false );
- List<ValueSource> valueSources = new ArrayList<ValueSource>( 9 );
+ List valueSources = new ArrayList( 9 );
// NOTE: Order counts here!
valueSources.add( basedirValueSource );
@@ -272,19 +273,12 @@
return valueSources;
}
- protected List<InterpolationPostProcessor> createPostProcessors( final Model model, final File projectDir,
- final ProjectBuilderConfiguration config )
+ protected List createPostProcessors( final Model model, final File projectDir, final ProjectBuilderConfiguration config )
{
- return Collections.singletonList( (InterpolationPostProcessor) new PathTranslatingPostProcessor(
- PROJECT_PREFIXES,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir,
- pathTranslator ) );
+ return Collections.singletonList( new PathTranslatingPostProcessor( PROJECT_PREFIXES, TRANSLATED_PATH_EXPRESSIONS, projectDir, pathTranslator ) );
}
- @SuppressWarnings("unchecked")
- protected String interpolateInternal( String src, List<ValueSource> valueSources,
- List<InterpolationPostProcessor> postProcessors, boolean debug )
+ protected String interpolateInternal( String src, List valueSources, List postProcessors, boolean debug )
throws ModelInterpolationException
{
if ( src.indexOf( "${" ) < 0 )
@@ -298,13 +292,16 @@
synchronized( this )
{
- for ( ValueSource vs : valueSources )
+ for ( Iterator it = valueSources.iterator(); it.hasNext(); )
{
+ ValueSource vs = (ValueSource) it.next();
interpolator.addValueSource( vs );
}
- for ( InterpolationPostProcessor postProcessor : postProcessors )
+ for ( Iterator it = postProcessors.iterator(); it.hasNext(); )
{
+ InterpolationPostProcessor postProcessor = (InterpolationPostProcessor) it.next();
+
interpolator.addPostProcessor( postProcessor );
}
@@ -321,14 +318,16 @@
if ( debug )
{
- List<Object> feedback = (List<Object>) interpolator.getFeedback();
+ List feedback = interpolator.getFeedback();
if ( feedback != null && !feedback.isEmpty() )
{
logger.debug( "Maven encountered the following problems during initial POM interpolation:" );
Object last = null;
- for ( Object next : feedback )
+ for ( Iterator it = feedback.iterator(); it.hasNext(); )
{
+ Object next = it.next();
+
if ( next instanceof Throwable )
{
if ( last == null )
@@ -362,13 +361,15 @@
}
finally
{
- for ( ValueSource vs : valueSources )
+ for ( Iterator iterator = valueSources.iterator(); iterator.hasNext(); )
{
+ ValueSource vs = (ValueSource) iterator.next();
interpolator.removeValuesSource( vs );
}
- for ( InterpolationPostProcessor postProcessor : postProcessors )
+ for ( Iterator iterator = postProcessors.iterator(); iterator.hasNext(); )
{
+ InterpolationPostProcessor postProcessor = (InterpolationPostProcessor) iterator.next();
interpolator.removePostProcessor( postProcessor );
}
}
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java Wed Apr 22 16:14:21 2009
@@ -24,7 +24,6 @@
* <p/>
* Created on Feb 2, 2005
*/
-@SuppressWarnings("serial")
public class ModelInterpolationException
extends Exception
{
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java Wed Apr 22 16:14:21 2009
@@ -41,13 +41,13 @@
/**
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
*/
- Model interpolate( Model project, Map<String, ?> context )
+ Model interpolate( Model project, Map context )
throws ModelInterpolationException;
/**
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
*/
- Model interpolate( Model model, Map<String, ?> context, boolean strict )
+ Model interpolate( Model model, Map context, boolean strict )
throws ModelInterpolationException;
Model interpolate( Model model,
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java Wed Apr 22 16:14:21 2009
@@ -20,7 +20,9 @@
*/
import org.apache.maven.project.path.PathTranslator;
+import org.codehaus.plexus.interpolation.AbstractFunctionValueSourceWrapper;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
+import org.codehaus.plexus.interpolation.ValueSource;
import org.codehaus.plexus.interpolation.util.ValueSourceUtils;
import java.io.File;
@@ -34,12 +36,12 @@
implements InterpolationPostProcessor
{
- private final List<String> unprefixedPathKeys;
+ private final List unprefixedPathKeys;
private final File projectDir;
private final PathTranslator pathTranslator;
- private final List<String> expressionPrefixes;
+ private final List expressionPrefixes;
- public PathTranslatingPostProcessor( List<String> expressionPrefixes, List<String> unprefixedPathKeys, File projectDir, PathTranslator pathTranslator )
+ public PathTranslatingPostProcessor( List expressionPrefixes, List unprefixedPathKeys, File projectDir, PathTranslator pathTranslator )
{
this.expressionPrefixes = expressionPrefixes;
this.unprefixedPathKeys = unprefixedPathKeys;
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java?rev=767581&r1=767580&r2=767581&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java Wed Apr 22 16:14:21 2009
@@ -1,14 +1,5 @@
package org.apache.maven.project.interpolation;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.ProjectBuilderConfiguration;
-import org.apache.maven.project.path.PathTranslator;
-import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
-import org.codehaus.plexus.interpolation.Interpolator;
-import org.codehaus.plexus.interpolation.StringSearchInterpolator;
-import org.codehaus.plexus.interpolation.ValueSource;
-import org.codehaus.plexus.logging.Logger;
-
import java.io.File;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
@@ -16,17 +7,25 @@
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.path.PathTranslator;
+import org.codehaus.plexus.interpolation.Interpolator;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
+import org.codehaus.plexus.logging.Logger;
+
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
- private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<Class<?>, Field[]>();
- private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<Class<?>, Boolean>();
+ private static final Map fieldsByClass = new WeakHashMap();
+ private static final Map fieldIsPrimitiveByClass = new WeakHashMap();
public StringSearchModelInterpolator()
{
@@ -51,8 +50,8 @@
{
try
{
- List<ValueSource> valueSources = createValueSources( model, projectDir, config );
- List<InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
+ List valueSources = createValueSources( model, projectDir, config );
+ List postProcessors = createPostProcessors( model, projectDir, config );
InterpolateObjectAction action =
new InterpolateObjectAction( obj, valueSources, postProcessors, debugEnabled,
@@ -80,32 +79,32 @@
return interpolator;
}
- private static final class InterpolateObjectAction implements PrivilegedAction<ModelInterpolationException>
+ private static final class InterpolateObjectAction implements PrivilegedAction
{
private final boolean debugEnabled;
- private final LinkedList<Object> interpolationTargets;
+ private final LinkedList interpolationTargets;
private final StringSearchModelInterpolator modelInterpolator;
private final Logger logger;
- private final List<ValueSource> valueSources;
- private final List<InterpolationPostProcessor> postProcessors;
+ private final List valueSources;
+ private final List postProcessors;
- public InterpolateObjectAction( Object target, List<ValueSource> valueSources,
- List<InterpolationPostProcessor> postProcessors, boolean debugEnabled,
+ public InterpolateObjectAction( Object target, List valueSources, List postProcessors,
+ boolean debugEnabled,
StringSearchModelInterpolator modelInterpolator, Logger logger )
{
this.valueSources = valueSources;
this.postProcessors = postProcessors;
this.debugEnabled = debugEnabled;
- this.interpolationTargets = new LinkedList<Object>();
+ this.interpolationTargets = new LinkedList();
interpolationTargets.add( target );
this.modelInterpolator = modelInterpolator;
this.logger = logger;
}
- public ModelInterpolationException run()
+ public Object run()
{
while( !interpolationTargets.isEmpty() )
{
@@ -124,8 +123,7 @@
return null;
}
- @SuppressWarnings("unchecked")
- private void traverseObjectWithParents( Class<?> cls, Object target )
+ private void traverseObjectWithParents( Class cls, Object target )
throws ModelInterpolationException
{
if ( cls == null )
@@ -149,7 +147,7 @@
for ( int i = 0; i < fields.length; i++ )
{
- Class<?> type = fields[i].getType();
+ Class type = fields[i].getType();
if ( isQualifiedForInterpolation( fields[i], type ) )
{
boolean isAccessible = fields[i].isAccessible();
@@ -173,10 +171,10 @@
}
else if ( Collection.class.isAssignableFrom( type ) )
{
- Collection<Object> c = (Collection<Object>) fields[i].get( target );
+ Collection c = (Collection) fields[i].get( target );
if ( c != null && !c.isEmpty() )
{
- List<Object> originalValues = new ArrayList<Object>( c );
+ List originalValues = new ArrayList( c );
try
{
c.clear();
@@ -190,8 +188,9 @@
continue;
}
- for ( Object value : originalValues )
+ for ( Iterator it = originalValues.iterator(); it.hasNext(); )
{
+ Object value = it.next();
if ( value != null )
{
if( String.class == value.getClass() )
@@ -230,11 +229,13 @@
}
else if ( Map.class.isAssignableFrom( type ) )
{
- Map<Object, Object> m = (Map<Object, Object>) fields[i].get( target );
+ Map m = (Map) fields[i].get( target );
if ( m != null && !m.isEmpty() )
{
- for ( Map.Entry<Object, Object> entry : m.entrySet() )
+ for ( Iterator it = m.entrySet().iterator(); it.hasNext(); )
{
+ Map.Entry entry = (Map.Entry) it.next();
+
Object value = entry.getValue();
if ( value != null )
@@ -310,12 +311,12 @@
}
}
- private boolean isQualifiedForInterpolation( Class<?> cls )
+ private boolean isQualifiedForInterpolation( Class cls )
{
return !cls.getPackage().getName().startsWith( "java" );
}
- private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
+ private boolean isQualifiedForInterpolation( Field field, Class fieldType )
{
if ( !fieldIsPrimitiveByClass.containsKey( fieldType ) )
{