Changeset 2079

Timestamp:

Mar 15, 2006, 11:02:14 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #130. The tomcat fix is not needed anymore, updated documentation.

Location:

trunk/doc

Files:

• installation.html (modified) (2 diffs)
• tomcat_with_java_1.5.txt (modified) (1 diff)

trunk/doc/installation.html

@@ -217 +217 @@
   <p> 
     <i>Tomcat</i> <br>
-    Download and install tomcat 5.0.* or 5.5.*,
+    Download and install tomcat 5.5.15 or later,
     available from <a
     href=http://jakarta.apache.org/tomcat/>http://jakarta.apache.org/tomcat/</a>.
-    We have tested BASE with 5.0.30 and 5.5.7, but later version should
-    also work. The versions we have tested use a built in Java 1.4
-    compiler, to make it work with Java 1.5 read and follow the
-    instructions in:
-    <code>base-2.0RC1/doc/tomcat_with_java_1.5.txt</code>. 
+    We are now recommending everyone to run a late 5.5 release since
+    the trick described in <a
+    href=http://lev.thep.lu.se/trac/base/browser/trunk/doc/tomcat_with_java_1.5.txt>doc/tomcat_with_java_1.5.txt</a> is not needed anymore.
+
+    We have previously tested BASE with tomcat releases 5.0.30 and
+    5.5.7. However, these versions use a built in Java 1.4 compiler,
+    to make it work with Java 1.5 read and follow the instructions in
+    <a 
+    href=http://lev.thep.lu.se/trac/base/browser/trunk/doc/tomcat_with_java_1.5.txt>doc/tomcat_with_java_1.5.txt</a>
   </p>
   
@@ -233 +237 @@
     <code>CATALINA_OPTS</code> to <code>-server</code>. It is also a good idea
     to specify the maximum allowed memory to use: <code>-server -Xmx500m</code>
-    sets it to 500 megabytes. For more information about Tomcat options see
-    <a href="http://www.chemaxon.com/jchem/doc/admin/tomcat.html">http://www.chemaxon.com/jchem/doc/admin/tomcat.html</a>
+    sets it to 500 megabytes. Basically add the next line close to the
+    top of the <code>catalina.sh</code> script that comes with tomcat
+    (diectory <code>bin</code>):
+<pre>
+    CATALINA_OPTS="-server -Xmx500m"
+</pre>
+  </p>
+  
+  <p>
+  For more information about Tomcat options see
+  <a
+  href="http://www.chemaxon.com/jchem/doc/admin/tomcat.html">http://www.chemaxon.com/jchem/doc/admin/tomcat.html</a>.
   </p>
 

trunk/doc/tomcat_with_java_1.5.txt

@@ +1 @@
+$Id$
+
+Copyright (C) 2005 Nicklas Nordborg
+Copyright (C) 2006 Jari Häkkinen
+
+This file is part of BASE - BioArray Software Environment.  Available
+at http://base.thep.lu.se/
+
+BASE is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+BASE is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
+
+
 
 How to configure Tomcat to use Java 1.5
 =======================================
 
-The new Tomcat 5.5 comes with it's own compiler, which is not
-Java 1.5 compatible. Here are the instructions to replace the
-built-in compiler with Sun's compiler.
+The below trick is not needed for later Tomcat 5.5 releases. We have
+succesfully installed, and use, a non-modified Tomcat version 5.5.15
+with BASE. If you use release 5.5.15 or later you can safely skip the
+rest of this file.
+
+The new Tomcat 5.5 (and older tomcat 5) comes with it's own compiler,
+which is not Java 1.5 compatible. Here are the instructions to replace
+the built-in compiler with Sun's compiler.
 
 It requires that you have downloaded and installed Java 1.5 SDK