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

diff --git a/website/manual_qs_war.html b/website/manual_qs_war.html
index 5dc65c3..e3c0cc8 100644
--- a/website/manual_qs_war.html
+++ b/website/manual_qs_war.html
@@ -14,7 +14,7 @@
 <div id="banner">
 <table> 
 <tr><td style="width:158px;"><a href="http://www.dundee.ac.uk"><img src="images/uod_lt_long.gif"  alt="University of Dundee" width="158" height="90" class="logo"  title="University of Dundee" longdesc="http://www.dundee.ac.uk"/></a></td>
-<td class="bg"><img src="images/jabaws2.png" alt="JABAWS-2.0:Disorder" width="353" height="67" title="JABAWS-2.0:Disorder"/></td>
+<td class="bg"><img src="images/jabaws2.png" alt="JABAWS-2.0" title="Java Bioinformatics Analysis Web Services version 2.0"/></td>
 <td class="bg"><img src="images/banner_right.png" alt="Disorder" width="200" height="80"/></td>
 </tr>
 </table>
@@ -25,9 +25,10 @@
 <a href="index.html">Home</a>
     <a class="selected" href="quick_start.html">Getting Started</a> 
     <a href="man_about.html">Manual</a> 
-	<a href="download.html">Download</a>
-	<a href="contacts.html">Contact Us</a>
+	<a href="http://www.compbio.dundee.ac.uk/download">Download</a>
     <a href="PublicAnnualStat" title="JABAWS server usage statistics">Usage Statistics</a>
+	 <a href="ServiceStatus" title="JABAWS webservices status. Click to test all web services. Please be patient while the services are being checked">Services Status</a>
+	<a href="contacts.html">Contact Us</a>
     <a href="http://www.compbio.dundee.ac.uk" title="University of Dundee, The Barton Group" >Barton Group</a>
 
 </div><!-- panel end-->
@@ -49,7 +50,7 @@
 </tr>
 <tr>
   <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
-  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+  <td><a href="man_awscloud.html">JABAWS on the Amazon cloud </a></td>
 </tr>
 <tr>
 	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
@@ -68,30 +69,26 @@
 <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/download.html">JABAWS WAR for your platform </a></li>
+<li>Download the <a href="http://www.compbio.dundee.ac.uk/download">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 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>
+  <li> If you are on Mac or other unix-like architecture with GNU compilers available or you'd like to get a maximum performance </li>
+   <ul><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>
+     </ul>
 </ol> 
 
 <h3>Testing</h3>
-<p>You can test that your JABAWS server is working in two ways.</p>
+<p>You can test that your JABAWS server is working in several ways.</p>
 <ol>
+<li>Visit Services Status page available from the JABAWS main page using your web browser.</li>
+
 <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>
-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>
+  <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>
-
 <li>Alternately, you can point Jalview at your new server:
 <ul>
   <li>Launch the desktop version of <a href="http://www.jalview.org/download.html">Jalview</a></li>
@@ -103,7 +100,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: 10 August 2011<br/>
+<div id="copyright">Last update: 16 September 2011<br/>
 Peter Troshin, Jim Procter and Geoff Barton, The Barton Group, University of Dundee, UK</div>
 
 </div><!-- wrapper end -->