Captchav2

.gitmodules

@@ -52,3 +52,9 @@
 [submodule "geotools"]
 	path = geotools
 	url = https://github.com/georchestra/geotools.git
+[submodule "docker/geoserver_datadir"]
+	path = docker/geoserver_datadir
+	url = https://github.com/georchestra/geoserver_minimal_datadir.git
+[submodule "docker/smtp"]
+	path = docker/smtp
+	url = https://github.com/camptocamp/docker_smtp.git

.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 git:
   depth: 1
   submodules: true
-before_install:
-  - wget http://build.georchestra.org/m2.tar
-  - tar xvf m2.tar -C ~ > /dev/null
+cache:
+  directories:
+    - $HOME/.m2
 notifications:
   irc:
     channels:
@@ -20,4 +20,4 @@ addons:
       - ant
       - ant-optional
       - python-virtualenv
-      - python-pip
+      - python-pip

AUTHORS.txt

@@ -0,0 +1,29 @@
+Authors approximately ordered by first contribution
+
+Jesse Eichar <jesse.eichar@camptocamp.com>
+Eric Lemoine <eric.lemoine@camptocamp.com>
+Pierre Mauduit <pierre.mauduit@camptocamp.com>
+François Prunayre <fx.prunayre@titellus.net>
+François Van Der Biest <francois.vanderbiest@camptocamp.com>
+Yoann Buch <yoann.buch@gmail.com>
+Bruno Binet <bruno.binet@camptocamp.com>
+Pierre Giraud <pierre.giraud@camptocamp.com>
+Fabrice Phung <fabrice@phung.fr>
+Philippe Huet <philippe@dotgee.fr>
+Yves Jacolin <yves.jacolin@camptocamp.com>
+Lydie Vinsonneau <lydie.vinsonneau@bretagne.bzh>
+Florent Gravin <florent.gravin@camptocamp.com>
+Sylvain Lesage <severo@rednegra.net>
+Davis Mendoza <davis.men.pa@gmail.com>
+Mauricio Pazos <mauricio.pazos@gmail.com>
+Sébastien Pelhate <sebastien.pelhate@bretagne.bzh>
+Stéphane Brunner <stephane.brunner@camptocamp.com>
+Landry Breuil <breuil@craig.fr>
+Jeremy Kalsron <jeremy.kalsron@gmail.com>
+Julien Sabatier <julien.sabatier@agglo-lepuyenvelay.fr>
+Jean-Pascal Klipfel <jean-pascal.klipfel@region-alsace.eu>
+Louca Lerch <Louca.Lerch@unige.ch>
+Ernest Chiarello <ernest.chiarello@univ-fcomte.fr>
+Julien Acroute <julien.acroute@camptocamp.com>
+Vincent Dorut <vincent.dorut@camptocamp.com>
+Jean-Denis Giguère <jdenisgiguere@gmail.com>

README.md

@@ -1,46 +1,47 @@
 # geOrchestra
