Author: jvanzyl
Date: Tue Nov 6 00:26:20 2007
New Revision: 592328
URL: http://svn.apache.org/viewvc?rev=592328&view=rev
Log:
o adjust this from my original tool which only did deployments and not
installs. in normal setups things will be installed first and we obviously
don't care about what's installed we care about what's deployed.
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/artifact/trunk/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=592328&r1=592327&r2=592328&view=diff
==============================================================================
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Tue Nov 6 00:26:20 2007
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataDeploymentException;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.artifact.transform.ArtifactTransformationManager;
@@ -46,18 +47,21 @@
extends AbstractLogEnabled
implements ArtifactDeployer
{
- /** @plexus.component */
+ /** @plexus.requirement */
private WagonManager wagonManager;
- /** @plexuxs.component */
+ /** @plexuxs.requirement */
private ArtifactTransformationManager transformationManager;
- /** @plexus.component */
+ /** @plexus.requirement */
private RepositoryMetadataManager repositoryMetadataManager;
- /** @plexus.component */
+ /** @plexus.requirement */
private ArtifactMetadataSource metadataSource;
+ /** @plexus.requirement */
+ private ArtifactRepositoryLayout defaultLayout;
+
/** @deprecated we want to use the artifact method only, and ensure
artifact.file is set correctly. */
public void deploy( String basedir,
String finalName,
@@ -83,7 +87,7 @@
throw new ArtifactDeploymentException( "System is offline. Cannot
deploy artifact: " + artifact + "." );
}
- if ( !artifactHasBeenDeployed( artifact, localRepository,
deploymentRepository ) )
+ if ( !artifactHasBeenDeployed( artifact, deploymentRepository ) )
{
try
{
@@ -121,13 +125,17 @@
}
}
- private boolean artifactHasBeenDeployed( Artifact artifact,
- ArtifactRepository
localRepository,
- ArtifactRepository
remoteRepository )
+ private boolean artifactHasBeenDeployed( Artifact artifact,
ArtifactRepository remoteRepository )
throws ArtifactDeploymentException
{
try
{
+ // We have to fake out the tools underneath as they always expect
a local repository.
+ // This makes sure that we are checking for remote deployments not
things cached locally
+ // as we don't care about things cached locally.
+
+ ArtifactRepository localRepository = new
DefaultArtifactRepository( "", "", defaultLayout );
+
// We will just let people deploy snapshots over and over again
even if they want
// to deploy something different with the same name.
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=592328&r1=592327&r2=592328&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 Tue
Nov 6 00:26:20 2007
@@ -443,6 +443,10 @@
</requirement>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+ </requirement>
+ <requirement>
+
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+ <role-hint>default</role-hint>
</requirement>
</requirements>
</component>
