JWS-109 & JWS-110 Updated the Downloads page so that it follows the same style as...
authorFábio Madeira <fmmarquesmadeira@dundee.ac.uk>
Mon, 6 Mar 2017 13:59:20 +0000 (13:59 +0000)
committerFábio Madeira <fmmarquesmadeira@dundee.ac.uk>
Mon, 6 Mar 2017 14:05:12 +0000 (14:05 +0000)
website/download.jsp

index e2c7405..bfbe57c 100644 (file)
     <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel panel-heading">
+                <h1 class="panel-title">JABAWS distributions</h1>
+            </div>
+            <div class="panel-body">
+                <p class="justify">
+                    Read the <a href="${pageContext.request.contextPath}/getting_started.jsp">quickstart guides</a>
+                    to better decide which JABAWS distribution better suits your needs.
+                    Additional information is available in the <a href="${pageContext.request.contextPath}/man_docs.jsp">
+                    JABAWS documentation pages</a>.
+                </p>
+                <br>
+                <div class="row">
+                    <!--<div class="col-md-1"></div>-->
+                    <div class="col-md-10">
+                        <table class="table">
+                            <tr>
+                                <th>Downloads</th>
+                                <th>I want to use JABAWS for...</th>
+                            </tr>
+                            <tr>
+                                <td><a href="#va">JABAWS Virtual Appliance (VA)</a></td>
+                                <td>Running JABAWS services through Jalview on my
+                                    computer with a <strong>private</strong> server</td>
+                            </tr>
+                            <tr>
+                                <td><a href="#war">JABAWS Web Application aRchive (WAR)</a></td>
+                                <td>Running JABAWS for my group, lab, or organization on the
+                                    <strong>local</strong> infrastructure</td>
+                            </tr>
+                            <tr>
+                                <td><a href="#client">JABAWS Command Line Interface (CLI)</a></td>
+                                <td>Accessing a <strong>public</strong> or <strong>private</strong>
+                                    JABAWS server from my own software</td>
+                            </tr>
+                            <tr>
+                                <td><a href="#source">JABAWS Source Code</a></td>
+                                <td>Extend the functionally of JABAWS by adding new features and services.
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="col-md-2"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel panel-heading">
+                <h1 class="panel-title">Current Version</h1>
+            </div>
+            <div class="panel-body">
+                <p class="justify">
+                    The current version of JABAWS is 2.2.0, released on XX March 2017. We advise you to update to JABAWS 2.2 as this version is fully backward compatible with JABAWS v1.0, v2.0 and v2.1.
+                    Please consult the <a href="${pageContext.request.contextPath}/man_about.jsp#jaba2.2">documentation pages</a>
+                    for the changelog and more information on compatibility between versions.</p>
+                </p>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row" id="va">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel panel-heading">
                 <h1 class="panel-title">JABAWS Server Virtual Appliance (VA)</h1>
             </div>
             <div class="panel-body">
                     the virtual machine. We recommend <a href="http://www.vmware.com/products/player">VMWare Player</a>
                     which is available for free for Windows and Linux users. Once the VA is running, you can
                     configure <a href="http://www.jalview.org/download.html">Jalview</a> to use your local
-                    JABAWS VA with
-                    <a href="http://www.compbio.dundee.ac.uk/jabaws/man_servervm.html#jalviewWithJaba">these instructions</a>.
+                    JABAWS VA with <a href="${pageContext.request.contextPath}/man_servervm.jsp#jalviewWithJaba">these instructions</a>.
+
                 </p>
                 <ul>
-                    <li>JABAWS Virtual Appliance: <a href='/download/get?id=JABAWS210.pack.tar.gz'>download</a> (593Mb)</li>
-                    <li>Additional Virtual disk with the <a href="http://www.uniprot.org/help/uniref">UniRef</a> database:
-                        <a href='/download/get?id=JABAWS.2.1.0.uniref.real.vmdk.gz'>download</a> (2.3Gb)</li>
+                    <li>
+                        <a href='${pageContext.request.contextPath}/archive/full-jabaws-client-2.2.0-pack.zip'>
+                            <i class="fa fa-download" aria-hidden="true"></i> JABAWS Virtual Appliance</a></li>
                 </ul>
                 <p class="justify">
-                    Please check the JABAWS <a href="http://www.compbio.dundee.ac.uk/jabaws/man_servervm.html#whenvm">manual</a>
+                    Please check the JABAWS <a href="${pageContext.request.contextPath}/man_servervm.jsp">document pages</a>
                     for further instructions.
                 </p>
