You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/26 18:34:20 UTC
svn commit: r768721 - in /maven/components/branches/MNG-2766: ./
maven-compat/src/main/java/org/apache/maven/artifact/manager/
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-compat/src/test/java/org/apache/maven/artifact/ maven-co...
Author: jvanzyl
Date: Sun Apr 26 16:34:19 2009
New Revision: 768721
URL: http://svn.apache.org/viewvc?rev=768721&view=rev
Log:
o the component discovery is not exposed outside the plexus core
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-2766/pom.xml
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java Sun Apr 26 16:34:19 2009
@@ -44,7 +44,6 @@
extends AbstractLogEnabled
implements UpdateCheckManager
{
-
public DefaultUpdateCheckManager()
{
@@ -75,6 +74,8 @@
// release-artifact short circuit above.
ArtifactRepositoryPolicy policy = repository.getSnapshots();
+ System.out.println( "snappies " + repository.getSnapshots().getUpdatePolicy() );
+
return isUpdateRequired( artifact, repository, policy );
}
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Sun Apr 26 16:34:19 2009
@@ -93,7 +93,7 @@
private ArtifactRepositoryFactory repositoryFactory;
@Requirement(role = Wagon.class)
- private Map wagons;
+ private Map<String,Wagon> wagons;
//@Requirement
private CredentialsDataSource credentialsDataSource;
@@ -324,11 +324,6 @@
public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories, TransferListener downloadMonitor, boolean force )
throws TransferFailedException, ResourceDoesNotExistException
{
- if(remoteRepositories == null)
- {
- throw new IllegalArgumentException("remoteRepositories: null");
- }
-
for ( ArtifactRepository repository : remoteRepositories )
{
try
@@ -351,8 +346,8 @@
{
logger.debug( "Unable to get resource '" + artifact.getId() + "' from repository " + repository.getId() + " (" + repository.getUrl() + ")", e );
}
- }
-
+ }
+
// if it already exists locally we were just trying to force it - ignore the update
if ( !artifact.getFile().exists() )
{
@@ -370,11 +365,15 @@
throws TransferFailedException, ResourceDoesNotExistException
{
String remotePath = repository.pathOf( artifact );
-
+
ArtifactRepositoryPolicy policy = artifact.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
+
+ boolean updateCheckIsRequired = updateCheckManager.isUpdateRequired( artifact, repository );
+ System.out.println( "update check:" + updateCheckIsRequired );
+
if ( !policy.isEnabled() )
- {
+ {
logger.debug( "Skipping disabled repository " + repository.getId() );
}
else if ( repository.isBlacklisted() )
@@ -383,9 +382,11 @@
}
// If the artifact is a snapshot, we need to determine whether it's time to check this repository for an update:
// 1. If it's forced, then check
- // 2. If the updateInterval has been exceeded since the last check for this artifact on this repository, then check.
- else if ( artifact.isSnapshot() && ( force || updateCheckManager.isUpdateRequired( artifact, repository ) ) )
+ // 2. If the updateInterval has been exceeded since the last check for this artifact on this repository, then check.
+ else if ( artifact.isSnapshot() && ( force || updateCheckIsRequired ) )
{
+ System.out.println( "!!!!!!!!!!!!!!!!!!!!!");
+
logger.debug( "Trying repository " + repository.getId() );
try
@@ -476,6 +477,8 @@
{
String protocol = repository.getProtocol();
+ System.out.println( wagons );
+
Wagon wagon;
try
@@ -488,7 +491,7 @@
{
throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e );
}
-
+
if ( downloadMonitor != null )
{
wagon.addTransferListener( downloadMonitor );
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Sun Apr 26 16:34:19 2009
@@ -142,6 +142,8 @@
}
else if ( !artifact.isResolved() )
{
+ System.out.println( "looking!" );
+
// ----------------------------------------------------------------------
// Check for the existence of the artifact in the specified local
// ArtifactRepository. If it is present then simply return as the
@@ -150,6 +152,7 @@
String localPath = localRepository.pathOf( artifact );
+ System.out.println( "3 " + localPath );
artifact.setFile( new File( localRepository.getBasedir(), localPath ) );
transformationManager.transformForResolve( artifact, remoteRepositories, localRepository );
@@ -158,6 +161,9 @@
destination = artifact.getFile();
+ System.out.println( "4 " + destination );
+ System.out.println( "5 " + destination.exists() );
+
boolean resolved = false;
// There are three conditions in which we'll go after the artifact here:
@@ -183,6 +189,7 @@
}
else
{
+ System.out.println( "trying to get artifact.");
wagonManager.getArtifact( artifact, remoteRepositories, downloadMonitor, force );
}
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Sun Apr 26 16:34:19 2009
@@ -71,7 +71,7 @@
protected ArtifactRepository badLocalRepository()
throws Exception
{
- String path = "target/test-classes/repositories/" + component() + "/bad-local-repository";
+ String path = "target/test-repositories/" + component() + "/bad-local-repository";
File f = new File( getBasedir(), path );
@@ -91,7 +91,7 @@
protected ArtifactRepository localRepository()
throws Exception
{
- String path = "target/test-classes/repositories/" + component() + "/local-repository";
+ String path = "target/test-repositories/" + component() + "/local-repository";
File f = new File( getBasedir(), path );
@@ -104,7 +104,7 @@
protected ArtifactRepository remoteRepository()
throws Exception
{
- String path = "target/test-classes/repositories/" + component() + "/remote-repository";
+ String path = "target/test-repositories/" + component() + "/remote-repository";
File f = new File( getBasedir(), path );
@@ -217,6 +217,8 @@
{
Artifact artifact = createArtifact( artifactId, version );
+ System.out.println( "1 " + artifact );
+
createArtifact( artifact, remoteRepository() );
return artifact;
@@ -241,6 +243,8 @@
File artifactFile = new File( repository.getBasedir(), path );
+ System.out.println( "2 " + artifactFile.getParentFile() );
+
if ( !artifactFile.getParentFile().exists() )
{
artifactFile.getParentFile().mkdirs();
@@ -268,7 +272,9 @@
protected Artifact createArtifact( String groupId, String artifactId, String version, String type )
throws Exception
{
- return artifactFactory.createBuildArtifact( groupId, artifactId, version, type );
+ Artifact a = artifactFactory.createBuildArtifact( groupId, artifactId, version, type );
+
+ return a;
}
protected void deleteLocalArtifact( Artifact artifact )
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java Sun Apr 26 16:34:19 2009
@@ -84,9 +84,7 @@
{
Artifact b = createRemoteArtifact( "b", "1.0-SNAPSHOT" );
deleteLocalArtifact( b );
-
artifactResolver.resolve( b, remoteRepositories(), localRepository() );
-
assertLocalArtifactPresent( b );
}
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml Sun Apr 26 16:34:19 2009
@@ -20,12 +20,8 @@
<plexus>
<components>
<component>
- <role>org.apache.maven.artifact.repository.authentication.AuthenticationInfoProvider</role>
- <implementation>org.apache.maven.artifact.repository.authentication.DummyAuthenticationInfoProvider</implementation>
- </component>
- <component>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<implementation>org.apache.maven.artifact.deployer.SimpleArtifactMetadataSource</implementation>
</component>
</components>
-</plexus>
\ No newline at end of file
+</plexus>
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml Sun Apr 26 16:34:19 2009
@@ -19,9 +19,5 @@
<plexus>
<components>
- <component>
- <role>org.apache.maven.artifact.repository.authentication.AuthenticationInfoProvider</role>
- <implementation>org.apache.maven.artifact.repository.authentication.DummyAuthenticationInfoProvider</implementation>
- </component>
</components>
-</plexus>
\ No newline at end of file
+</plexus>
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml Sun Apr 26 16:34:19 2009
@@ -44,9 +44,5 @@
<role-hint>string</role-hint>
<implementation>org.apache.maven.artifact.manager.StringWagon</implementation>
</component>
- <component>
- <role>org.apache.maven.artifact.repository.authentication.AuthenticationInfoProvider</role>
- <implementation>org.apache.maven.artifact.repository.authentication.DummyAuthenticationInfoProvider</implementation>
- </component>
</components>
</plexus>
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml Sun Apr 26 16:34:19 2009
@@ -19,9 +19,5 @@
<plexus>
<components>
- <component>
- <role>org.apache.maven.artifact.repository.authentication.AuthenticationInfoProvider</role>
- <implementation>org.apache.maven.artifact.repository.authentication.DummyAuthenticationInfoProvider</implementation>
- </component>
</components>
-</plexus>
\ No newline at end of file
+</plexus>
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Sun Apr 26 16:34:19 2009
@@ -265,8 +265,6 @@
for( Plugin plugin : project.getBuild().getPlugins() )
{
- System.out.println( "plugin --> " + plugin );
-
for( PluginExecution execution : plugin.getExecutions() )
{
// if the phase is specified then I don't have to go fetch the plugin yet and pull it down
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Apr 26 16:34:19 2009
@@ -72,7 +72,6 @@
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.discovery.ComponentDiscoverer;
-import org.codehaus.plexus.component.discovery.ComponentDiscovererManager;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
@@ -132,7 +131,6 @@
public DefaultPluginManager()
{
- System.out.println( "hello!!!!");
pluginDescriptors = new HashMap<String,PluginDescriptor>();
}
@@ -150,8 +148,6 @@
{
PluginDescriptor pluginDescriptor = getPluginDescriptor( plugin );
- System.out.println( "XXX plugin: " + plugin );
-
// There are cases where plugins are discovered but not actually populated. These are edge cases where you are working in the IDE on
// Maven itself so this speaks to a problem we have with the system not starting entirely clean.
if ( pluginDescriptor != null && pluginDescriptor.getClassRealm() != null )
@@ -216,8 +212,6 @@
resolutionErrorHandler.throwErrors( request, result );
ClassRealm pluginRealm = container.createChildRealm( pluginKey( plugin ) );
-
- System.out.println( "plugin: " + pluginArtifact );
Set<Artifact> pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin, project, session.getLocalRepository() );
@@ -589,13 +583,17 @@
return mojo;
}
+ catch ( PlexusConfigurationException e )
+ {
+ throw new PluginConfigurationException( pluginDescriptor, "Error checking parameters: " + e.getMessage() );
+ }
finally
{
Thread.currentThread().setContextClassLoader( oldClassLoader );
}
}
- private void checkDeprecatedParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration extractedMojoConfiguration )
+ private void checkDeprecatedParameters( MojoDescriptor mojoDescriptor, PlexusConfiguration extractedMojoConfiguration ) throws PlexusConfigurationException
{
if ( ( extractedMojoConfiguration == null ) || ( extractedMojoConfiguration.getChildCount() < 1 ) )
{
@@ -1232,8 +1230,6 @@
public List<ComponentSetDescriptor> findComponents( Context context, ClassRealm realm )
throws PlexusConfigurationException
{
- System.out.println( "realm: " + realm );
-
List<ComponentSetDescriptor> componentSetDescriptors = new ArrayList<ComponentSetDescriptor>();
Enumeration<URL> resources;
@@ -1282,13 +1278,8 @@
cd.setRealm( realm );
}
}
-
+
componentSetDescriptors.add( componentSetDescriptor );
-
- // Fire the event
- ComponentDiscoveryEvent event = new ComponentDiscoveryEvent( componentSetDescriptor );
-
- componentDiscovererManager.fireComponentDiscoveryEvent( event );
}
catch ( IOException ex )
{
@@ -1302,11 +1293,6 @@
return componentSetDescriptors;
}
-
- public void setManager( ComponentDiscovererManager manager )
- {
- this.componentDiscovererManager = manager;
- }
// ----------------------------------------------------------------------
// Component Discovery Listener
@@ -1315,9 +1301,7 @@
private Set pluginsInProcess = new HashSet();
private Map pluginIdsByPrefix = new HashMap();
-
- private ComponentDiscovererManager componentDiscovererManager;
-
+
public void componentDiscovered( ComponentDiscoveryEvent event )
{
ComponentSetDescriptor componentSetDescriptor = event.getComponentSetDescriptor();
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Sun Apr 26 16:34:19 2009
@@ -20,11 +20,14 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.discovery.ComponentDiscoverer;
+import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
/**
* @author Jason van Zyl
*/
public interface PluginManager
+ extends ComponentDiscoverer, ComponentDiscoveryListener
{
// - find the plugin [extension point: any client may wish to do whatever they choose]
// - load the plugin into a classloader [extension point: we want to take them from a repository, some may take from disk or whatever]
Modified: maven/components/branches/MNG-2766/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/pom.xml?rev=768721&r1=768720&r2=768721&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/pom.xml (original)
+++ maven/components/branches/MNG-2766/pom.xml Sun Apr 26 16:34:19 2009
@@ -57,7 +57,7 @@
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-4-SNAPSHOT</plexusVersion>
+ <plexusVersion>1.0-beta-3.0.7-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>