X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=website%2Fmanual_qs_war.html;h=5dc65c3e443fceb018c1f65fe641a6ec1bc67234;hb=a694d5e4cac2ed5f560c9939a04d9729c477c724;hp=9fbc23c0afa5116ca6c13dc5654dc1f7bbc3b213;hpb=5be9c8c2ff3353e57cb1b626efcf0088522419ff;p=jabaws.git

diff --git a/website/manual_qs_war.html b/website/manual_qs_war.html
index 9fbc23c..5dc65c3 100644
--- a/website/manual_qs_war.html
+++ b/website/manual_qs_war.html
@@ -48,7 +48,11 @@
     <td><a href="manual_qs_va.html#qsc">JABAWS Virtual Appliance (VA)</a></td>
 </tr>
 <tr>
-	<td>Running JABAWS for my group, lab, or organization</td>
+  <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
+  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+</tr>
+<tr>
+	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
     <td><a href="manual_qs_war.html#qsc">JABAWS Web Application aRchive (WAR)</a></td>
 </tr>
 <tr>
@@ -64,15 +68,17 @@
 <p>This is for anyone who wants to run JABAWS for their group, lab or organization, or wants to enable their local JABA server to use the cluster or perform very large tasks.</p>
 
 <ol>
-<li>Download the <a href="http://www.compbio.dundee.ac.uk/jabaws/archive/jaba.war">JABAWS WAR with all binaries</a> (45M)</li>
-  <li>Download and install <a href="http://tomcat.apache.org/download-60.cgi">Apache-Tomcat</a>.<br/>
-   <span class="hightlight">You will need at least version 5.5 of Tomcat (we would recommend version 6.0) and at least version 1.6 (i.e. JAVA 6) of Java.</span></li>
+<li>Download the <a href="http://www.compbio.dundee.ac.uk/jabaws/download.html">JABAWS WAR for your platform </a></li>
+  <li>Download and install <a href="http://tomcat.apache.org/download-70.cgi">Apache-Tomcat</a>.<br/>
+   <span class="hightlight">You will need at least version 5.5 of Tomcat (we would recommend version 7.0) and at least version 1.6 (i.e. JAVA 6) of Java.</span></li>
   <li>Drop the JABAWS WAR file into <span class="hightlight">tomcat/webapps</span> directory.</li>
   <li>(Re)start the Tomcat.</li>
   <li>Once the tomcat has started, it should automatically unpack the WAR into the webapps directory (if it doesn't, then you'll need to do this manually, it's just a zip archive in the end).</li>
   <li>You then need to complete the installation of the executable binaries:</li>
-   <ul><li>If you are on Linux<br/><span class="hightlight">cd</span> to <span class="hightlight"> webapps/jabaws/binaries/src/</span> and execute <span class="hightlight">./setexecflag.sh </span> script to ensure the JABAWS binaries can be executed. </li>
-  	<li>If you are on a Mac (OSX intel mac only) or other unix-like architecture with gnu compilers available:</li>
+   <ul>
+     <li>If you are on Linux or Mac (OSX intel Mac only) <br/>
+       <span class="hightlight">cd</span> to <span class="hightlight"> webapps/jabaws/binaries/src/</span> and execute <span class="hightlight">./setexecflag.sh </span> script to ensure the JABAWS binaries can be executed. </li>
+  	<li>If you are on other unix-like architecture with gnu compilers available or you'd like to get a maximum performance:</li>
   	<li> <span class="hightlight">cd</span> to <span class="hightlight">webapps/jabaws/binaries/src/</span> and execute <span class="hightlight">./compilebin.sh  </span> script to compile all binaries JABAWS depends on. </li>
   <li><span class="hightlight">cd</span> to <span class="hightlight"> webapps/jabaws/binaries/src/ </span>and execute <span class="hightlight">./setexecflag.sh </span> script. </li>
   </ul>
@@ -82,7 +88,7 @@
 <p>You can test that your JABAWS server is working in two ways.</p>
 <ol>
 <li>If you are working on the command line, then use the command line client shipped with the JABAWS war to test it by running:
-<span class="code">java -jar &lt;Path to tomcat WebApp directory&gt;/jabaws/WEB-INF/lib/jaba-client.jar -h http://localhost:8080/jabaws</span>
+<span class="code">java -jar &lt;Path to tomcat WebApp directory&gt;/jabaws/WEB-INF/lib/jaba-client.jar -h=http://localhost:8080/jabaws</span>
 In this example we assumed that your JABAWS server URL is <span class="hightlight">http://localhost:8080</span> and JABAWS context path is <span class="hightlight">jabaws</span>
 </li>
 
@@ -97,7 +103,7 @@ In this example we assumed that your JABAWS server URL is <span class="hightligh
 <!--  TODO put JABAWS CMD test instructions here -->
 </div> <!-- content end-->
 <!-- about end-->
-<div id="copyright">Last update: 1 April 2011<br/>
+<div id="copyright">Last update: 10 August 2011<br/>
 Peter Troshin, Jim Procter and Geoff Barton, The Barton Group, University of Dundee, UK</div>
 
 </div><!-- wrapper end -->