jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r377720 - in /incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy: howto-model1.xml howto-model2.xml
Date Tue, 14 Feb 2006 13:20:27 GMT
Author: jukka
Date: Tue Feb 14 05:20:24 2006
New Revision: 377720

URL: http://svn.apache.org/viewcvs?rev=377720&view=rev
Log:
Applied a patch from Mark Slater to improve the Tomcat configuration instructions.

Modified:
    incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model1.xml
    incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model2.xml

Modified: incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model1.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model1.xml?rev=377720&r1=377719&r2=377720&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model1.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model1.xml Tue Feb
14 05:20:24 2006
@@ -104,8 +104,10 @@
 ]]></source>
         <p>
           In Tomcat 5.5, add the following snippet in your application's
-          <code>context.xml</code> file (or in the <code>server.xml</code>
-          file if you prefer central configuration).
+          <code>WEB-INF/context.xml</code> or
+          <code>$CATALINA_HOME/conf/[enginename]/[hostname]/[webappname].xml</code>.
+          If you prefer central configuration, you can add the configuration
+          to the Host Context section in the <code>server.xml</code>.
         </p>
         <source><![CDATA[
 <Resource name="jcr/repository"

Modified: incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model2.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model2.xml?rev=377720&r1=377719&r2=377720&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model2.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/site/xdoc/doc/deploy/howto-model2.xml Tue Feb
14 05:20:24 2006
@@ -106,8 +106,10 @@
           In Tomcat versions 4.x and 5.0, add the following snippet
           in <code>server.xml</code> under the <code>Context</code>
element
           of your web application. In Tomcat version 5.5, add the snippet
-          in your application's <code>context.xml</code> file (or in the
-          <code>server.xml</code> file if you prefer central configuration).
+          in your application's <code>context.xml</code> or
+          <code>$CATALINA_HOME/conf/[enginename]/[hostname]/[webappname].xml</code>.
+          If you prefer central configuration, you can add the configuration
+          to the Host Context section in the <code>server.xml</code>.
         </p>
         <source><![CDATA[
 <ResourceLink name="jcr/repository"



Mime
View raw message