X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=website%2Fdownload.html;h=9364478afc2b30b768ae752a078febd6add2c3c6;hb=6695d8f2418a044b900e9a23dfc3bd04e0f7c222;hp=beca92bed2aa828fdb0d2b6d3e362d5cb7aba3b2;hpb=cfbceac612220d0a877942f7fb6658a5848d1ccf;p=jabaws.git

diff --git a/website/download.html b/website/download.html
index beca92b..9364478 100644
--- a/website/download.html
+++ b/website/download.html
@@ -5,6 +5,7 @@
 <meta name="generator" content="HTML Tidy, see www.w3.org" />
 <meta http-equiv="Content-Type" content=
 "text/html; charset=iso-8859-1" />
+<meta name="Last-modified" content="Mon, 11 Oct 2010 01:03:33 GMT"/>
 <title>Java Bioinformatics Analysis Web Services (JABAWS) download
 page</title>
 <link href="ws.css" rel="stylesheet" type="text/css" />
@@ -26,9 +27,9 @@ class="headeru">S</span>ervices</h2></td>
 <!-- banner end-->
 <div id="wrapper">
 <div id="panel"><a href="index.html">Home</a> <a href=
-"manual.html">Manual</a> <a href="howto.html">How To</a> <a class=
-"selected" href="download.html">Download</a> <a href=
-"http://www.jalview.org">Jalview</a>
+"manual.html">Manual</a> <a href="howto.html">How To</a> 
+<a href="dm_javadoc/index.html" title="Data model javadoc">Javadoc</a>
+<a class="selected" href="download.html">Download</a> 
 <a href="http://www.compbio.dundee.ac.uk">Barton Group</a> 
 </div>
 
@@ -36,22 +37,33 @@ class="headeru">S</span>ervices</h2></td>
 <div id="content">
 <h4><a name="minclient" id="minclient"></a>JABAWS Client</h4>
 
-<p>The client is an executable java archive which provides a
-command line client, and can be used by anyone who would like to
-program against the JABA Web Services in Java.</p>
+<p>The command line client is an  executable Java program which can use JABAWS. It is good for scripting against JABA web services. If you prefer point-and-click interface - download the Graphical User Interface (GUI) client, the <a href="http://www.jalview.org">Jalview</a>. If you intend to write you own client and need a template - download a command line client source package. For a help on generating GUI's for JABA web services you can consult <a href="http://www.jalview.org/source/jalview_2_6_1.tar.gz">Jalview source code</a>. </p>
 
 <ul>
-<li>JABAWS java client: <a href=
-"http://www.compbio.dundee.ac.uk/jabaws/archive/min-jaba-client.jar">download</a>
-(64k)</li>
+<li>Command line client
+  <ul>
+    <li>binaries: <a href=
+"http://www.compbio.dundee.ac.uk/jabaws/archive/min-jaba-client.jar">download</a> (80 K)</li>
+    <li>source: <a href=
+"http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-client-source.jar">download</a> (70 K)</li>
+  </ul>
+</li>
+<li>GUI client   
+  (Jalview)
+  <ul>
+    <li>binaries: <a href=
+"http://www.jalview.org/Web_Installers/install.htm">download</a> (18 Mb)</li>
+    </ul>
+</li>
 </ul>
 
+<p>Please refer to <a href="http://www.jalview.org/help.html">Jalview help pages</a> for a help on connecting to JABAWS instance. Help with a command line client is available from <a href="howto.html#usingcclient">How To</a> pages. </p>
 <h4>JABAWS Server</h4>
 
-<p>The server is provided as a self-contained web application
-archive containing all necessary binaries, ready to install in any
-'modern' Java based web application server
-<!-- Note - mention servlet 2.4 compliance here? -->. Download this
+<p>The server is provided as a self-contained <a href="http://en.wikipedia.org/wiki/WAR_(Sun_file_format)">Web Application
+Archive (WAR) </a> containing all necessary binaries. WAR file can be deployed on any
+ web application server
+<!-- Note - mention servlet 2.4 compliance here? -->supporting Servlet 2.4 specification i.e. <a href="http://tomcat.apache.org/download-60.cgi">Tomcat 6.0</a>. Download this
 if you intend to run JABAWS services locally.</p>
 
 <ul>
@@ -59,12 +71,20 @@ if you intend to run JABAWS services locally.</p>
 "http://www.compbio.dundee.ac.uk/jabaws/archive/jaba.war">download</a>
 (45M)</li>
 
-<li>A Complete Server for windows: <a href=
+<li>A Complete Server for Windows: <a href=
 "http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-windows.war">download</a>
 (16M)</li>
 </ul>
 
 