-[![Build Status](https://travis-ci.org/georchestra/georchestra.svg?branch=master)](https://travis-ci.org/georchestra/georchestra)
+[![Build Status](https://travis-ci.org/georchestra/georchestra.svg?branch=15.12)](https://travis-ci.org/georchestra/georchestra)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/a879ac64588d4357ab72e79cd8026f99)](https://www.codacy.com/app/francois-vanderbiest/georchestra)
 
 geOrchestra is a complete **Spatial Data Infrastructure** solution.
 
-It features a **metadata catalog** (GeoNetwork 2.10), an **OGC server** (GeoServer 2.5.4 and GeoWebCache 1.5.4) with fine-grained access control (based on GeoFence), an **advanced viewer and editor**, an **extractor** and **many more** (security and auth system based on proxy/CAS/LDAP, analytics, admin UIs, ...)
+It features a **metadata catalog** (GeoNetwork 3.0.4), an **OGC server** (GeoServer 2.8.3 and GeoWebCache 1.8.1) with fine-grained access control (based on GeoFence), an **advanced viewer and editor**, an **extractor** and **many more** (security and auth system based on proxy/CAS/LDAP, analytics, admin UIs, ...)
 
-## Releases
 
-A new release is published every 6 months and is supported during 12 months. Stable versions are named by their release date, eg 14.06 was published in June 2014.  
+## Releases
 
-Before downloading, you might be interested in the [release notes](RELEASE_NOTES.md) and the [kanban board](https://huboard.com/georchestra/georchestra) we're using to manage issues.
+A new release is published every 6 months and is supported during 12 months. 
+Stable versions are named by their release date, eg 15.12 (latest stable) was published in december 2015.  
 
-## Download
+Have a look at the [release notes](RELEASE_NOTES.md) for more information.
 
-To download the latest stable version (currently 15.06), use the following command line:
-```
-git clone --recursive https://github.com/georchestra/georchestra.git ~/georchestra
-```
 
 ## Install
 
-To install geOrchestra, you will have to:
- * [create your own configuration repository](doc/config.md), based on the [template](https://github.com/georchestra/template) we provide,
- * [build the web applications](doc/build.md) with your config,
- * [setup the middleware](doc/setup.md) (apache, tomcat, postgresql, openldap),
- * [deploy the webapps](doc/deploy.md), [check](doc/check.md) they're working as expected and finally [configure](doc/post-deploy_config.md) them.
+Depending on your goals and skills, there are several ways to install geOrchestra:
+
+ * a [docker composition](./docker-compose.yml), which pulls pre-built images from [docker hub](https://hub.docker.com/u/georchestra/), is perfect for demo purposes. Provided you have a good download speed and recent machine (8Gb required), you'll be up and running on `localhost:8080` within 10 minutes after `docker-compose up`.
+ * a contributed [ansible playbook](https://github.com/georchestra/ansible) allows you to spin an instance in a few minutes. This is probably the easiest way to create a small production server, since it takes care of installing the middleware, fetching the webapps and configuring them.
+ * generic [debian (or yum) packages](https://build.georchestra.org/) are perfect to create complex architectures, but you'll have to [install and configure the middleware](doc/setup.md) first.
+ * you could also use the [generic wars](http://build.georchestra.org/wars/) with their "[datadir](https://github.com/georchestra/datadir)", as an alternate method. The above packages provide both.
+ * finally, [building from the sources](doc/build.md) is the most flexible solution, since it allows you to customize the webapps very deeply. You get custom WAR files, packages or docker images that you can [deploy](doc/deploy.md) to dev, test, or production servers. 
 
-There are also several [optimizations](doc/optimizations.md), [good practices](doc/good_practices.md) and [tutorials](doc/tutorials.md) that are worth reading.
 
-The minimum system requirement is 2 cores and 4Gb RAM, but we recommend at least 4 cores and 8 Gb RAM for a production instance.
+If you opt for the middleware setup by yourself, there are several [optimizations](doc/optimizations.md), [good practices](doc/good_practices.md) and [tutorials](doc/tutorials.md) that are worth reading. 
+Note that the minimum system requirement is 2 cores and 4Gb RAM, but we recommend at least 4 cores and 8 Gb RAM for a production instance.
 More RAM is of course better !
 
+
 ## Community
 
 If you need more information, please ask on the [geOrchestra mailing list](https://groups.google.com/forum/#!forum/georchestra). 
 
 For help setting up your instance, or for dev-related questions, use the [#georchestra](https://kiwiirc.com/client/irc.freenode.net/georchestra) IRC channel or the [dev/tech list](https://groups.google.com/forum/#!forum/georchestra-dev).
 
+
 ## More
 
 Additional information can be found in the [georchestra.org](http://www.georchestra.org/) website and in the following links:
- * [catalog](https://github.com/georchestra/geonetwork/blob/georchestra-15.06/README.md): standard GeoNetwork with a light customization, 
+ * [catalog](https://github.com/georchestra/geonetwork/blob/georchestra-gn3-15.12/README.md): standard GeoNetwork with a light customization, 
  * [viewer](mapfishapp/README.md) (aka mapfishapp): a robust, OGC-compliant webgis with editing capabilities,
  * [extractor](extractorapp/README.md) (aka extractorapp): able to create zips from data served through OGC web services and send an email when your extraction is done, 
  * [geoserver](http://geoserver.org/): the reference implementation for many OGC web services,