-
-                <p class="justify">
-                    Since the current version of Jpred requires a local copy of filtered (UniRef90) UniRef data
-                    and the database is large (~5.6Gb), the JABAWS VA installation download is split into two
-                    parts: the JABAWS server itself and an optional additional download that provides a virtual
-                    disk containing the UniRef database for Jpred (<span style="color:#993333;font-style:bold;">Jpred
-                    has been trained, optimized and tested with this UniRef database release. So, we strongly recommend
-                    users not to use other UniRef installations!</span>). By default the VA has an additional
-                    empty virtual disk inside of the VA and JpredWS is not available. To enable JpredWS, download
-                    and unpack both
-                    <a href='/download/get?id=JABAWS210.pack.tar.gz'>the VA</a> and
-                    <a href='/download/get?id=JABAWS.2.1.0.uniref.real.vmdk.gz'>the disk file</a>,
-                    and replace the empty disk in the VA download (called JABAWS.2.1.0.uniref.vmdk) with the disk from the
-                    second download (JABAWS.2.1.0.uniref.real.vmdk). Here is a list of commands for Linux users:
-                    <pre><code class="bash">tar xzvf JABAWS210.pack.tar.gz
-gunzip JABAWS.2.1.0.uniref.real.vmdk.gz
-mv JABAWS.2.1.0.uniref.real.vmdk JABAWS210.pack/JABAWS.2.1.0.uniref.vmdk</code></pre>
-                    After that, launch the virtual machine and the JpredWS service should be operational.
-                <p>
+                <p class="text-right">
+                    <a href="#">Back to top <i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                </p>
             </div>
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row" id="war">
     <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel panel-heading">
@@ -70,38 +120,30 @@ mv JABAWS.2.1.0.uniref.real.vmdk JABAWS210.pack/JABAWS.2.1.0.uniref.vmdk</code><
                     The JABAWS Server Web Application aRchive (WAR) version is a better way to run JABAWS if you want to deploy
                     JABAWS for many users, e.g. your laboratory, or if you are an experienced user and want to have more control
                     on JABAWS. You can also use this version for Mac and Linux computers if you do not want to use virtualization.
-                    Finally, you can use this version on a computer cluster. <br/>
+                    Finally, you can use this version on a computer cluster.
                     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. The WAR file can be deployed on any web
                     application server supporting the Java servlet specification (version 2.4 or above), i.e.
                     <a href="http://tomcat.apache.org/download-70.cgi">Tomcat 7.0</a>.
                 </p>
                 <ul>
-                    <li>JABAWS WAR (includes source and precompiled Linux x86 and Windows binaries):
-                        <a href="/download/get?id=jabaws.war">download</a> (88M) </li>
-                    <li>Tar/gzipped UniRef90 database (for JpredWS):
-                        <a href="/download/get?id=UNIREFdb.tar.gz">UNIREFdb.tar.gz</a> (2.3Gb)</li>
+                    <li>
+                        <a href="${pageContext.request.contextPath}/archive/jabaws.war">
+                            <i class="fa fa-download" aria-hidden="true"></i> JABAWS WAR</a>
+                        (includes source and precompiled Linux x86 and Windows binaries)</li>
                 </ul>
-                <p class="justify">Installation notes:</p>
-                <ol>
-                    <li>After a default installation on Linux, all JABAWS web services should run OK, except JpredWS.
-                        This service requires installation of the UNIREF90 database on your computer.
-                        <ul>
-                            <li>Download the database (<a href="/download/get?id=UNIREFdb.tar.gz">UNIREFdb.tar.gz</a>)</li>
-                            <li>Unpack the database and install it either in the default JABA data location (/data),
-                                or in some other location (configured by the 'jpred.data.uniref.path' path entry in conf/Executable.properties).</li>
-                        </ul>
-                    </li>
-                    <li>If you deploy JABAWS WAR on Windows, not all web services will be functional, and you will need
-                        a properly configured compilation environment to build the JABA binaries from source. We recommend Windows
-                        users download and use the JABAWS VA instead.</li>
-                </ol>
-
+                <p class="justify">
+                    Please check the JABAWS <a href="${pageContext.request.contextPath}/man_serverwar.jsp">document pages</a>
+                    for further instructions.
+                </p>
+                <p class="text-right">
+                    <a href="#">Back to top <i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                </p>
             </div>
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row" id="client">
     <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel panel-heading">
@@ -121,26 +163,33 @@ mv JABAWS.2.1.0.uniref.real.vmdk JABAWS210.pack/JABAWS.2.1.0.uniref.vmdk</code><
                     </em>
                 </p>
                 <ul>
-                    <li>Command line client
+                    <li>Command line interface (CLI) client:
                         <ul>
