From c395f78d1c4f97d14ab74abd7639085da0946b8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A1bio=20Madeira?= Date: Wed, 12 Apr 2017 17:27:33 +0100 Subject: [PATCH] JWS-116 New build with previous changes to the source files in the docs --- website/docs/_sources/changelog.rst.txt | 2 +- website/docs/_sources/getting_started.rst.txt | 2 -- website/docs/_sources/va.rst.txt | 13 ++++++------- website/docs/changelog.html | 6 +++--- website/docs/getting_started.html | 4 ---- website/docs/index.html | 2 +- website/docs/jabaws_manual.pdf | Bin 335556 -> 335464 bytes website/docs/objects.inv | Bin 1758 -> 1755 bytes website/docs/searchindex.js | 2 +- website/docs/va.html | 15 ++++++--------- 10 files changed, 18 insertions(+), 28 deletions(-) diff --git a/website/docs/_sources/changelog.rst.txt b/website/docs/_sources/changelog.rst.txt index 37135b7..d4016fc 100644 --- a/website/docs/_sources/changelog.rst.txt +++ b/website/docs/_sources/changelog.rst.txt @@ -4,7 +4,7 @@ Changelog .. _v2.2: -Version 2.2 (Released XX April 2017) +Version 2.2 (Released 12 April 2017) ------------------------------------ The website and documentation were improved: diff --git a/website/docs/_sources/getting_started.rst.txt b/website/docs/_sources/getting_started.rst.txt index 08fcfe7..00d1dd2 100644 --- a/website/docs/_sources/getting_started.rst.txt +++ b/website/docs/_sources/getting_started.rst.txt @@ -115,8 +115,6 @@ You can test that your JABAWS server is working in several ways. Virtual Appliance (VA) ~~~~~~~~~~~~~~~~~~~~~~ -.. warning:: The Virtual Appliance (VA) for JABAWS v2.2 will be provided soon. - The Virtual Appliance (VA) package allows you to run a JABAWS server installed on `TurnKey Linux`_ as a virtual machine on your laptop or desktop computer. A complete guide to the JABAWS VA is given in the `VA documentation pages`_, but for the impatient, brief instructions are given below: If you work on Windows, Linux or Unix: diff --git a/website/docs/_sources/va.rst.txt b/website/docs/_sources/va.rst.txt index 6c62253..d9e7de2 100644 --- a/website/docs/_sources/va.rst.txt +++ b/website/docs/_sources/va.rst.txt @@ -1,8 +1,6 @@ Virtual Appliance (VA) ====================== -.. warning:: The Virtual Appliance (VA) for JABAWS v2.2 will be provided soon. - The JABAWS Virtual Appliance is a way to run a JABAWS server locally, without the need to connect to the internet or configure JABAWS. What the appliance provides is a 'virtual server machine' (or more simply - *virtual machine* or *VM*), running an installation of the JABAWS Web Application Archive (WAR) on `TurnKey Linux`_ 12.1 (Standlone Tomcat). Once this has started up, it displays a message indicating the IP address of the JABAWS server, allowing any JABAWS client (such as Jalview or the JABAWS command line client) to connect to it. You can run the appliance with freely available program such as `VMware Player`_, but you will need to install it first. We have tested the JABAWS appliance with VMware Player v 3.1.2 on Windows and Linux, and VMware Fusion on Mac. However, you are not limited to these virtualization systems and can use the JABAWS Appliance with any other virtualization platform. You can use `VMware OVF`_ tool to prepare JABAWS image for a different virtualization platform e.g. `VirtualBox`_. @@ -23,7 +21,7 @@ Installing The free `VMware Player`_ can be used to run the JABAWS services from the Windows and Linux host operating systems. `VMware Fusion`_, a commercial VMware product, offers virtual machine support for Mac. -To run the JABAWS server on VMware player, unpack the JABAWS VM into one of the folders on your local hard drive. Open VMware Player, click "Open Virtual Machine" and point the Player to the location of the JABAWS, then choose the JABAWS.vmx file to open an appliance. +To run the JABAWS server on VMware player, unpack the JABAWS VM into one of the folders on your local hard drive. Open VMware Player, click "Open Virtual Machine" and point the Player to the location of the JABAWS, then choose the ``JABAWS*.vmx`` file to open an appliance. When you play the machine for the first time the Player might ask you whether "This virtual machine may have been moved or copied.", say that you have copied it. That is all. @@ -70,8 +68,8 @@ VM configuration **OS information** -* OS : TurnKey Linux (v. 12.1, Standalone Tomcat) based on Debian 6.0.7 (Squeeze) -* Installation : Oracle Java 6, Tomcat 7, JABAWS v. 2.1 +* OS : TurnKey Linux (v. 14.1, Standalone Tomcat) based on Debian GNU/Linux 8 (Jessie) +* Installation : Oracle Java 7, Tomcat 7, JABAWS v. 2.2 * IPv4 address : dhcp * IPv6 address : auto * DNS name : none @@ -81,8 +79,9 @@ VM configuration **Login credentials** -* Root password: jabaws -* Tomcat admin password: adminjabaws +* Root password: JabawsAdmin1 +* MySQL password: JabawsAdmin1 +* Tomcat admin password: JabawsAdmin2 **Services available at the virtial machine IP (e.g. VM_IP = 172.16.232.149)** diff --git a/website/docs/changelog.html b/website/docs/changelog.html index 7b72a65..277cdad 100644 --- a/website/docs/changelog.html +++ b/website/docs/changelog.html @@ -101,7 +101,7 @@
  • Usage Statistics
  • Citations
  • Changelog