Author: brett
Date: Fri Nov 23 00:11:47 2007
New Revision: 597587
URL: http://svn.apache.org/viewvc?rev=597587&view=rev
Log:
small tweaks
Modified:
maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
Modified: maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt?rev=597587&r1=597586&r2=597587&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
(original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt Fri Nov
23 00:11:47 2007
@@ -5,7 +5,6 @@
Installing Apache Archiva as a Web Application
~~TODO: link to wiki location for other application servers
-~~TODO: upgrading
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.
@@ -21,7 +20,7 @@
+-------------------------------------------------------------------------+
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/archiva"
- docBase="${catalina.home}/archiva/archiva-webapp-1.0-SNAPSHOT.war">
+ docBase="${catalina.home}/archiva/archiva-webapp-1.0.war">
<Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
username="sa"
@@ -46,17 +45,8 @@
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>>>
-
- * To deal with a current bug, you'll also need to add the following to your
<<<${catalina.home}/conf/web.xml>>> in the
- relevant section (search for jspx):
-
-+-------------------------------------------------------------------------+
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jspf</url-pattern>
- </servlet-mapping>
-+-------------------------------------------------------------------------+
+ * 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.
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
