Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-690] instructions apply to both versions of Tomcat 

Merged from: r639122 on archiva-1.0.x branch


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@639124 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2008-03-20 02:57:31 +00:00
parent b147d24630
commit 42a62ceef1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-docs/src/site/apt/adminguide/webapp.apt
View File

@ -14,7 +14,7 @@ Installing Apache Archiva as a Web Application
Tomcat fails to start the context and you have to shutdown and restart again.
To deploy Archiva on Tomcat 5.5
To deploy Archiva on Tomcat 5.5 and Tomcat 6.0
* Create a directory in tomcat called archiva, at the same level as bin, conf, logs and the others.
@ -53,10 +53,6 @@ To deploy Archiva on Tomcat 5.5
instead, or see {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668}
Bug 40668}} for a workaround.
To deploy Archiva on Tomcat 6.0.x:
* Do the same steps specified above when deploying to Tomcat 5.5.
* 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
@ -67,6 +63,8 @@ To deploy Archiva on Tomcat 6.0.x:
export CATALINA_OPTS="-Dappserver.home=$CATALINA_HOME -Dappserver.base=$CATALINA_HOME"
+-----------+
For more information, see {{{http://cwiki.apache.org/confluence/display/ARCHIVA/Archiva+on+Tomcat} Archiva on Tomcat}} in the wiki.
Archiva Configuration
Archiva is configured using the <<<~/.m2/archiva.xml>>> configuration file by default when using a Java EE application server.