From a81c768bb668f9ada87631b5cb3c29acac5263bf Mon Sep 17 00:00:00 2001
From: ejc12 <ejc12@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 13 Apr 2010 18:31:40 +0000
Subject: [PATCH] Merge rev 460 to trunk. Includes context changes.

---
 doc/install.txt | 23 +++++++++++++++++++++++
 doc/upgrade.txt | 30 +++++++++++++++++++++++++++---
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/doc/install.txt b/doc/install.txt
index 029bc291..2175f090 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -266,6 +266,29 @@ primary web server. The "Quick Start HowTo" on the Apache site
 http://tomcat.apache.org/connectors-doc/generic_howto/quick.html describes 
 the minimum server configurations for several popular web servers.
 
+After setting up the mod_jk connector above, you will need to modify the Tomcat's 
+server.xml ([tomcat root]/conf/) to respond to requests from Apache via the connector.
+
+Look for the <connector> directive and add the following properties: 
+
+	connectionTimeout="20000" maxThreads="320" keepAliveTimeout="20000" 
+
+Note: the value for maxThreads (320) is equal to the value for MaxClients in the 
+httpd.conf file.
+
+Locate the <Host name="localhost"...> directive and update as follows:
+
+	<Alias>example.com</Alias>
+	<Context path=""
+		docBase="/usr/local/tomcat/webapps/vivo"
+		reloadable="true"
+		cookies="true" >
+		<Environment type="java.lang.String" override="false" 
+			name="path.configuration" 
+			value="deploy.properties"
+		/>
+	</Context>
+
 -------------------------------------------------------------------------------
  
 XII. Configure Pellet Reasoner
diff --git a/doc/upgrade.txt b/doc/upgrade.txt
index 9b8115f4..c339afff 100644
--- a/doc/upgrade.txt
+++ b/doc/upgrade.txt
@@ -84,11 +84,35 @@ II. The Upgrade Process
 5. If you had modified web.xml to configure the Pellet Reasoner (as described
     in the installation instructions), repeat that modification.
 
-6. Run ant deploy by typing: ant deploy
+6. Stop "Apache Tomcat" and run ant deploy by typing: ant deploy
 
-7. Start "Apache Tomcat" and login to VIVO.
+7. If you have setup the Apache Tomcat Connector using mod_jk and modified your
+	tomcat/conf/server.xml file, you will need to add 4 lines to your context
+	section, see examples below.
+	
+	Context section before:
+	
+	<Context path=""
+		docBase="/usr/local/tomcat/webapps/vivo"
+		reloadable="true"
+		cookies="true" >
+	</Context>
+	
+	Context section after:
+	
+	<Context path=""
+		docBase="/usr/local/tomcat/webapps/vivo"
+		reloadable="true"
+		cookies="true" >
+		<Environment type="java.lang.String" override="false" 
+			name="path.configuration" 
+			value="deploy.properties"
+		/>
+	</Context>
 
-8. Rebuild the Lucene search index as described in step IX of
+8. Start "Apache Tomcat" and login to VIVO.
+
+9. Rebuild the Lucene search index as described in step IX of
 the install process. This step will ensure that changes in the RDF
 data to align with the latest version of the core ontology
 will be reflected in the search index.