Added a faq, added info on using Jetty, mentioned the wiki page

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

diff --git a/src/site/apt/guides/getting-started/faq.apt b/src/site/apt/guides/getting-started/faq.apt
new file mode 100644 (file)
index 0000000..e1e23f2
--- /dev/null
+++ b/src/site/apt/guides/getting-started/faq.apt
@@ -0,0 +1,30 @@
+ -----
+ Getting Started in Archiva FAQ
+ -----
+ Henri Yandell
+ -----
+ 10 November 2006
+ -----
+
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ Licensed under the Apache License, Version 2.0 (the "License");
+~~ you may not use this file except in compliance with the License.
+~~ You may obtain a copy of the License at
+~~
+~~      http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Getting Started FAQ
+
+    [How do I access my repository through Archiva?] By default Archiva provides a secure WebDAV URL that needs a user and password. If you want it to not be secured, then you need to add the Repository-Observer role for the repository in question to the Guest user. This is done on the User Management page when logged in as an administrator. 
+
+~~ [How do I login in M1, M2, Ant?]

diff --git a/src/site/apt/guides/getting-started/index.apt b/src/site/apt/guides/getting-started/index.apt
index 4e582e8884171d39fd94723ff4fdfac56b913642..d7669abb7470f83eb3effc398e7630b55b009ae3 100644 (file)
--- a/src/site/apt/guides/getting-started/index.apt
+++ b/src/site/apt/guides/getting-started/index.apt
@@ -50,6 +50,13 @@ To build
     * Run: mvn install:install-file -DgroupId=javax.mail -DartifactId=mail -Dversion=1.3.2 -Dpackaging=jar -Dfile=javamail-1.3.2/mail.jar 
 
 
+To test-deploy Archiva on the embedded Jetty
+
+    * cd archiva-webapp
+
+    * mvn jetty:run
+
+
 To deploy Archiva to Tomcat 5.5
 
    * Create a directory in tomcat called archiva, at the same level as bin, conf, logs and the others.
@@ -101,7 +108,7 @@ To deploy Archiva on Plexus
 
 Setting up your Archiva instance
 
-   * Goto {{http://localhost:8080/archiva/}} if on Tomcat or {{http://localhost:8080/}} if on Plexus.
+   * Goto {{http://localhost:9091/archiva/}} if on the embedded Jetty, {{http://localhost:8080/archiva/}} if on Tomcat or {{http://localhost:8080/}} if on Plexus.
 
    * On the first page - setup your administration user. The password requires a numerical character and must not be longer than 8 chars. You'll then need to log in. User 'admin' as the username and the password you've entered.
 

diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index fb252f6bbc3ed9ee7d5456f4e5d250317530323c..79f1d8348be027a789a65ba7cb414f4a21324f17 100644 (file)
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -41,3 +41,5 @@ Welcome to Maven Archiva
   If you'd like to obtain the code, you can get it from Subversion. See {{{source-repository.html} SCM details}} for more information.
 
   Bugs, issues and new ideas should be reported in the issue tracker - see {{{issue-tracking.html} this page}}.
+
+  See the {{{http://docs.codehaus.org/display/MAVENUSER/Archiva} the Archiva wiki}} for more information, or log onto the IRC channel #archiva:irc.codehaus.org.

diff --git a/src/site/site.xml b/src/site/site.xml
index 1596d5479f2d641b5ee76dfa3bd62e6272c628e7..9ac73bd7bd4a5bdcad466acd1624fb2ad7c5988e 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,6 +25,7 @@
     <menu name="Documentation">
         <item name="Welcome"    href="/index.html"/>
         <item name="Getting Started"    href="/guides/getting-started/index.html"/>
+        <item name="Getting Started FAQ"    href="/guides/getting-started/faq.html"/>
         <item name="Developing"    href="/guides/developing/index.html"/>
     </menu>