-                            <li>jar file with binaries (with log4j):
-                                <a href='/download/get?id=min-jabaws-client-2.1.0.jar'>download</a> (538 K)</li>
-                            <li>jar file with binaries (without log4j):
-                                <a href='/download/get?id=min-jabaws-client-nolog-2.1.0.jar'>download</a> (151 K)</li>
-                            <li>source:
-                                <a href='/download/get?id=jabaws-client-src-2.1.0.jar'>download</a> (152 K)</li>
+                            <li>
+                                <a href='${pageContext.request.contextPath}/archive/min-jabaws-client-2.2.0.jar'>
+                                    <i class="fa fa-download" aria-hidden="true"></i> jar file with binaries</a> (with log4j)</li>
+                            <li>
+                                <a href='${pageContext.request.contextPath}/archive/min-jabaws-client-nolog-2.2.0.jar'>
+                                    <i class="fa fa-download" aria-hidden="true"></i> jar file with binaries</a> (without log4j)</li>
+                            <li>
+                                <a href='${pageContext.request.contextPath}/archive/jabaws-client-src-2.2.0.jar'>
+                                    <i class="fa fa-download" aria-hidden="true"></i> client source</a></li>
                         </ul>
                     </li>
                 </ul>
                 <p class="justify">
                     The command line client displays help when executed without arguments,
-                    more details is available from the jabaws client's manual pages.
+                    more details is available from the JABAWS
+                    <a href="${pageContext.request.contextPath}/man_serverwar.jsp">document pages</a>.
+                </p>
+                <p class="text-right">
+                    <a href="#">Back to top <i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                 </p>
             </div>
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row" id="source">
     <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel panel-heading">
@@ -150,21 +199,25 @@ mv JABAWS.2.1.0.uniref.real.vmdk JABAWS210.pack/JABAWS.2.1.0.uniref.vmdk</code><
                 <p class="justify">
                     We welcome developers who wish to develop and implement new web services for JABAWS.
                     JABAWS is released under the Apache License, and its source can be downloaded below.
-                    The latest versions of JABAWS' source can also be obtained from its Git repository
-                    <br/>
+                    The latest versions of JABAWS' source can also be obtained from its Git repository.
                     The repository and 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='/download/get?id=jabaws-project-2.1.0.tar.gz'>download</a> (92M)</li>
-                    <li>JABAWS source only package:
-                        <a href='/download/get?id=jabaws-src-2.1.0.jar'>download</a> (372K)</li>
-                    <li>Binaries of programs witin JABAWS only:
-                        <a href='/download/get?id=binaries.zip'>download</a> (60M)</li>
+                    <%--<li><mark>A complete Eclipse project package:</mark>--%>
+                        <%--<a href='${pageContext.request.contextPath}/archive/jabaws-project-2.2.0.tar.gz'>--%>
+                            <%--<i class="fa fa-download" aria-hidden="true"></i> download</a> <mark>(92M)</mark></li>--%>
+                    <li>
+                        <a href='${pageContext.request.contextPath}/archive/jabaws-src-2.2.0.jar'>
+                            <i class="fa fa-download" aria-hidden="true"></i> JABAWS source</a></li>
+                    <li>
+                        <a href='${pageContext.request.contextPath}/archive/binaries.zip'>
+                            <i class="fa fa-download" aria-hidden="true"></i> Binaries of the programs included in JABAWS</a></li>
                     <li>JABAWS Git repository
-                        <a href='http://source.jalview.org/gitweb/?p=jabaws.git;a=summary'>http://source.jalview.org/git/jabaws.git</a></li>
+                        <a href='http://source.jalview.org/gitweb/?p=jabaws.git;a=summary'>http://source.jalview.org/git/jabaws.git</a>
+                        <pre><code class="bash">git clone http://source.jalview.org/git/jabaws.git</code></pre>
+                    </li>
                 </ul>
                 <p class="justify">
                     To request a JABAWS developer account please send us an email to the
@@ -174,19 +227,5 @@ mv JABAWS.2.1.0.uniref.real.vmdk JABAWS210.pack/JABAWS.2.1.0.uniref.vmdk</code><
         </div>
     </div>
 </div>
-<div class="row">
-    <div class="col-md-12">
-        <div class="panel panel-default">
-            <div class="panel panel-heading">
-                <h1 class="panel-title">Current Version</h1>
-            </div>
-            <div class="panel-body">
-                <p class="justify">
-                    The current JABAWS version is 2.2.0 released on XX February 2017.
-                </p>
-            </div>
-        </div>
-    </div>
-</div>
 
 <jsp:include page="template_footer.jsp" />
\ No newline at end of file