[MRM-754]

added artifact upload and virtual repos in feature tour


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@660356 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 70 insertions, 7 deletions

diff --git a/archiva-docs/src/site/resources/images/tour/upload.png b/archiva-docs/src/site/resources/images/tour/upload.png
new file mode 100644
index 000000000..8f3a1ea79
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/tour/upload.png
diff --git a/archiva-docs/src/site/resources/images/tour/virtual-repos.png b/archiva-docs/src/site/resources/images/tour/virtual-repos.png
new file mode 100644
index 000000000..12b02eb99
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/tour/virtual-repos.png
diff --git a/archiva-docs/src/site/xdoc/tour/admin.xml b/archiva-docs/src/site/xdoc/tour/admin.xml
index 610618e6e..bcea540f4 100644
--- a/archiva-docs/src/site/xdoc/tour/admin.xml
+++ b/archiva-docs/src/site/xdoc/tour/admin.xml
@@ -16,9 +16,9 @@
           configuration files so that they can also be hand-edited if necessary.
         </p>
         <p>
-          <a href="proxy.html">Previous: Remote Proxying Cache</a> |
+          <a href="upload.html">Previous: Artifact Upload</a> |
           <strong>Graphical Administration</strong> |
-          <a href="security.html">Next: Role-based Security</a>
+          <a href="virtual-repos.html">Next: Virtual Repositories</a>
         </p>
       </div>
     </section>
diff --git a/archiva-docs/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml
index 45b222989..c11c36899 100644
--- a/archiva-docs/src/site/xdoc/tour/index.xml
+++ b/archiva-docs/src/site/xdoc/tour/index.xml
@@ -51,24 +51,36 @@ table.bodyTable tr.b {
                3. Remote Proxying Cache
             </a>
           </td>
+          <td>
+            <a href="upload.html">
+              <img src="../images/tour/upload.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
+               4. Artifact Upload
+            </a>
+          </td>
         </tr>
         <tr>
           <td>
             <a href="admin.html">
               <img src="../images/tour/admin.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              4. Graphical Administration
+              5. Graphical Administration
+            </a>
+          </td>
+          <td>
+            <a href="virtual-repos.html">
+              <img src="../images/tour/virtual-repos.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
+              6. Virtual Repositories
             </a>
           </td>
           <td>
             <a href="security.html">
               <img src="../images/tour/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              5. Role-based Security
+              7. Role-based Security
             </a>
           </td>
           <td>
             <a href="reports.html">
               <img src="../images/tour/reports.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
-              6. Integrity Reports
+              8. Integrity Reports
             </a>
           </td>
         </tr>
diff --git a/archiva-docs/src/site/xdoc/tour/proxy.xml b/archiva-docs/src/site/xdoc/tour/proxy.xml
index 9e1073b38..e67b7742d 100644
--- a/archiva-docs/src/site/xdoc/tour/proxy.xml
+++ b/archiva-docs/src/site/xdoc/tour/proxy.xml
@@ -18,7 +18,7 @@
         <p>
           <a href="search.html">Previous: Artifact Search</a> |
           <strong>Remote Proxying Cache</strong> |
-          <a href="admin.html">Next: Graphical Administration</a>
+          <a href="upload.html">Next: Artifact Upload</a>
         </p>
       </div>
     </section>
diff --git a/archiva-docs/src/site/xdoc/tour/security.xml b/archiva-docs/src/site/xdoc/tour/security.xml
index 1e49c9fa9..76149face 100644
--- a/archiva-docs/src/site/xdoc/tour/security.xml
+++ b/archiva-docs/src/site/xdoc/tour/security.xml
@@ -16,7 +16,7 @@
           access for individuals, or given roles.
         </p>
         <p>
-          <a href="admin.html">Previous: Graphical Administration</a> |
+          <a href="virtual-repos.html">Previous: Virtual Repositories</a> |
           <strong>Role-based Security</strong> |
           <a href="reports.html">Next: Integrity Reports</a>
         </p>
diff --git a/archiva-docs/src/site/xdoc/tour/upload.xml b/archiva-docs/src/site/xdoc/tour/upload.xml
new file mode 100644
index 000000000..1365dbf38
--- /dev/null
+++ b/archiva-docs/src/site/xdoc/tour/upload.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Artifact Upload</title>
+    <author email="oching@apache.org">Maria Odea Ching</author>
+  </properties>
+  <head>
+  </head>
+  <body>
+    <section name="Artifact Upload">
+      <div style="text-align: center">
+        <img src="../images/tour/upload.png" width="640" height="401" alt="" />
+        <p>
+          Archiva now supports artifact uploads via UI. A pom file can also be included
+          in the upload or Archiva can generate one during the upload.
+        </p>
+        <p>
+          <a href="proxy.html">Previous: Remote Proxying Cache</a> |
+          <strong>Artifact Upload</strong> |
+          <a href="admin.html">Next: Graphical Administration</a>
+        </p>
+      </div>
+    </section>
+  </body>
+</document>
diff --git a/archiva-docs/src/site/xdoc/tour/virtual-repos.xml b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
new file mode 100644
index 000000000..f9ee9254a
--- /dev/null
+++ b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Virtual Repositories</title>
+    <author email="oching@apache.org">Maria Odea Ching</author>
+  </properties>
+  <head>
+  </head>
+  <body>
+    <section name="Virtual Repositories">
+      <div style="text-align: center">
+        <img src="../images/tour/virtual-repos.png" width="640" height="401" alt="" />
+        <p>
+          Archiva implements the concept of virtual repositories, wherein a set of
+          Archiva repositories can be grouped together under one URL and that one URL
+          can be used by clients (s.a. Maven) to download from these repositories.
+        </p>
+        <p>
+          <a href="admin.html">Previous: Graphical Administration</a> |
+          <strong>Virtual Repositories</strong> |
+          <a href="security.html">Next: Role-based Security</a>
+        </p>
+      </div>
+    </section>
+  </body>
+</document>