From f75502a37848581381d15a689ce6d06ade596271 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 28 Jun 2004 09:40:14 +0000
Subject: [PATCH] PR: MPARTIFACT-21 honour distributionSite

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115568 13f79535-47bb-0310-9956-ffa450edef68
---
 artifact/project.xml                                  |  4 ++--
 .../artifact/deployer/DefaultArtifactDeployer.java    | 11 ++++++++---
 artifact/xdocs/changes.xml                            |  3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/artifact/project.xml b/artifact/project.xml
index b851c8e7..1c2c5f8c 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -25,8 +25,8 @@
   <name>Maven Artifact Plugin</name>
   <!-- WARNING: some dependency checks will break if we get to 1.10, need to go to 2.0 from there -->
 
-  <currentVersion>1.3</currentVersion>
-  <description/>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <description>Tools to manage artifacts and deployment. Requires Maven 1.0 RC4</description>
   <shortDescription>Tools to manage artifacts and deployment</shortDescription>
   <url>http://maven.apache.org/reference/plugins/artifact/</url>
   <issueTrackingUrl>http://jira.codehaus.org/browse/MPARTIFACT</issueTrackingUrl>
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 848ad3a8..4c61349a 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -45,7 +45,7 @@ import org.apache.maven.util.MD5Sum;
  *   
  *   
  * @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a> 
- * @version $Id: DefaultArtifactDeployer.java,v 1.21 2004/06/25 13:50:05 brett Exp $
+ * @version $Id: DefaultArtifactDeployer.java,v 1.22 2004/06/28 09:40:14 brett Exp $
  */
 public class DefaultArtifactDeployer implements ArtifactDeployer
 {
@@ -350,7 +350,12 @@ public class DefaultArtifactDeployer implements ArtifactDeployer
 
         if (repoStr == null || repoStr.trim().length() == 0)
         {
-            String central = (String) project.getContext().getVariable("maven.repo.central");
+            String central = project.getDistributionSite();
+            String centralDirectory = project.getDistributionDirectory();
+            if (central == null || central.trim().length() == 0) {
+                central = (String) project.getContext().getVariable("maven.repo.central");
+                centralDirectory = (String) project.getContext().getVariable("maven.repo.central.directory");
+            }
             if (central != null && central.trim().length() > 0) {
                 repoStr = "default";
                 project.getContext().setVariable("maven.repo.default", "scp://" + central);
@@ -361,7 +366,7 @@ public class DefaultArtifactDeployer implements ArtifactDeployer
                     LOG.warn( "WARNING: assuming empty passphrase. Specify maven.repo.default.passphrase if needed" );
                     project.getContext().setVariable("maven.repo.default.passphrase", "");
                 }
-                project.getContext().setVariable("maven.repo.default.directory", project.getContext().getVariable("maven.repo.central.directory"));
+                project.getContext().setVariable("maven.repo.default.directory", centralDirectory);
                 project.getContext().setVariable("maven.repo.default.username", project.getContext().getVariable("maven.username"));
                 project.getContext().setVariable("maven.repo.default.group", project.getContext().getVariable("maven.remote.group"));
             }
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 1a63c9b9..c0c32dc4 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.4-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="add">Allow use of distributionSite POM attribute in artifact method</action>
+    </release>
     <release version="1.3" date="2004-06-25">
       <action dev="brett" type="add" issue="MPARTIFACT-8" due-to="Matt Smith">Allow non-passive FTP</action>
       <action dev="brett" type="add" issue="MPARTIFACT-20">Fix copy-deps when list is empty</action>