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 2007/11/06 06:36:19 UTC
svn commit: r592288 - in /maven/artifact/trunk/src:
main/java/org/apache/maven/artifact/deployer/
main/java/org/apache/maven/artifact/factory/
main/java/org/apache/maven/artifact/handler/
main/java/org/apache/maven/artifact/handler/manager/ main/java/o...
Author: jvanzyl
Date: Mon Nov 5 21:36:13 2007
New Revision: 592288
URL: http://svn.apache.org/viewvc?rev=592288&view=rev
Log:
o start using plexus annotations and get rid of the manaully maintained wiring metadata.
Added:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (with props)
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
maven/artifact/trunk/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java Mon Nov 5 21:36:13 2007
@@ -20,8 +20,9 @@
*/
/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
* @version $Id$
+ * @plexus.component
*/
public class ArtifactDeploymentException
extends Exception
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Mon Nov 5 21:36:13 2007
@@ -25,10 +25,11 @@
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.versioning.VersionRange;
+/** @plexus.component */
public class DefaultArtifactFactory
implements ArtifactFactory
{
- // TODO: remove, it doesn't know the ones from the plugins
+ /** @plexus.requirement */
private ArtifactHandlerManager artifactHandlerManager;
public DefaultArtifactFactory()
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java Mon Nov 5 21:36:13 2007
@@ -21,7 +21,9 @@
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Jason van Zyl
* @version $Id$
+ * @plexus.component
*/
public class DefaultArtifactHandler
implements ArtifactHandler
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java Mon Nov 5 21:36:13 2007
@@ -26,13 +26,15 @@
import java.util.Set;
/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
+ * @author Jason van Zyl
* @version $Id: DefaultArtifactHandlerManager.java,v 1.1.1.1 2004/08/09
* 18:37:32 jvanzyl Exp $
+ * @plexus.component
*/
public class DefaultArtifactHandlerManager
implements ArtifactHandlerManager
{
+ /** @plexus.requirement role="org.apache.maven.artifact.ArtifactHandler" */
private Map artifactHandlers;
public ArtifactHandler getArtifactHandler( String type )
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java Mon Nov 5 21:36:13 2007
@@ -32,12 +32,18 @@
import java.io.IOException;
import java.util.Iterator;
+/**
+ * @author Jason van Zyl
+ * @plexus.component
+ */
public class DefaultArtifactInstaller
extends AbstractLogEnabled
implements ArtifactInstaller
{
+ /** @plexus.requirement */
private ArtifactTransformationManager transformationManager;
+ /** @plexus.requirement */
private RepositoryMetadataManager repositoryMetadataManager;
/** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Nov 5 21:36:13 2007
@@ -63,6 +63,7 @@
import java.util.List;
import java.util.Map;
+/** @plexus.requirement */
public class DefaultWagonManager
extends AbstractLogEnabled
implements WagonManager,
@@ -94,8 +95,10 @@
private boolean online = true;
+ /** @plexus.requirement */
private ArtifactRepositoryFactory repositoryFactory;
+ /** @plexus.requirement role="org.apache.maven.wagon.Wagon" */
private Map wagons;
private boolean interactive = true;
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java Mon Nov 5 21:36:13 2007
@@ -28,7 +28,10 @@
import java.util.HashMap;
import java.util.Map;
-/** @author jdcasey */
+/**
+ * @author jdcasey
+ * @plexus.component
+ */
public class DefaultArtifactRepositoryFactory
implements ArtifactRepositoryFactory
{
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Mon Nov 5 21:36:13 2007
@@ -41,6 +41,10 @@
import java.util.List;
import java.util.Map;
+/**
+ * @author Jason van Zyl
+ * @plexus.requirement
+ */
public class DefaultRepositoryMetadataManager
extends AbstractLogEnabled
implements RepositoryMetadataManager
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Mon Nov 5 21:36:13 2007
@@ -45,10 +45,12 @@
* Default implementation of the artifact collector.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Jason van Zyl
* @version $Id$
* @todo This needs to collect all errors and not die on the first error. If there are problems retrieving the metadata
* then we need all the information so that we can tell users about what we attempted to do.
* @todo there 8 places where we can can range exceptions which is bad, again the result of not using a graph.
+ * @plexus.component
*/
public class DefaultArtifactCollector
implements ArtifactCollector
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Mon Nov 5 21:36:13 2007
@@ -47,6 +47,10 @@
import java.util.Map;
import java.util.Set;
+/**
+ * @author Jason van Zyl
+ * @plexus.component
+ */
public class DefaultArtifactResolver
extends AbstractLogEnabled
implements ArtifactResolver
@@ -55,12 +59,16 @@
// Components
// ----------------------------------------------------------------------
+ /** @plexus.requirement */
private WagonManager wagonManager;
+ /** @plexus.requirement */
private ArtifactTransformationManager transformationManager;
+ /** @plexus.requirement */
protected ArtifactFactory artifactFactory;
+ /** @plexus.requirement */
private ArtifactCollector artifactCollector;
// ----------------------------------------------------------------------
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultConflictResolverFactory.java Mon Nov 5 21:36:13 2007
@@ -31,7 +31,11 @@
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
+ * @plexus.component
* @since 3.0
+ *
+ * @todo you don't need the container in here with the active maps (jvz).
+ *
*/
public class DefaultConflictResolverFactory
implements ConflictResolverFactory,
@@ -39,7 +43,10 @@
{
// fields -----------------------------------------------------------------
- /** The plexus container used to obtain instances from. */
+ /**
+ * The plexus container used to obtain instances from.
+ * @plexus.requirement
+ */
private PlexusContainer container;
// ConflictResolverFactory methods ----------------------------------------
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java Mon Nov 5 21:36:13 2007
@@ -13,7 +13,10 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-/** @author Oleg Gusakov */
+/**
+ * @author Oleg Gusakov
+ * @plexus.component
+ */
public class DefaultMetadataResolver
extends AbstractLogEnabled
implements MetadataResolver
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Mon Nov 5 21:36:13 2007
@@ -32,6 +32,10 @@
import java.util.Iterator;
import java.util.List;
+/**
+ * @author Jason van Zyl
+ * @plexus.component
+ */
public class DefaultArtifactTransformationManager
implements ArtifactTransformationManager,
Initializable
Modified: maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml Mon Nov 5 21:36:13 2007
@@ -441,9 +441,11 @@
<requirement>
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ </requirement>
</requirements>
</component>
-
<component>
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java Mon Nov 5 21:36:13 2007
@@ -59,4 +59,23 @@
assertRemoteArtifactPresent( artifact );
}
+
+ public void testArtifactDeploymentForArtifactThatHasAlreadyBeenDeployed()
+ throws Exception
+ {
+ String artifactBasedir = new File( getBasedir(), "src/test/resources/artifact-install" ).getAbsolutePath();
+
+ Artifact artifact = createArtifact( "artifact", "10.1.3" );
+
+ File file = new File( artifactBasedir, "artifact-10.1.3.jar" );
+
+ try
+ {
+ artifactDeployer.deploy( file, artifact, remoteRepository(), localRepository() );
+ }
+ catch( ArtifactDeploymentException e )
+ {
+ fail( "Should have failed due to previous deployment of artifact." );
+ }
+ }
}
Added: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java?rev=592288&view=auto
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (added)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java Mon Nov 5 21:36:13 2007
@@ -0,0 +1,38 @@
+package org.apache.maven.artifact.deployer;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.metadata.ResolutionGroup;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** @author Jason van Zyl */
+public class SimpleArtifactMetadataSource
+ implements ArtifactMetadataSource
+{
+ public ResolutionGroup retrieve( Artifact artifact,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
+ throws ArtifactMetadataRetrievalException
+ {
+ ResolutionGroup rg = new ResolutionGroup( null, null, null );
+
+ return rg;
+ }
+
+ public List retrieveAvailableVersions( Artifact artifact,
+ ArtifactRepository localRepository,
+ List remoteRepositories )
+ throws ArtifactMetadataRetrievalException
+ {
+ List versions = new ArrayList();
+
+ versions.add( new DefaultArtifactVersion( "10.1.3" ) );
+
+ return versions;
+ }
+}
Propchange: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/artifact/trunk/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml?rev=592288&r1=592287&r2=592288&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml (original)
+++ maven/artifact/trunk/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml Mon Nov 5 21:36:13 2007
@@ -23,5 +23,9 @@
<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>