Author: jvanzyl
Date: Sat Feb 2 20:50:45 2008
New Revision: 617948
URL: http://svn.apache.org/viewvc?rev=617948&view=rev
Log:
o updating for the changes I just made to maven-artifact
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
Sat Feb 2 20:50:45 2008
@@ -31,26 +31,9 @@
public class DefaultMavenProjectHelper
implements MavenProjectHelper
{
-
- private ArtifactHandlerManager artifactHandlerManager;
-
public void attachArtifact( MavenProject project, String artifactType,
String artifactClassifier, File artifactFile )
- {
- String type = artifactType;
-
- ArtifactHandler handler = null;
-
- if ( type != null )
- {
- handler = artifactHandlerManager.getArtifactHandler( artifactType
);
- }
-
- if ( handler == null )
- {
- handler = artifactHandlerManager.getArtifactHandler( "jar" );
- }
-
- Artifact artifact = new AttachedArtifact( project.getArtifact(),
artifactType, artifactClassifier, handler );
+ {
+ Artifact artifact = new AttachedArtifact( project.getArtifact(),
artifactType, artifactClassifier );
artifact.setFile( artifactFile );
artifact.setResolved( true );
@@ -60,9 +43,7 @@
public void attachArtifact( MavenProject project, String artifactType,
File artifactFile )
{
- ArtifactHandler handler = artifactHandlerManager.getArtifactHandler(
artifactType );
-
- Artifact artifact = new AttachedArtifact( project.getArtifact(),
artifactType, handler );
+ Artifact artifact = new AttachedArtifact( project.getArtifact(),
artifactType );
artifact.setFile( artifactFile );
artifact.setResolved( true );
@@ -74,7 +55,7 @@
{
Artifact projectArtifact = project.getArtifact();
- Artifact artifact = new AttachedArtifact( projectArtifact,
projectArtifact.getType(), artifactClassifier,
projectArtifact.getArtifactHandler() );
+ Artifact artifact = new AttachedArtifact( projectArtifact,
projectArtifact.getType(), artifactClassifier );
artifact.setFile( artifactFile );
artifact.setResolved( true );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Sat Feb 2 20:50:45 2008
@@ -23,6 +23,7 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ManagedVersionMap;
@@ -152,6 +153,12 @@
private Stack previousExecutionProjects = new Stack();
+ // This should not be in here and neither should any of artifact listing
methods that pick off artifacts
+ // based on their scope as that forces MavenProject to know about all
scopes that are available which
+ // makes the addition of new scopes unscalable. Another component should
take as input a MavenProject and
+ // spit out the list of artifacts based on scope. jvz.
+ private ArtifactHandlerManager artifactHandlerManager;
+
public MavenProject()
{
Model model = new Model();
@@ -168,6 +175,12 @@
this.model = model;
}
+ // This is temporary until we get the scope related elements out of here.
jvz.
+ public void setArtifactHandlerManager( ArtifactHandlerManager
artifactHandlerManager )
+ {
+ this.artifactHandlerManager = artifactHandlerManager;
+ }
+
public MavenProject( MavenProject project )
{
// disown the parent
@@ -490,7 +503,7 @@
{
Artifact a = (Artifact) i.next();
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_PROVIDED.equals( a.getScope() ) ||
@@ -512,7 +525,7 @@
Artifact a = (Artifact) i.next();
// TODO: classpath check doesn't belong here - that's the other
method
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_PROVIDED.equals( a.getScope() ) ||
@@ -572,7 +585,7 @@
{
Artifact a = (Artifact) i.next();
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
// NOTE: [jc] scope == 'test' is the widest possible scope, so
we don't really need to perform
@@ -601,7 +614,7 @@
Artifact a = (Artifact) i.next();
// TODO: classpath check doesn't belong here - that's the other
method
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
// NOTE: [jc] scope == 'test' is the widest possible scope, so
we don't really need to perform
@@ -666,7 +679,7 @@
{
Artifact a = (Artifact) i.next();
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
@@ -692,7 +705,7 @@
Artifact a = (Artifact) i.next();
// TODO: classpath check doesn't belong here - that's the other
method
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
@@ -748,7 +761,7 @@
{
Artifact a = (Artifact) i.next();
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
@@ -769,7 +782,7 @@
Artifact a = (Artifact) i.next();
// TODO: classpath check doesn't belong here - that's the other
method
- if ( a.getArtifactHandler().isAddedToClasspath() )
+ if ( artifactHandlerManager.getArtifactHandler( a.getType()
).isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
@@ -1750,30 +1763,4 @@
{
return (Plugin) getBuild().getPluginsAsMap().get( pluginKey );
}
- /**
- * Default toString
- */
- public String toString()
- {
- StringBuffer sb = new StringBuffer(30);
- sb.append( "MavenProject: " );
- sb.append( this.getGroupId() );
- sb.append( ":" );
- sb.append( this.getArtifactId() );
- sb.append( ":" );
- sb.append( this.getVersion() );
- sb.append( " @ " );
-
- try
- {
- sb.append( this.getFile().getPath() );
- }
- catch (NullPointerException e)
- {
- //don't log it.
- }
-
- return sb.toString();
- }
-
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
Sat Feb 2 20:50:45 2008
@@ -58,345 +58,232 @@
artifact.setResolved( true );
}
- /** [EMAIL PROTECTED] */
public File getFile()
{
// we need to get the latest file for the project, not the artifact
that was created at one point in time
return project.getArtifact().getFile();
}
- /** [EMAIL PROTECTED] */
public String getGroupId()
{
return artifact.getGroupId();
}
- /** [EMAIL PROTECTED] */
public String getArtifactId()
{
return artifact.getArtifactId();
}
- /** [EMAIL PROTECTED] */
public String getVersion()
{
return artifact.getVersion();
}
- /** [EMAIL PROTECTED] */
public void setVersion( String version )
{
artifact.setVersion( version );
}
- /** [EMAIL PROTECTED] */
public String getScope()
{
return artifact.getScope();
}
- /** [EMAIL PROTECTED] */
public String getType()
{
return artifact.getType();
}
- /** [EMAIL PROTECTED] */
public String getClassifier()
{
return artifact.getClassifier();
}
- /** [EMAIL PROTECTED] */
public boolean hasClassifier()
{
return artifact.hasClassifier();
}
- /** [EMAIL PROTECTED] */
public void setFile( File destination )
{
artifact.setFile( destination );
project.getArtifact().setFile( destination );
}
- /** [EMAIL PROTECTED] */
public String getBaseVersion()
{
return artifact.getBaseVersion();
}
- /** [EMAIL PROTECTED] */
public void setBaseVersion( String baseVersion )
{
artifact.setBaseVersion( baseVersion );
}
- /** [EMAIL PROTECTED] */
public String getId()
{
return artifact.getId();
}
- /** [EMAIL PROTECTED] */
public String getDependencyConflictId()
{
return artifact.getDependencyConflictId();
}
- /** [EMAIL PROTECTED] */
public void addMetadata( ArtifactMetadata metadata )
{
artifact.addMetadata( metadata );
}
- /** [EMAIL PROTECTED] */
public Collection getMetadataList()
{
return artifact.getMetadataList();
}
- /** [EMAIL PROTECTED] */
public void setRepository( ArtifactRepository remoteRepository )
{
artifact.setRepository( remoteRepository );
}
- /** [EMAIL PROTECTED] */
public ArtifactRepository getRepository()
{
return artifact.getRepository();
}
- /** [EMAIL PROTECTED] */
public void updateVersion( String version, ArtifactRepository
localRepository )
{
artifact.updateVersion( version, localRepository );
}
- /** [EMAIL PROTECTED] */
public String getDownloadUrl()
{
return artifact.getDownloadUrl();
}
- /** [EMAIL PROTECTED] */
public void setDownloadUrl( String downloadUrl )
{
artifact.setDownloadUrl( downloadUrl );
}
- /** [EMAIL PROTECTED] */
public ArtifactFilter getDependencyFilter()
{
return artifact.getDependencyFilter();
}
- /** [EMAIL PROTECTED] */
public void setDependencyFilter( ArtifactFilter artifactFilter )
{
artifact.setDependencyFilter( artifactFilter );
}
- /** [EMAIL PROTECTED] */
- public ArtifactHandler getArtifactHandler()
- {
- return artifact.getArtifactHandler();
- }
-
- /** [EMAIL PROTECTED] */
public List getDependencyTrail()
{
return artifact.getDependencyTrail();
}
- /** [EMAIL PROTECTED] */
public void setDependencyTrail( List dependencyTrail )
{
artifact.setDependencyTrail( dependencyTrail );
}
- /** [EMAIL PROTECTED] */
public void setScope( String scope )
{
artifact.setScope( scope );
}
- /** [EMAIL PROTECTED] */
public VersionRange getVersionRange()
{
return artifact.getVersionRange();
}
- /** [EMAIL PROTECTED] */
public void setVersionRange( VersionRange newRange )
{
artifact.setVersionRange( newRange );
}
- /** [EMAIL PROTECTED] */
public void selectVersion( String version )
{
artifact.selectVersion( version );
}
- /** [EMAIL PROTECTED] */
public void setGroupId( String groupId )
{
artifact.setGroupId( groupId );
}
- /** [EMAIL PROTECTED] */
public void setArtifactId( String artifactId )
{
artifact.setArtifactId( artifactId );
}
- /** [EMAIL PROTECTED] */
public boolean isSnapshot()
{
return artifact.isSnapshot();
}
- /** [EMAIL PROTECTED] */
public int compareTo( Object o )
{
return artifact.compareTo( o );
}
- /** [EMAIL PROTECTED] */
public void setResolved( boolean resolved )
{
artifact.setResolved( resolved );
}
- /** [EMAIL PROTECTED] */
public boolean isResolved()
{
return artifact.isResolved();
}
- /** [EMAIL PROTECTED] */
public void setResolvedVersion( String version )
{
artifact.setResolvedVersion( version );
}
- /** [EMAIL PROTECTED] */
- public void setArtifactHandler( ArtifactHandler handler )
- {
- artifact.setArtifactHandler( handler );
- }
-
- /** [EMAIL PROTECTED] */
public String toString()
{
return "active project artifact:\n\tartifact = " + artifact +
";\n\tproject: " + project;
}
- /** [EMAIL PROTECTED] */
public boolean isRelease()
{
return artifact.isRelease();
}
- /** [EMAIL PROTECTED] */
public void setRelease( boolean release )
{
artifact.setRelease( release );
}
- /** [EMAIL PROTECTED] */
public List getAvailableVersions()
{
return artifact.getAvailableVersions();
}
- /** [EMAIL PROTECTED] */
public void setAvailableVersions( List versions )
{
artifact.setAvailableVersions( versions );
}
- /** [EMAIL PROTECTED] */
public boolean isOptional()
{
return artifact.isOptional();
}
- /** [EMAIL PROTECTED] */
public ArtifactVersion getSelectedVersion()
throws OverConstrainedVersionException
{
return artifact.getSelectedVersion();
}
- /** [EMAIL PROTECTED] */
public boolean isSelectedVersionKnown()
throws OverConstrainedVersionException
{
return artifact.isSelectedVersionKnown();
}
- /** [EMAIL PROTECTED] */
public void setOptional( boolean optional )
{
artifact.setOptional( optional );
- }
-
- /** [EMAIL PROTECTED] */
- public int hashCode()
- {
- int result = 17;
-
- result = 37 * result + getGroupId().hashCode();
- result = 37 * result + getArtifactId().hashCode();
- result = 37 * result + getType().hashCode();
- if ( getVersion() != null )
- {
- result = 37 * result + getVersion().hashCode();
- }
- result = 37 * result + ( getClassifier() != null ?
getClassifier().hashCode() : 0 );
-
- return result;
- }
-
- /** [EMAIL PROTECTED] */
- public boolean equals( Object o )
- {
- if ( o == this )
- {
- return true;
- }
-
- if ( !( o instanceof Artifact ) )
- {
- return false;
- }
-
- Artifact a = (Artifact) o;
-
- if ( !a.getGroupId().equals( getGroupId() ) )
- {
- return false;
- }
- else if ( !a.getArtifactId().equals( getArtifactId() ) )
- {
- return false;
- }
- else if ( !a.getVersion().equals( getVersion() ) )
- {
- return false;
- }
- else if ( !a.getType().equals( getType() ) )
- {
- return false;
- }
- else if ( a.getClassifier() == null ? getClassifier() != null :
!a.getClassifier().equals( getClassifier() ) )
- {
- return false;
- }
-
- return true;
}
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
Sat Feb 2 20:50:45 2008
@@ -37,10 +37,10 @@
private final Artifact parent;
- public AttachedArtifact( Artifact parent, String type, String classifier,
ArtifactHandler artifactHandler )
+ public AttachedArtifact( Artifact parent, String type, String classifier )
{
super( parent.getGroupId(), parent.getArtifactId(),
parent.getVersionRange(), parent.getScope(), type,
- classifier, artifactHandler, parent.isOptional() );
+ classifier, parent.isOptional() );
setDependencyTrail( Collections.singletonList( parent.getId() ) );
@@ -52,9 +52,9 @@
}
}
- public AttachedArtifact( Artifact parent, String type, ArtifactHandler
artifactHandler )
+ public AttachedArtifact( Artifact parent, String type )
{
- this( parent, type, null, artifactHandler );
+ this( parent, type, null );
}
public void setArtifactId( String artifactId )
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Sat Feb 2 20:50:45 2008
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
@@ -84,6 +85,8 @@
private PlexusContainer container;
+ private ArtifactHandlerManager artifactHandlerManager;
+
/** Unfortunately we have projects that are still sending us JARs without
the accompanying POMs. */
private boolean strictlyEnforceThePresenceOfAValidMavenPOM = false;
@@ -127,12 +130,6 @@
}
catch ( InvalidProjectModelException e )
{
- if ( strictlyEnforceThePresenceOfAValidMavenPOM )
- {
- throw new ArtifactMetadataRetrievalException( "Invalid
POM file for artifact: '" +
- artifact.getDependencyConflictId() + "' Reason: "
+ e.getMessage(), e, artifact );
- }
-
getLogger().warn( "POM for \'" + pomArtifact +
"\' is invalid. It will be ignored for artifact
resolution. Reason: " + e.getMessage() );
@@ -151,10 +148,6 @@
}
getLogger().debug( "\n" );
}
- else
- {
- getLogger().debug( "", e );
- }
}
project = null;
@@ -253,7 +246,7 @@
else
{
Set artifacts = Collections.EMPTY_SET;
- if ( !artifact.getArtifactHandler().isIncludesDependencies() )
+ if ( !artifactHandlerManager.getArtifactHandler(
artifact.getType() ).isIncludesDependencies() )
{
// TODO: we could possibly use p.getDependencyArtifacts
instead of this call, but they haven't been filtered
// or used the inherited scope (should that be passed to the
buildFromRepository method above?)
Modified:
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=617948&r1=617947&r2=617948&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Sat Feb 2 20:50:45 2008
@@ -256,22 +256,8 @@
<requirement>
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
</requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- <role-hint>maven-strict</role-hint>
-
<implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
- <configuration>
-
<strictlyEnforceThePresenceOfAValidMavenPOM>true</strictlyEnforceThePresenceOfAValidMavenPOM>
- </configuration>
- <requirements>
<requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
</requirements>
</component>
@@ -286,6 +272,9 @@
</requirement>
<requirement>
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
</requirements>
</component>
