aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-docs/src/site/apt/userguide
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-14 22:57:46 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-14 22:57:46 +0000
commit6ae6076580d93b5a676e3eb7e5b0ba2f36487559 (patch)
tree417e0e5bcda714b934cd85af18c7e7e42fff41f9 /archiva-docs/src/site/apt/userguide
parent7c0fa13d5cd24d43f93b9330a5ec85d777aa4c83 (diff)
downloadarchiva-6ae6076580d93b5a676e3eb7e5b0ba2f36487559.tar.gz
archiva-6ae6076580d93b5a676e3eb7e5b0ba2f36487559.zip
upload doc improvement
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384968 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs/src/site/apt/userguide')
-rw-r--r--archiva-docs/src/site/apt/userguide/deploy.apt25
1 files changed, 11 insertions, 14 deletions
diff --git a/archiva-docs/src/site/apt/userguide/deploy.apt b/archiva-docs/src/site/apt/userguide/deploy.apt
index 15633264c..a50222ff1 100644
--- a/archiva-docs/src/site/apt/userguide/deploy.apt
+++ b/archiva-docs/src/site/apt/userguide/deploy.apt
@@ -19,15 +19,18 @@
~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~~ KIND, either express or implied. See the License for the
~~ specific language governing permissions and limitations
-~~ under the License.
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Deploying to Repository
There are different ways on how you can deploy artifacts in an Archiva repository.
- * {{{#Maven} Configuring Maven to deploy to an Archiva repository}}
+ * {{Maven}} Configuring Maven to deploy to an Archiva repository}}
- * {{{#Web UI} Deploying via the Web UI Form}}
+ * {{Web UI}} Deploying via the Web UI Form}}
Starting with Archiva 1.2.3, it is possible to block re-deployment of released artifacts to a specific repository. This can be configured through the
repository configuration page by ticking the <<<Block Re-deployment of Released Artifacts>>> checkbox.
@@ -176,8 +179,8 @@ mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>2.2</version>
</extension>
</extensions>
</build>
@@ -189,7 +192,7 @@ mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
Alternately, you can save this file somewhere else, and use "<<<mvn ... -f
/path/to/filename>>>" to force the use of an alternate POM file.
-
+
* Deploying via the {Web UI} Form
The easiest way to deploy in the repository is via the Web UI form, which can be accessed in the <<Upload Artifact>> section.
@@ -208,7 +211,7 @@ mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
* Packaging - the packaging of the artifact to be deployed. (ex. jar, war, ear, etc.)
- * Artifact File - the actual artifact to be deployed.
+ * Drag and drop files to be deployed.
[]
@@ -218,7 +221,7 @@ mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
[[4]] Now, if you want Archiva to generate a pom for the artifact, check the Generate Maven 2 POM field.
(Right now, only Maven 2 poms can be generated.) Alternately, supply a POM file to be deployed alongside the artifact.
- [[5]] Click Submit and a message will be displayed notifying you if the upload/deployment was successful or not.
+ [[5]] Click Saves files and a message will be displayed notifying you if the upload/deployment was successful or not.
[]
@@ -237,11 +240,5 @@ mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
[../images/upload-artifact.jpg] Upload Artifact
- <Note:> The maximum size of the file that can be uploaded is 10M by default. To alter the setting, change <<<struts.multipart.maxSize>>> in the file
- <<<WEB-INF/classes/struts.properties>>> in the Archiva web application (located under <<<apps/archiva>>> in the standalone distribution).
-
- The upload form also provides validation checks against the required fields and the version. In Archiva 1.2.1, the version checking has been
- loosened. See {{{http://jira.codehaus.org/browse/MRM-1172}MRM-1172}} for more details.
-
~~TODO: information for Maven 1, ant tasks, ivy, etc.