diff --git a/README.md b/README.md index e687ee4f85..435aeaac3f 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ The Apollo client is implemented as a plugin for JBrowse, for more information o ![Build status](https://travis-ci.org/GMOD/Apollo.svg?branch=master) +Apollo 2.0.1 [is now released](https://github.com/GMOD/Apollo/releases/tag/2.0.1). -Apollo 2.0.0 is now released! See [the announcement](http://genomearchitect.org/Apollo2_first_release) +Apollo 2.0.0 is now released! See [the announcement](http://genomearchitect.org/Apollo2_first_release). ## Quick-start guide diff --git a/application.properties b/application.properties index 6eb9364934..4d9096bdd0 100644 --- a/application.properties +++ b/application.properties @@ -3,5 +3,5 @@ app.grails.version=2.4.5 app.name=apollo app.servlet.version=3.0 -app.version=2.0.1-RC8 +app.version=2.0.1 diff --git a/docs/Apollo2Build.md b/docs/Apollo2Build.md index 1c84d162e0..e1809f8904 100644 --- a/docs/Apollo2Build.md +++ b/docs/Apollo2Build.md @@ -57,8 +57,14 @@ Also note: if there are any errors at this step, check the setup.log file for er Also also note: the "development mode" uses an in-memory H2 database for storing data by default. The setup guide will show you how to configure custom database settings. + ## Setting up the application +### Setup a production server + +To setup a production server (as opposed to a development server as above), you must [properly configure a servlet container like Tomcat or Jetty](Setup.md) with [sufficient memory](Troubleshooting.md#tomcat-memory). + +### Adding data to Apollo After we have a server setup, we will want to add a new organism to the panel. If you are a new user, you will want to setup this data with the jbrowse pre-processing scripts. You can see the [data loading guide](Data_loading.md) for more @@ -72,7 +78,6 @@ bin/flatfile-to-json.pl --gff yourannotations.gff --type mRNA \ ``` - ### Login to the web interface After you access your application at http://localhost:8080/apollo/ then you will be prompted for login information diff --git a/docs/Setup.md b/docs/Setup.md index bf2edcf17c..150dd4ba10 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -17,6 +17,9 @@ You will minimally need to have Java 7 or greater, [Grails](https://grails.org/) external database such as PostgreSQL or MySQL is generally used for production, but instructions for the H2 database is also provided. +**Important note**: The default memory for Tomcat and Jetty is insufficient to run Apollo (and most other web apps). +You should [increase the memory according to these instructions](Troubleshooting.md#tomcat-memory). + ### Database configuration Apollo supports several database backends, and you can choose sample configurations from using H2, Postgres, or