[MRM-646]

-added instructions for deploying archiva to tomcat 6.0.x
-mail-1.4.jar should also be added to common/lib

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

diff --git a/archiva-docs/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt
index e06f0814a6a74a59c1c5ce6b519463a9c7a15eaf..28d3cf57818aa46259a42eb167f2e2ad0039621b 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/webapp.apt
+++ b/archiva-docs/src/site/apt/adminguide/webapp.apt
@@ -7,7 +7,12 @@ Installing Apache Archiva as a Web Application
 ~~TODO: link to wiki location for other application servers
 
   Archiva can be deployed as a web application into any Java EE application server. This document will show an
-  example of doing so with Tomcat 5.5.
+  example of doing so with Tomcat 5.5 and Tomcat 6.0.x.
+
+  <<Note>>: When you first start Archiva, you will see an Exception that schema SA does not exist - however it doesn't 
+  cause a problem. If you use a username other than 'sa', such as 'archiva', then you seem to get the same error but
+  Tomcat fails to start the context and you have to shutdown and restart again.
+
 
 To deploy Archiva on Tomcat 5.5
 
@@ -40,17 +45,27 @@ To deploy Archiva on Tomcat 5.5
  </Context>
 +-------------------------------------------------------------------------+
 
-   * <<Note>>: Tomcat 5.5.20 and 5.5.23 are missing MailSessionFactory and a
+   * Install <<<derby-10.1.3.1.jar>>> and <<<mail-1.4.jar>>> into the Tomcat <<<common/lib>>>. This is required since the data sources are
+     instantiated before the web application.
+
+   <<Note>>: Tomcat 5.5.20 and 5.5.23 are missing MailSessionFactory and a
    few other classes.  JNDI mail sessions will <not> work.  Use Tomcat 5.5.17
    instead, or see {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668}
    Bug 40668}} for a workaround.
 
-   * Install <<<derby-10.1.3.1.jar>>> into the Tomcat <<<common/lib>>>. This is required since the data sources are
-     instantiated before the web application.
+To deploy Archiva on Tomcat 6.0.x:
+
+    * Do the same steps specified above when deploying to Tomcat 5.5.
 
- When you first start Archiva, you will see an Exception that schema SA does not exist - however it doesn't 
- cause a problem. If you use a username other than 'sa', such as 'archiva', then you seem to get the same error but
- Tomcat fails to start the context and you have to shutdown and restart again.
+    * The ${appserver.base} java property is used by the Archiva internal logging configuration to determine where to output its logs to.
+    It is important to define this property either in the $CATALINA_OPTS system environment variable (if Tomcat is being launched via the
+    command line) or the service properties (if being launched as a service or daemon). The format typically expected is
+    -Dappserver.base=<SOMEWHERE>. In this example, we'll put the logs in Tomcat's <<<logs>>> directory so we need to set appserver.base
+    property to where Tomcat is installed:
+
++-----------+
+export CATALINA_OPTS="-Dappserver.home=$CATALINA_HOME -Dappserver.base=$CATALINA_HOME"
++-----------+
 
 Archiva Configuration
 
@@ -68,4 +83,4 @@ Upgrading Archiva
 Configuring and Running Archiva
 
   Once Archiva is running, it is configured in the same way as the standalone instance. See the {{{../quick-start.html#Setting%20up%20your%20Archiva%20instance} quick start}} guide for more information.
-
+  
\ No newline at end of file