diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml
index a44ae38a..b0bd0a98 100644
--- a/apache/defaults/main.yml
+++ b/apache/defaults/main.yml
@@ -52,11 +52,13 @@ apache_basic_auth_modules:
# - { username:'', password:'', state:'present,absent', auth_file:'path_to_file' }
#
-# apache_additional_packages:
+apache_additional_packages: False
+apache_additional_packages_list:
# - libapache2-mod-uwsgi
# - ...
#
# Set this variable to load the modules you need
-#apache_additional_modules:
+apache_additional_modules: False
+apache_additional_modules_list:
# -
# -
diff --git a/apache/tasks/apache-modules.yml b/apache/tasks/apache-modules.yml
index daad0550..88e1b395 100644
--- a/apache/tasks/apache-modules.yml
+++ b/apache/tasks/apache-modules.yml
@@ -17,7 +17,7 @@
- name: Load additional apache modules if any
apache2_module: name={{ item }} state=present
- with_items: apache_additional_modules
- when: apache_additional_modules is defined
+ with_items: apache_additional_modules_list
+ when: apache_additional_modules
notify: apache2 reload
tags: [ 'apache', 'apache_mods' ]
diff --git a/apache/tasks/apache.yml b/apache/tasks/apache.yml
index d8beb3cb..daa22a5c 100644
--- a/apache/tasks/apache.yml
+++ b/apache/tasks/apache.yml
@@ -1,13 +1,13 @@
---
- name: Install the apache packages
- apt: pkg={{ item }} state=installed force=yes
+ apt: pkg={{ item }} state=installed
with_items: '{{ apache_packages }}'
tags: [ 'apache', 'apache_main_packages' ]
- name: Install the apache additional packages, if any
- apt: pkg={{ item }} state=installed force=yes
- with_items: '{{ apache_additional_packages }}'
- when: apache_additional_packages is defined
+ apt: pkg={{ item }} state=installed
+ with_items: '{{ apache_additional_packages_list }}'
+ when: apache_additional_packages
tags: [ 'apache', 'apache_additional_packages' ]
- name: Load the required worker module
diff --git a/dnet_user_services_perms/tasks/dnet-other-services-users.yml b/dnet_user_services_perms/tasks/dnet-other-services-users.yml
index ca513f9d..e5e299c3 100644
--- a/dnet_user_services_perms/tasks/dnet-other-services-users.yml
+++ b/dnet_user_services_perms/tasks/dnet-other-services-users.yml
@@ -1,6 +1,8 @@
---
+# Ignore errors because it fails if the user is already present and used to run a service.
- name: Create users needed to operate services other than the dnet ones
user: name={{ item.user }} comment="{{ item.user }}" home={{ item.home }} createhome={{ item.createhome }} shell={{ item.shell }}
with_items: dnet_other_services_users
when: dnet_other_services_users is defined
+ ignore_errors: True
tags: [ 'users', 'dnet' ]
diff --git a/joomla-org/defaults/main.yml b/joomla-org/defaults/main.yml
new file mode 100644
index 00000000..aaf98f28
--- /dev/null
+++ b/joomla-org/defaults/main.yml
@@ -0,0 +1,20 @@
+---
+joomla_dist_name: Joomla
+joomla_dist_version: 3.4.8
+joomla_dist_file: '{{ joomla_dist_name }}_{{ joomla_dist_version }}-Stable-Full_Package.zip'
+joomla_tar_url: 'https://github.com/joomla/joomla-cms/releases/download/{{ joomla_dist_version }}/{{ joomla_dist_file }}'
+joomla_download_dir: /srv/joomla
+joomla_install_dir: /var/www
+
+joomla_php_prereq:
+ - php5-json
+ - php5-intl
+ - php5-cli
+ - php5-pgsql
+ - php5-gd
+ - php5-memcached
+ - php-pear
+ - php-date
+ - php-xml-serializer
+ - imagemagick
+
diff --git a/joomla-org/tasks/main.yml b/joomla-org/tasks/main.yml
new file mode 100644
index 00000000..03cecb4d
--- /dev/null
+++ b/joomla-org/tasks/main.yml
@@ -0,0 +1,43 @@
+---
+- name: Install the joomla php prerequisites
+ apt: name={{ item }} state=present
+ with_items: joomla_php_prereq
+ tags: joomla
+
+- name: Ensure that the download and install dirs exist
+ file: path={{ item }} state=directory
+ with_items:
+ - '{{ joomla_download_dir }}/joomla-unpacked'
+ - '{{ joomla_install_dir }}'
+ tags: joomla
+
+- name: Download the joomla distribution file
+ get_url: url={{ joomla_tar_url }} dest={{ joomla_download_dir }}
+ register: joomla_download
+ tags: joomla
+
+- name: Unpack the joomla distribution file
+ unarchive: copy=no src={{ joomla_download_dir }}/{{ joomla_dist_file }} dest={{ joomla_download_dir }}/joomla-unpacked
+ when: ( joomla_download | changed )
+ tags: joomla
+
+- name: Move the joomla files to the right place
+ shell: cp -a {{ joomla_download_dir }}/joomla-unpacked/* {{ joomla_install_dir }}/
+ args:
+ creates: '{{ joomla_install_dir }}/index.php'
+ with_items: phpfpm_pools
+ when: ( joomla_download | changed )
+ register: unpack_joomla
+ tags: joomla
+
+- name: Set the correct ownership of the joomla files
+ file: dest={{ joomla_install_dir }} owner={{ item.user }} group={{ item.group }} recurse=yes state=directory
+ with_items: phpfpm_pools
+ when: ( unpack_joomla | changed )
+ tags: joomla
+
+- name: Remove the original joomla unpacked distribution
+ command: rm -fr {{ joomla_download_dir }}/{{ joomla_dist_name }}
+ when: ( unpack_joomla | changed )
+ tags: joomla
+
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/README.txt b/solr-tomcat-instance/files/contrib/analysis-extras/README.txt
new file mode 100644
index 00000000..e77b8d18
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/analysis-extras/README.txt
@@ -0,0 +1,16 @@
+The analysis-extras plugin provides additional analyzers that rely
+upon large dependencies/dictionaries.
+
+It includes integration with ICU for multilingual support, and
+analyzers for Chinese and Polish.
+
+ICU relies upon lucene-libs/lucene-analyzers-icu-X.Y.jar
+and lib/icu4j-X.Y.jar
+
+Smartcn relies upon lucene-libs/lucene-analyzers-smartcn-X.Y.jar
+
+Stempel relies on lucene-libs/lucene-analyzers-stempel-X.Y.jar
+
+Morfologik relies on lucene-libs/lucene-analyzers-morfologik-X.Y.jar
+and lib/morfologik-*.jar
+
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar
new file mode 100644
index 00000000..2c3ff8bb
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lib/icu4j-53.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar
new file mode 100644
index 00000000..7ad2e2f3
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-fsa-1.7.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar
new file mode 100644
index 00000000..0dd5f0ab
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar
new file mode 100644
index 00000000..f058bfd9
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar
new file mode 100644
index 00000000..a7b5af1b
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.10.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar
new file mode 100644
index 00000000..c241c0b4
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.10.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar
new file mode 100644
index 00000000..76fc9d2a
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-4.10.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar
new file mode 100644
index 00000000..a69a8180
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-4.10.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/README.txt b/solr-tomcat-instance/files/contrib/clustering/README.txt
new file mode 100644
index 00000000..d3fa6574
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/clustering/README.txt
@@ -0,0 +1,4 @@
+The Clustering contrib plugin for Solr provides a generic mechanism for plugging in third party clustering implementations.
+It currently provides clustering support for search results using the Carrot2 project.
+
+See http://wiki.apache.org/solr/ClusteringComponent for how to get started.
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar b/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar
new file mode 100644
index 00000000..4343d7d8
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/attributes-binder-1.2.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar b/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar
new file mode 100644
index 00000000..9700effe
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/carrot2-mini-3.9.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar b/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar
new file mode 100644
index 00000000..753a7b59
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/hppc-0.5.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar b/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar
new file mode 100644
index 00000000..bb4fe1da
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/jackson-core-asl-1.9.13.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar b/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar
new file mode 100644
index 00000000..0f2073fc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/jackson-mapper-asl-1.9.13.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar b/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar
new file mode 100644
index 00000000..21934271
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/mahout-collections-1.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar b/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar
new file mode 100644
index 00000000..0d5f237e
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/mahout-math-0.6.jar differ
diff --git a/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar b/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar
new file mode 100644
index 00000000..bda968cf
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/clustering/lib/simple-xml-2.7.jar differ
diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar
new file mode 100644
index 00000000..1b703ab2
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/activation-1.1.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar
new file mode 100644
index 00000000..6f193247
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/gimap-1.5.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar
new file mode 100644
index 00000000..0c5ac396
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/dataimporthandler-extras/lib/javax.mail-1.5.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt b/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt
new file mode 100644
index 00000000..cc0bf17b
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/dataimporthandler/README.txt
@@ -0,0 +1,16 @@
+ Apache Solr - DataImportHandler
+
+Introduction
+------------
+DataImportHandler is a data import tool for Solr which makes importing data from Databases, XML files and
+HTTP data sources quick and easy.
+
+Important Note
+--------------
+Although Solr strives to be agnostic of the Locale where the server is
+running, some code paths in DataImportHandler are known to depend on the
+System default Locale, Timezone, or Charset. It is recommended that when
+running Solr you set the following system properties:
+ -Duser.language=xx -Duser.country=YY -Duser.timezone=ZZZ
+
+where xx, YY, and ZZZ are consistent with any database server's configuration.
diff --git a/solr-tomcat-instance/files/contrib/extraction/README.txt b/solr-tomcat-instance/files/contrib/extraction/README.txt
new file mode 100644
index 00000000..6deb090f
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/extraction/README.txt
@@ -0,0 +1,16 @@
+Apache Solr Content Extraction Library (Solr Cell)
+
+Introduction
+------------
+
+Apache Solr Extraction provides a means for extracting and indexing content contained in "rich" documents, such
+as Microsoft Word, Adobe PDF, etc. (Each name is a trademark of their respective owners) This contrib module
+uses Apache Tika to extract content and metadata from the files, which can then be indexed. For more information,
+see http://wiki.apache.org/solr/ExtractingRequestHandler
+
+Getting Started
+---------------
+You will need Solr up and running. Then, simply add the extraction JAR file, plus the Tika dependencies (in the ./lib folder)
+to your Solr Home lib directory. See http://wiki.apache.org/solr/ExtractingRequestHandler for more details on hooking it in
+ and configuring.
+
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar b/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar
new file mode 100644
index 00000000..b5c225b5
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar b/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar
new file mode 100644
index 00000000..0cdd3ce3
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar b/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar
new file mode 100644
index 00000000..14fe1038
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/aspectjrt-1.6.11.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar b/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar
new file mode 100644
index 00000000..f66e9a8b
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/bcmail-jdk15-1.45.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar b/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar
new file mode 100644
index 00000000..409070b0
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/bcprov-jdk15-1.45.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar b/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar
new file mode 100644
index 00000000..b64b033a
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/boilerpipe-1.1.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar b/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar
new file mode 100644
index 00000000..a429d7e2
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/commons-compress-1.7.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar
new file mode 100644
index 00000000..c8c4dbb9
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/dom4j-1.6.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar b/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar
new file mode 100644
index 00000000..e5da5d6a
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/fontbox-1.8.4.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar
new file mode 100644
index 00000000..2c3ff8bb
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/icu4j-53.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar
new file mode 100644
index 00000000..563927fc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/isoparser-1.0-RC-1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar b/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar
new file mode 100644
index 00000000..288e64cb
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/jdom-1.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar b/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar
new file mode 100644
index 00000000..cc7937e4
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/jempbox-1.8.4.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar b/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar
new file mode 100644
index 00000000..be93433c
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/jhighlight-1.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar b/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar
new file mode 100644
index 00000000..ef4d7af5
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/juniversalchardet-1.0.3.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar b/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar
new file mode 100644
index 00000000..bd24cc1d
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/metadata-extractor-2.6.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar b/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar
new file mode 100644
index 00000000..74f0ce36
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/pdfbox-1.8.4.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar
new file mode 100644
index 00000000..dd1ab4a7
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/poi-3.10.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar
new file mode 100644
index 00000000..fab0eea1
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-3.10.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar
new file mode 100644
index 00000000..f8602b51
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/poi-ooxml-schemas-3.10.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar
new file mode 100644
index 00000000..61ec79fc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/poi-scratchpad-3.10.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar b/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar
new file mode 100644
index 00000000..ba482aec
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/rome-0.9.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar
new file mode 100644
index 00000000..27516019
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/tagsoup-1.2.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar b/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar
new file mode 100644
index 00000000..d8e45e3f
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/tika-core-1.5.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar b/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar
new file mode 100644
index 00000000..348016bf
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/tika-parsers-1.5.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar b/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar
new file mode 100644
index 00000000..7b29805a
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/tika-xmp-1.5.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar
new file mode 100644
index 00000000..c10ed974
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-core-0.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar
new file mode 100644
index 00000000..eb46618a
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/vorbis-java-tika-0.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar b/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar
new file mode 100644
index 00000000..547f5630
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/xercesImpl-2.9.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar b/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar
new file mode 100644
index 00000000..d1b66271
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/xmlbeans-2.6.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar b/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar
new file mode 100644
index 00000000..ecd5db14
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/xmpcore-5.1.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar b/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar
new file mode 100644
index 00000000..954db750
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/extraction/lib/xz-1.4.jar differ
diff --git a/solr-tomcat-instance/files/contrib/langid/README.txt b/solr-tomcat-instance/files/contrib/langid/README.txt
new file mode 100644
index 00000000..ae879c64
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/langid/README.txt
@@ -0,0 +1,21 @@
+Apache Solr Language Identifier
+
+
+Introduction
+------------
+This module is intended to be used while indexing documents.
+It is implemented as an UpdateProcessor to be placed in an UpdateChain.
+Its purpose is to identify language from documents and tag the document with language code.
+The module can optionally map field names to their language specific counterpart,
+e.g. if the input is "title" and language is detected as "en", map to "title_en".
+Language may be detected globally for the document, and/or individually per field.
+Language detector implementations are pluggable.
+
+Getting Started
+---------------
+Please refer to the module documentation at http://wiki.apache.org/solr/LanguageDetection
+
+Dependencies
+------------
+The Tika detector depends on Tika Core (which is part of extraction contrib)
+The Langdetect detector depends on LangDetect library
diff --git a/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar b/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar
new file mode 100644
index 00000000..11fcfd4b
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/langid/lib/jsonic-1.2.7.jar differ
diff --git a/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar b/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar
new file mode 100644
index 00000000..2e7a9cf3
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/langid/lib/langdetect-1.1-20120112.jar differ
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/README.txt b/solr-tomcat-instance/files/contrib/map-reduce/README.txt
new file mode 100644
index 00000000..6f68dfe8
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/map-reduce/README.txt
@@ -0,0 +1,20 @@
+Apache Solr MapReduce
+
+*Experimental* - This contrib is currently subject to change in ways that may
+break back compatibility.
+
+The Solr MapReduce contrib provides an a mapreduce job that allows you to build
+Solr indexes and optionally merge them into a live Solr cluster.
+
+Example:
+
+# Build an index with map-reduce and deploy it to SolrCloud
+
+source $solr_distrib/example/scripts/map-reduce/set-map-reduce-classpath.sh
+
+$hadoop_distrib/bin/hadoop --config $hadoop_conf_dir jar \
+$solr_distrib/dist/solr-map-reduce-*.jar -D 'mapred.child.java.opts=-Xmx500m' \
+-libjars "$HADOOP_LIBJAR" --morphline-file readAvroContainer.conf \
+--zk-host 127.0.0.1:9983 --output-dir hdfs://127.0.0.1:8020/outdir \
+--collection $collection --log4j log4j.properties --go-live \
+--verbose "hdfs://127.0.0.1:8020/indir"
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar b/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar
new file mode 100644
index 00000000..b115f0a8
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/map-reduce/lib/Saxon-HE-9.5.1-4.jar differ
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar b/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar
new file mode 100644
index 00000000..73fc574e
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/map-reduce/lib/argparse4j-0.4.3.jar differ
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar b/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar
new file mode 100644
index 00000000..bb2c5413
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/map-reduce/lib/hadoop-mapreduce-client-core-2.2.0.jar differ
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar b/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar
new file mode 100644
index 00000000..15af3d16
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/map-reduce/lib/kite-morphlines-saxon-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt b/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt
new file mode 100644
index 00000000..af6fd585
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/map-reduce/src/test-files/README.txt
@@ -0,0 +1 @@
+The test-files by this module are located in the morphlines-core module.
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt b/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt
new file mode 100644
index 00000000..0ca74aad
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/morphlines-cell/README.txt
@@ -0,0 +1,6 @@
+Apache Solr Morphlines-Cell
+
+*Experimental* - This contrib is currently subject to change in ways that may
+break back compatibility.
+
+This contrib provides a variety of Kite Morphlines features for Solr Cell type functionality.
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar
new file mode 100644
index 00000000..2ddb4778
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-json-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar
new file mode 100644
index 00000000..57f47475
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-core-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar
new file mode 100644
index 00000000..6c821390
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-tika-decompress-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar
new file mode 100644
index 00000000..9b89de57
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-cell/lib/kite-morphlines-twitter-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt b/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt
new file mode 100644
index 00000000..af6fd585
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/morphlines-cell/src/test-files/README.txt
@@ -0,0 +1 @@
+The test-files by this module are located in the morphlines-core module.
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/README.txt b/solr-tomcat-instance/files/contrib/morphlines-core/README.txt
new file mode 100644
index 00000000..2e7adeea
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/morphlines-core/README.txt
@@ -0,0 +1,6 @@
+Apache Solr Morphlines-Core
+
+*Experimental* - This contrib is currently subject to change in ways that may
+break back compatibility.
+
+This contrib provides a variety of Kite Morphlines features for Solr.
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar b/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar
new file mode 100644
index 00000000..0f5ad1b2
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-core/lib/config-1.0.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar
new file mode 100644
index 00000000..01efbece
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-avro-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar b/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar
new file mode 100644
index 00000000..0f7a74fc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-core/lib/kite-morphlines-core-0.12.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar b/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar
new file mode 100644
index 00000000..9b50dad6
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-core-3.0.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar b/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar
new file mode 100644
index 00000000..99baf706
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/README.txt b/solr-tomcat-instance/files/contrib/uima/README.txt
new file mode 100644
index 00000000..3c636286
--- /dev/null
+++ b/solr-tomcat-instance/files/contrib/uima/README.txt
@@ -0,0 +1,109 @@
+Apache Solr UIMA Metadata Extraction Library
+
+Introduction
+------------
+This module is intended to be used both as an UpdateRequestProcessor while indexing documents and as a set of tokenizer/filters
+to be configured inside the schema.xml for use during analysis phase.
+UIMAUpdateRequestProcessor purpose is to provide additional on the fly automatically generated fields to the Solr index.
+Such fields could be language, concepts, keywords, sentences, named entities, etc.
+UIMA based tokenizers/filters can be used either inside plain Lucene or as index/query analyzers to be defined
+inside the schema.xml of a Solr core to create/filter tokens using specific UIMA annotations.
+
+
+Getting Started
+---------------
+To start using Solr UIMA Metadata Extraction Library you should go through the following configuration steps:
+
+1. copy generated solr-uima jar and its libs (under contrib/uima/lib) inside a Solr libraries directory.
+ or set tags in solrconfig.xml appropriately to point those jar files.
+
+
+
+
+
+2. modify your schema.xml adding the fields you want to be hold metadata specifying proper values for type, indexed, stored and multiValued options:
+
+ for example you could specify the following
+
+
+
+
+
+3. modify your solrconfig.xml adding the following snippet:
+
+
+
+
+
+ VALID_ALCHEMYAPI_KEY
+ VALID_ALCHEMYAPI_KEY
+ VALID_ALCHEMYAPI_KEY
+ VALID_ALCHEMYAPI_KEY
+ VALID_ALCHEMYAPI_KEY
+ VALID_OPENCALAIS_KEY
+
+ /org/apache/uima/desc/OverridingParamsExtServicesAE.xml
+
+ true
+
+
+ false
+
+ text
+
+
+
+
+ org.apache.uima.alchemy.ts.concept.ConceptFS
+
+ text
+ concept
+
+
+
+ org.apache.uima.alchemy.ts.language.LanguageFS
+
+ language
+ language
+
+
+
+ org.apache.uima.SentenceAnnotation
+
+ coveredText
+ sentence
+
+
+
+
+
+
+
+
+
+ where VALID_ALCHEMYAPI_KEY is your AlchemyAPI Access Key. You need to register AlchemyAPI Access
+ key to exploit the AlchemyAPI services: http://www.alchemyapi.com/api/register.html
+
+ where VALID_OPENCALAIS_KEY is your Calais Service Key. You need to register Calais Service
+ key to exploit the Calais services: http://www.opencalais.com/apikey
+
+ the analysisEngine must contain an AE descriptor inside the specified path in the classpath
+
+ the analyzeFields must contain the input fields that need to be analyzed by UIMA,
+ if merge=true then their content will be merged and analyzed only once
+
+ field mapping describes which features of which types should go in a field
+
+4. in your solrconfig.xml replace the existing default (
+
+ uima
+
+
+
+Once you're done with the configuration you can index documents which will be automatically enriched with the specified fields
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar
new file mode 100644
index 00000000..d329eb1c
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar
new file mode 100644
index 00000000..cb2fcfdc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar
new file mode 100644
index 00000000..dffd510b
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/Tagger-2.3.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar
new file mode 100644
index 00000000..10866014
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar
new file mode 100644
index 00000000..a07cfa8e
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/commons-digester-2.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar b/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar
new file mode 100644
index 00000000..e876a974
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lib/uimaj-core-2.3.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar b/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar
new file mode 100644
index 00000000..6f876607
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/uima/lucene-libs/lucene-analyzers-uima-4.10.2.jar differ
diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar b/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar
new file mode 100644
index 00000000..218510bc
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/velocity/lib/commons-beanutils-1.8.3.jar differ
diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar b/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar
new file mode 100644
index 00000000..c35fa1fe
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/velocity/lib/commons-collections-3.2.1.jar differ
diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar b/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar
new file mode 100644
index 00000000..ae936d3d
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/velocity/lib/velocity-1.7.jar differ
diff --git a/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar b/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar
new file mode 100644
index 00000000..beb7434d
Binary files /dev/null and b/solr-tomcat-instance/files/contrib/velocity/lib/velocity-tools-2.0.jar differ