You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/20 15:21:47 UTC

svn commit: r639295 - /maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt

Author: brett
Date: Thu Mar 20 07:21:43 2008
New Revision: 639295

URL: http://svn.apache.org/viewvc?rev=639295&view=rev
Log:
[MRM-700] Review the documentation on deploying to Archiva for inconsistent repository ids
Merged from: r628786

Modified:
    maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt

Modified: maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt?rev=639295&r1=639294&r2=639295&view=diff
==============================================================================
--- maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt (original)
+++ maven/archiva/branches/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt Thu Mar 20 07:21:43 2008
@@ -17,7 +17,12 @@
     ...
     <servers>
       <server>
-        <id>deployment.webdav</id>
+        <id>archiva.internal</id>
+        <username>{archiva-deployment-user}</username>
+        <password>{archiva-deployment-pwd}</password>
+      </server>
+      <server>
+        <id>archiva.snapshots</id>
         <username>{archiva-deployment-user}</username>
         <password>{archiva-deployment-pwd}</password>
       </server>
@@ -29,7 +34,9 @@
 
 * Deploying to Archiva using WebDAV
 
-  [[1]] Configure the <<<distributionManagement>>> part of your <<<pom.xml>>> (customising the URLs as needed)
+  [[1]] Configure the <<<distributionManagement>>> part of your <<<pom.xml>>> (customising the URLs as needed).
+        The <<<id>>> of the repository in <<<distributionManagement>>> <<must>> match the <<<id>>> of the <<<server>>>
+        element in <<<settings.xml>>>.
  
 +-------------------------------------------------------------------------+
   <project>
@@ -115,7 +122,7 @@
   
 +------+
 mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
-    -DrepositoryId=deployment.webdav
+    -DrepositoryId=archiva.internal
     -Durl=dav:http://repo.mycompany.com:8080/repository/internal/
 +------+