+<p>Please bear in mind that server for Windows supports only Muscle and Clustal web services! Please refer to the <a href="howto.html#jabaonwin">how to</a> pages to find out why. If you want to run other web services on Windows choose Virtual Appliance package below.  </p>
+<h4>A JABAWS Server Virtual Appliance </h4>
+<p>JABAWS <a href="http://en.wikipedia.org/wiki/Virtual_appliance">virtual appliance</a> is a complete installation of JABAWS software on <a href="http://www.turnkeylinux.org/">TurnKey Linux</a>. By using virtual appliance you can completely avoid JABAWS  installation. The appliance comes fully configured to run JABAWS. All JABAWS clients, such as Jalview can be easily configured to use the appliance. You can run the appliance with freely available <a href="http://www.vmware.com/products/player">VMWare Player</a> or <a href="http://www.virtualbox.org/wiki/Downloads">Oracle VirtualBox.</a> We have tested JABAWS appliance with VMWare Player on Windows and Linux, and VirtualBox on Windows, Linux and Mac. However, you are not limited to these virtualization systems and can use JABAWS appliance with any commercial alternative. </p>
+<ul>
+  <li> JABAWS Virtual Appliance: <a href="http://www.compbio.dundee.ac.uk/jabaws/archive/jabaws-vm.zip">download</a> (520M) </li>
+  </ul>
+<p>Please review the relevant <a href="manual.html#whenvm">manual</a> and <a href="howto.html#vmbexc">how to</a> sections for the configuration settings. </p>
+<p>&nbsp;</p>
 <div class="source">
 <div class="header" onclick=
 "$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
@@ -76,66 +96,26 @@ if you intend to run JABAWS services locally.</p>
 <p>If you have all the programs or wish to download them
 separately, then this package is for you.</p>
 <ul>
-	<li>Complete Server without native executables: <a href=
+	<li>Complete server without native executables: <a href=
 "http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-no-binaries.war">
-download</a> (14M)</li></ul>
-
-<h4>JABAWS server without JAX-WS</h4>
-
-<p>Download this if you intend to run JABAWS for your lab/institute
-locally, and have a java web application server which already has
-the JAX-WS libraries installed. This package does not contain <a
-href="https://jax-ws.dev.java.net/">JAX-WS</a> libraries, so its
-installation will not cause any version conflicts.<br />
-<em>Note: If you find the server does not work, then we suggest you
-try installing the full JABAWS server package.</em></p>
-
-<ul>
-<li>Server (without JAX-WS) for all platforms: <a href=
-"http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-no-jaxws.war">download</a>
-(31M)</li>
-
-<li>Server (without JAX-WS) for windows: <a href=
-"http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-no-jaxws-windows.war">
-download</a> (2M)</li>
-
-<li>Server (without JAX-WS) without binaries: <a href=
-"http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-no-jaxws-no-binaries.war">
-download</a> (&lt;1M)</li>
+download</a> (14M)</li>
 </ul>
 
-<h4>JABAWS execution framework</h4>
-
-<p>This package is for developers who would like to use JABAWS's
-execution system in their own Java programs to control native
-executables in local or cluster environments. It is the JABAWS code
-without the server components.</p>
-
-<ul>
-<li>The framework package: <a href=
-"http://www.compbio.dundee.ac.uk/jabaws/archive/full-jaba-client-pack.zip">
-download</a>(31M)</li>
-</ul> 
-
 <h4>The complete source code</h4>
 
 <p>We offer the code under <a href=
-"http://www.apache.org/licenses/LICENSE-2.0.txt">Apache version 2
-licence</a> please feel free to download and use our product as
-well as the source code. The code comes in the form of an <a href=
-"http://www.eclipse.org">Eclipse</a> project, but Eclipse is not
-necessary to run it. Please examine the Ant build file (build.xml)
-to find out how to build JABAWS from source, and execute a variety
-of useful tasks, including a task for runing the JABAWS test
-cases.</p>
+"http://www.apache.org/licenses/LICENSE-2.0.txt">Apache licence</a>.  The code archive contains the complete <a href=
+"http://www.eclipse.org">Eclipse</a> JABAWS project, but Eclipse is not
+necessary to build it. Please examine the Ant build file (build.xml)
+to build and test JABAWS from sources.</p>
 
 <ul>
-<li>A complete eclipse project package: <a href=
+<li>A complete Eclipse project package: <a href=
 "http://www.compbio.dundee.ac.uk/jabaws/archive/jaba-project.zip">download</a>
 (82M)</li>
 
-<li>Source only package: <a href=
-"archive/jaba-source.jar">download</a> (25K)</li>
+<li>JABAWS source  only package: <a href=
+"archive/jaba-source.jar">download</a> (250K)</li>
 </ul>
 
 <br />
@@ -149,7 +129,7 @@ cases.</p>
 </div>
 
 <!-- content end-->
-<div id="copyright">Last update: 19 August 2010<br />
+<div id="copyright">Last update: 17 November 2010<br />
  Peter Troshin and Geoff Barton, The Barton Group, University of
 Dundee, UK</div>
 </div>