[nx-pub] nuxeo: NXP-19634: rename CoreServer to Server (branch@feature-NXP-19634-tomcat-coreserver)

Florent Guillaume

2016-05-24 15:14:55 UTC

Message:
NXP-19634: rename CoreServer to Server

Repository: nuxeo
Branch: feature-NXP-19634-tomcat-coreserver
Author: Florent Guillaume <***@nuxeo.com>
Pusher: efge <***@nuxeo.com>
Date: 2016-05-24T15:02:19+02:00
URL: https://github.com/nuxeo/nuxeo/commit/2195cde2ee13a773b4f1b3042a130256e525e519
JIRA: https://jira.nuxeo.com/browse/NXP-19634

Files:
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties
A nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
A nuxeo-distribution/nuxeo-distribution-server/.project.ok
A nuxeo-distribution/nuxeo-distribution-server/pom.xml
A nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
A nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
D nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
D nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
D nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
D nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
M nuxeo-distribution/README.md
M nuxeo-distribution/nuxeo-distribution-cap/pom.xml
M nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
M nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
M nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
M nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
M nuxeo-distribution/pom.xml

diff --git a/nuxeo-distribution/README.md b/nuxeo-distribution/README.md
index e1a1b6e..686d511 100644
--- a/nuxeo-distribution/README.md
+++ b/nuxeo-distribution/README.md
@@ -58,7 +58,7 @@ Ant usage: `ant package`
* nuxeo-launcher: Control Panel and Launcher
* nuxeo-distribution-resources: Resources for packaging (doc, binaries, configuration templates)
* nuxeo-distribution-tests: Convenient helper POM listing the Nuxeo test dependencies
- * nuxeo-distribution-coreserver: Core Server NXR
+ * nuxeo-distribution-server: Server NXR
* nuxeo-distribution-cap: Content Application Platform NXR
* nuxeo-distribution-tomcat: Package Nuxeo CAP with Tomcat
* nuxeo-distribution-tomcat-wizard-tests: WebDriver tests on Startup Wizard
@@ -72,12 +72,12 @@ Ant usage: `ant package`
## Produced packages

* NXR packages
- * Core Server
+ * Server
* Content Application Platform (CAP)
* Nuxeo Packages
* Transitional Package for Advanced Document Management (DM)
* Tomcat packages
- * Core Server
+ * Server
* Content Application Platform (CAP)
* SDK

@@ -99,15 +99,15 @@ See also Nuxeo Documentation: [CORG/Maven+usage](http://doc.nuxeo.com/x/JQk7)

## Details about predefined applications

-### Nuxeo Core Server
+### Nuxeo Server

A minimal server NXR. An embedded repository will be started. No other platform services are available.

This application can be used to debug, test or develop nuxeo components that need a repository connection.

-Built NXR is in `nuxeo-distribution-coreserver/target/`.
+Built NXR is in `nuxeo-distribution-server/target/`.

-It is packaged within Tomcat in `nuxeo-distribution-tomcat/target/` (see "coreserver").
+It is packaged within Tomcat in `nuxeo-distribution-tomcat/target/` (see "server").

### Nuxeo CAP
diff --git a/nuxeo-distribution/nuxeo-distribution-cap/pom.xml b/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
index 35114de..ba105dd 100644
--- a/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
+++ b/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<type>pom</type>
</dependency>
<dependency>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok b/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
deleted file mode 100644
index 1b9703d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/assemble"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin/main"/>
-</classpath>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok b/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
deleted file mode 100644
index 0999a6a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
- <name>nuxeo-distribution-coreserver</name>
- <comment>Nuxeo CoreServer EAR</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml b/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
deleted file mode 100644
index 71c51b9..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution</artifactId>
- <version>8.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>nuxeo-distribution-coreserver</artifactId>
- <packaging>zip</packaging>
- <name>CoreServer NXR</name>
- <description>Nuxeo Core Server NXR</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuxeo.common</groupId>
- <artifactId>nuxeo-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-deploy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-metrics</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-schema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-mimetype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-dmk-adaptor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-sql</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-sql-management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.lib.core</groupId>
- <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-dbs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-mongodb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-mem</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-query</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-persistence</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert-plugins</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-convert</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-types-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-types-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-audit-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.localconf</groupId>
- <artifactId>nuxeo-localconf-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-audit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-commandline-executor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-types-contrib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-ldap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-sql</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-multi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-dublincore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-core-listener</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login-digest</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-default-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-core-listener</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-usermanager-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-usermanager-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-versioning-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-versioning-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-content-template-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-io-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-io-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-admin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-rendering</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-platform-lang-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-scripting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-ws</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-opencmis-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-opencmis-bindings</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-webdav</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-rest-api-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-rest-api-server</artifactId>
- </dependency>
-
- 
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuxeo.build</groupId>
- <artifactId>ant-assembly-maven-plugin</artifactId>
- <configuration>
- <buildFile>${basedir}/src/main/assemble/assembly.xml</buildFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>os-notwindows</id>
- <activation>
- <os>
- <family>!windows</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.tattletale</groupId>
- <artifactId>tattletale-maven</artifactId>
- <configuration>
- <source>${project.build.directory}/nxr/lib:${project.build.directory}/nxr/bundles</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
deleted file mode 100644
index 2739daf..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project name="nuxeo-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
- <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
- <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
-
- <target name="build" description="Build Nuxeo CoreServer NXR">
- <echo level="info">Building Nuxeo CoreServer NXR</echo>
- <property name="outdir" value="${maven.project.build.directory}" />
- <artifact:nuxeo-expand includeTestScope="true" />
- <artifact:print output="${outdir}/artifacts-coreserver.properties" mode="sdk" />
- <artifact:print output="${outdir}/test-artifacts-coreserver.properties" mode="sdk" scopes="test" />
- <artifact:print output="${outdir}/dependency-tree.log" />
-
- <property name="nxr" value="${outdir}/nxr" />
- <delete failonerror="false" dir="${nxr}" />
- <mkdir dir="${nxr}" />
- <copy todir="${nxr}/bundles" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="org.nuxeo*" scope="!test" type="!pom" />
- </includes>
- <excludes>
- <artifact groupId="org.nuxeo.lib*" />
- </excludes>
- </artifact:set>
- </copy>
-
- <copy todir="${nxr}/lib" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="!org.nuxeo*" scope="!test" />
- <artifact groupId="org.nuxeo.lib*" scope="!test" />
- </includes>
- </artifact:set>
- </copy>
- <nx:rmdups dir="${nxr}/lib" />
-
- <copy file="${outdir}/artifacts-coreserver.properties" todir="${nxr}" />
- <copy file="${outdir}/test-artifacts-coreserver.properties" todir="${nxr}" />
-
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" basedir="${nxr}" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" type="zip" />
- </target>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
index 817a108..66106e1 100644
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
@@ -31,7 +31,7 @@
<param name="derby-lib-dir" value="nxserver/lib" />
</antcall>
<antcall target="copy-resources-with-jdbc-lib">
- <param name="distribution" value="templates-coreserver" />
+ <param name="distribution" value="templates-server" />
<param name="h2-lib-dir" value="nxserver/lib" />
<param name="derby-lib-dir" value="nxserver/lib" />
</antcall>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
deleted file mode 100644
index c9b10e6..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
+++ /dev/null
@@ -1,123 +0,0 @@
------
-About
------
-
-The templates in this directory are used to generate configuration and datasource
-files at server startup when it is not already configured.
-
-1) Usage
-
-1.1) General instructions
-
-Edit nuxeo.conf and set the name of the template(s) to use (default template is "default").
-
-Set the properties you want to customize, see nuxeo.defaults files for available parameters.
-For example, recommended changes are:
- nuxeo.templates=default
- nuxeo.bind.address=0.0.0.0
-And, for example, if you use a database template:
- nuxeo.db.host=localhost
- nuxeo.db.name=nuxeo
- nuxeo.db.user=user
- nuxeo.db.password=password
-
-Default values are used for undefined properties in nuxeo.conf
-Take care that the following sample is defining an empty property:
- nuxeo.sample.value=
-
-*DO NOT EDIT* nuxeo.defaults files except, if needed, the one in custom template.
-
-1.2) Technical overview
-
-A server is considered as already configured when it has a config directory.
-When the config directory doesn't exist, templates will be used to generate all
-configuration files (config and datasources).
-
-The template files contain parameters defined such as ${sample.parameter}
-Values for parameters replacement are calculated by this way:
- * If nuxeo.conf does not define nuxeo.templates, then nuxeo.templates equals "default"
- (deprecated parameter nuxeo.template is still read for backward compliance).
- * The ${nuxeo.templates} value is used for determining the chosen template(s).
- * For each value "nuxeo.template" of ${nuxeo.templates} (comma separated values,
- relative to "templates/" directory or absolute path), the corresponding file
- ${nuxeo.template}/nuxeo.defaults is read for defining new default values
- and eventually including other templates which are recursively parsed.
- * The file templates/nuxeo.defaults is read for default values not already defined.
- * The file nuxeo.conf is read for custom values (overwriting default values).
-
-Configuration files are then generated by this way:
- * For each comma separated value of nuxeo.templates and nuxeo.template.includes
- (let say sample.template), files in templates/${sample.template}/ are copied
- using the previously calculated values for replacing parameters.
- * Every included template will potentially overwrite its precedents.
-
-1.3) Customization
-
-"custom" template allows to add customization such as using multiple databases,
-configuring services, ...
-
- * Add your own template files in "templates/custom" directory.
- You can use either existing or new parameters in these new template files.
- * Edit nuxeo.conf, set your parameters' values and set nuxeo.templates=custom
- (you can refer to custom templates directory with a relative path or to your
- own custom templates directory with an absolute path).
- * Edit custom/nuxeo.defaults and set nuxeo.template.includes parameter to define
- the list of existing templates to include (comma separated values); your custom
- template will be used at last.
- Note since NXP-5139, nuxeo.defaults files from included templates are read.
-
-In case you need multiple customizations, create multiple directories and reference
-them in nuxeo.conf of each server.
-
-2) Available templates
-
-2.1) default
-
-Default Nuxeo configuration.
-Designed for development or test purpose.
-Repository backend: H2
-Services backend: Derby
-
-2.2) postgresql
-
-Recommended configuration for production, based on PostgreSQL.
-See http://doc.nuxeo.com/x/fwQz
-
-Repository backend: PostgreSQL XA
-Services backend: PostgreSQL XA
-
-Copy JDBC3 driver http://jdbc.postgresql.org/download.html#current
-into $TOMCAT/lib/
-
-2.3) oracle
-
-See http://doc.nuxeo.com/x/ywE7
-
-Repository backend: Oracle XA
-Services backend: Oracle
-
-Copy JDBC driver http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
-into $TOMCAT/lib/
-
-2.4) mssql
-
-See http://doc.nuxeo.com/x/EgI7
-
-Repository backend: Ms SQL Server XA
-Services backend: Ms SQL Server XA
-
-Copy JDBC driver http://repo2.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar
-into $TOMCAT/lib/
-
-2.5) custom
-
-Sample custom template. It's quite empty, feel free to play with it in order to
-create your own template.
-
-2.6) https
-
-Not recommended: Nuxeo recommends to use a HTTP server in front of Tomcat instead of
-configuring Tomcat to directly listen to port 443.
-
-That template is configuring the server to listen to port 443 (HTTPS) on its public
-address(es) but still use port 80 (HTTP) for its local calls (loopback url).
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
deleted file mode 100644
index 6956521..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (C) Copyright 2015 Nuxeo SA (http://nuxeo.com/) and contributors.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License
- * (LGPL) version 2.1 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-2.1.html
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Contributors:
- * Julien Carsique
- */
-
-import org.nuxeo.ecm.core.blob.binary.BinaryManagerStatus;
-import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatus;
-import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatusMBean;
-
-SQLRepositoryStatusMBean status = new SQLRepositoryStatus();
-if (!status.isBinariesGCInProgress()) {
- BinaryManagerStatus binaryManagerStatus = status.gcBinaries(true);
- println("Orphaned binaries garbage collecting result: " + binaryManagerStatus);
-} else {
- println("Orphaned binaries garbage collecting is already in progress.");
-}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
deleted file mode 100644
index 8e96e2e..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
+++ /dev/null
@@ -1,88 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Context antiResourceLocking="false" privileged="true"
- path="${org.nuxeo.ecm.contextPath}" docBase="../nxserver/nuxeo.war">
-
- 
- <Manager pathname="" />
-
- 
-<#if "${nuxeo.server.sdk}" == "false">
- <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
- loaderClass="org.nuxeo.runtime.tomcat.NuxeoWebappClassLoader" />
-<#else>
- <Valve className="org.nuxeo.runtime.tomcat.dev.DevValve" />
- <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
- loaderClass="org.nuxeo.runtime.tomcat.dev.NuxeoDevWebappClassLoader" />
-</#if>
-
- <Listener className="org.nuxeo.runtime.tomcat.ContextSecurityGrabber" />
-<#noparse>
- <Listener className="org.nuxeo.runtime.tomcat.NuxeoLauncher" home="${catalina.base}/nxserver" />
-</#noparse>
-
- 
-
-<#if nuxeo.db.embeddedDatasources == "false">
- <ResourceLink name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-<#if "${nuxeo.quartz.enable}" == "true">
- <ResourceLink name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-</#if>
-</#if>
-
- <Resource name="TransactionManager" auth="Container"
- type="javax.transaction.TransactionManager" factory="org.nuxeo.runtime.jtajca.NuxeoTransactionManagerFactory"
- transactionTimeoutSeconds="${nuxeo.db.transactiontimeout}" />
- <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory" />
-
- <Resource auth="Container" name="Mail" type="javax.mail.Session" factory="org.nuxeo.ecm.platform.ec.notification.email.EmailResourceFactory"
- mail.from="${mail.from}"
-<#if "${mail.debug}" == "true">
- mail.debug="${mail.debug}"
-</#if>
- mail.store.protocol="${mail.store.protocol}"
- mail.${mail.store.protocol}.host="${mail.store.host}"
-<#if "${mail.store.port}" != "-1">
- mail.${mail.store.protocol}.port="${mail.store.port}"
-</#if>
- mail.${mail.store.protocol}.user="${mail.store.user}"
- mail.${mail.store.protocol}.password="${mail.store.password}"
- mail.transport.protocol="${mail.transport.protocol}"
- mail.${mail.transport.protocol}.host="${mail.transport.host}"
-<#if "${mail.transport.port}" != "-1">
- mail.${mail.transport.protocol}.port="${mail.transport.port}"
-</#if>
-<#if "${mail.transport.auth}" == "true">
- mail.${mail.transport.protocol}.user="${mail.transport.user}"
- mail.${mail.transport.protocol}.password="${mail.transport.password}"
- mail.${mail.transport.protocol}.auth="${mail.transport.auth}"
-</#if>
-<#if "${mail.transport.usetls}" == "true">
- mail.${mail.transport.protocol}.starttls.enable="${mail.transport.usetls}"
-</#if>
- />
-
-</Context>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
deleted file mode 100644
index 7d5a4d1..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
+++ /dev/null
@@ -1,191 +0,0 @@
-<#escape x as x?xml>
-<#assign isTomcat7 = tomcat.version?split(".")[0]?number == 7>
-<#assign isWizard = (nuxeo.wizard?? && nuxeo.wizard.done?? && nuxeo.wizard.done == "false")>
-<?xml version='1.0' encoding='utf-8'?>
-
-
-<Server address="${nuxeo.server.tomcat_admin.host}" port="${nuxeo.server.tomcat_admin.port}" shutdown="SHUTDOWN">
-
-
- 
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- 
- <Listener className="org.apache.catalina.core.JasperListener" />
- 
-<#if !isTomcat7>
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-</#if>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
- 
- <GlobalNamingResources>
- 
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
-
- <#if !isWizard && nuxeo.db.embeddedDatasources == "false">
- 
- <Resource name="${nuxeo.db.commonds}" auth="Container" type="javax.sql.DataSource"
- maxActive="${nuxeo.db["max-pool-size"]}" maxIdle="30" maxWait="10000" driverClassName="${nuxeo.db.driver}"
- url="${nuxeo.db.jdbc.url}" validationQuery="${nuxeo.db.validationQuery}"
- username="${nuxeo.db.user}" password="${nuxeo.db.password}"
- accessToUnderlyingConnectionAllowed="true" />
- </#if>
-
- </GlobalNamingResources>
-
- 
- <Service name="Catalina">
-
- 
- 
-
-
- 
- <Connector port="${nuxeo.server.http.port}" protocol="HTTP/1.1" URIEncoding="UTF-8"
-<#if nuxeo.server.https.port == "0">
- address="${nuxeo.bind.address}"
-<#else>
- address="127.0.0.1"
- redirectPort="${nuxeo.server.https.port}"
-</#if>
-<#if nuxeo.server.signature??>
- server="${nuxeo.server.signature}"
-</#if>
- compression="on"
- compressionMinSize="512"
- compressableMimeType="text/css,application/javascript,text/xml,text/html"
- connectionTimeout="20000" />
- 
- 
-<#if nuxeo.server.https.port != "0">
- 
- <Connector port="${nuxeo.server.https.port}" protocol="HTTP/1.1" SSLEnabled="true"
- address="${nuxeo.bind.address}"
-<#if nuxeo.server.signature??>
- server="${nuxeo.server.signature}"
-</#if>
- compression="on"
- compressionMinSize="512"
- compressableMimeType="text/css,application/javascript,text/xml,text/html"
- maxThreads="150" scheme="https" secure="true"
- keystoreFile="${nuxeo.server.https.keystoreFile}"
- keystorePass="${nuxeo.server.https.keystorePass}"
- clientAuth="false" sslProtocol="TLS" />
-</#if>
-
- 
- <Connector port="${nuxeo.server.ajp.port}" protocol="AJP/1.3"
- address="${nuxeo.bind.address}"
- redirectPort="${nuxeo.server.https.port}" />
-
-
- 
-
- 
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="${nuxeo.server.jvmRoute}">
-
- 
- 
-
- 
- 
-
- 
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- 
- <Host name="localhost" appBase="webapps"
- unpackWARs="true"
- autoDeploy="${isWizard?string('true', 'false')}" >
-
-<#if !isWizard>
- 
- <Listener className="org.nuxeo.runtime.tomcat.NuxeoDeployer" home="nxserver" />
-</#if>
-
- 
- 
-
- 
- 
-
- </Host>
- </Engine>
- </Service>
-</Server>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
deleted file mode 100644
index aa5c457..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
+++ /dev/null
@@ -1,107 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-common-base.target=.
-
-nuxeo.server.sdk=false
-nuxeo.server.http.port=8080
-nuxeo.server.ajp.port=8009
-nuxeo.server.https.port=0
-nuxeo.server.tomcat_admin.host=localhost
-nuxeo.server.tomcat_admin.port=8005
-nuxeo.server.jvmRoute=nuxeo
-NuxeoContainer.autoactivation=false
-
-# GlobalNamingResources datasource (not visible from webapp)
-nuxeo.db.embeddedDatasources=true
-nuxeo.db.xaMode=false
-nuxeo.db.commonds=jdbc/nuxeo
-
-nuxeo.db.min-pool-size=5
-nuxeo.db.max-pool-size=100
-nuxeo.db.blocking-timeout-millis=1000
-nuxeo.db.idle-timeout-minutes=5
-nuxeo.db.validationQuery=
-nuxeo.db.sql-exception-sorter=org.nuxeo.runtime.datasource.DatasourceExceptionSorter
-nuxeo.db.user_separator_key=,
-
-nuxeo.vcs.min-pool-size=0
-nuxeo.vcs.max-pool-size=20
-nuxeo.vcs.blocking-timeout-millis=100
-nuxeo.vcs.idle-timeout-minutes=10
-nuxeo.vcs.fulltext.disabled=false
-nuxeo.vcs.fulltext.search.disabled=false
-nuxeo.vcs.noddl=false
-nuxeo.vcs.ddlmode=execute
-nuxeo.vcs.idtype=varchar
-nuxeo.vcs.fulltext.analyzer.language=english
-nuxeo.vcs.optimizations.acl.enabled=true
-nuxeo.vcs.optimizations.path.enabled=true
-
-# Mail server
-mail.store.protocol=pop3
-mail.store.host=localhost
-mail.store.port=110
-mail.store.user=anonymous
-mail.store.password=secret
-# Mail transport
-mail.transport.protocol=smtp
-mail.transport.host=localhost
-mail.transport.port=25
-mail.transport.user=anonymous
-mail.transport.password=secret
-mail.transport.usetls=false
-mail.transport.auth=false
-# User who will receive mail
-mail.user=nobody
-# Enable debugging output from the javamail classes
-mail.debug=false
-mail.from=***@nuxeo.com
-
-nuxeo.core.binarymanager=org.nuxeo.ecm.core.blob.binary.DefaultBinaryManager
-nuxeo.core.binarymanager_key=
-nuxeo.quartz.enable=false
-###
-# Elasticsearch
-elasticsearch.enabled=true
-# Name of the Elasticsearch index for the default document repository
-elasticsearch.indexName=nuxeo
-# Comma separated list of Elasticsearch nodes, if empty use a local in JVM node
-elasticsearch.addressList=
-# Name of the Elasticsearch cluster to join
-elasticsearch.clusterName=nuxeoCluster
-# Number of replicas (not for local node)
-elasticsearch.indexNumberOfReplicas=1
-# Number of shards (not for local node)
-elasticsearch.indexNumberOfShards=5
-# Name of the local node
-elasticsearch.nodeName=nuxeoNode
-# Does the local node accept HTTP request on port 9200
-elasticsearch.httpEnabled=false
-# Network binding. Policy is to accept request from local machine only.
-elasticsearch.networkHost=127.0.0.1
-# Load document model from Elasticsearch result (experimental)
-# if false load from document from VCS
-elasticsearch.fetchDocFromEs=false
-# Comma separated list of CorePageProvider names to supersede by Elasticsearch
-elasticsearch.override.pageproviders=default_search,default_document_suggestion,DEFAULT_DOCUMENT_SUGGESTION,advanced_document_content
-# Reindexing option, number of documents to process per worker @since 6.0-HF02
-elasticsearch.reindex.bucketReadSize=500
-# Reindexing option, number of documents to submit to Elasticsearch per bulk command @since 6.0-HF02
-elasticsearch.reindex.bucketWriteSize=50
-# Maximum size of the indexing thread pool @since 6.0-HF02
-elasticsearch.indexing.maxThreads=4
-# Time to keep the completed indexing worker states @since 6.0-HF02
-elasticsearch.indexing.clearCompletedAfterSeconds=90
-# Display Elasticsearch cluster and nodes information in the admin center @since 6.0-HF06, always true for embedded mode
-elasticsearch.adminCenter.displayClusterInfo=false
-# Reindex the repository content on startup if the index is empty
-elastcisearch.reindex.onStartup=false
-# Use Elasticsearch as a backend for audit logs
-audit.elasticsearch.enabled=false
-# Name of the Elasticsearch index for audit logs
-audit.elasticsearch.indexName=${elasticsearch.indexName}-audit
-# Name of the Elasticsearch index for the uid sequencer
-seqgen.elasticsearch.indexName=${elasticsearch.indexName}-uidgen
-# Migrate audit logs from SQL storage to Elasticsearch indexing, requires audit.elasticsearch.enabled=true
-audit.elasticsearch.migration=false
-# Batch size for audit logs migration, only useful with audit.elasticsearch.migration=true
-audit.elasticsearch.migration.batchSize=1000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
deleted file mode 100644
index 4bccf7c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.runtime.datasource.server.contrib">
-
-<#if nuxeo.db.embeddedDatasources == "true">
- <extension target="org.nuxeo.runtime.datasource" point="datasources">
-<#if nuxeo.db.xaMode == "false">
- <datasource name="${nuxeo.db.commonds}" driverClassName="${nuxeo.db.driver}"
- url="${nuxeo.db.jdbc.url}" username="${nuxeo.db.user}" password="${nuxeo.db.password}"
- maxPoolSize="${nuxeo.db["max-pool-size"]}"
- minPoolSize="${nuxeo.db["min-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
- idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
- sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
- validationQuery="${nuxeo.db.validationQuery}"
- accessToUnderlyingConnectionAllowed="true" />
-<#else>
- <datasource name="${nuxeo.db.commonds}" xaDataSource="${nuxeo.db.xadatasource}"
- maxPoolSize="${nuxeo.db["max-pool-size"]}"
- minPoolSize="${nuxeo.db["min-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
- idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
- sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
- validationQuery="${nuxeo.db.validationQuery}"
- accessToUnderlyingConnectionAllowed="true" >
-<#include "xadatasource-params.ftl" parse=true />
- </datasource>
-</#if>
- <link name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/repository_default" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-<#if "${nuxeo.quartz.enable}" == "true">
- <link name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-</#if>
- </extension>
-</#if>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
deleted file mode 100644
index 11e45a7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
+++ /dev/null
@@ -1,118 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="default-repository-config">
- <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
- <blobprovider name="default">
- <class>${nuxeo.core.binarymanager}</class>
- <property name="path">${repository.binary.store}</property>
- <property name="key">${nuxeo.core.binarymanager_key}</property>
- </blobprovider>
- </extension>
-<#if "${nuxeo.mongodb.server}" == "">
- <extension target="org.nuxeo.ecm.core.storage.sql.RepositoryService"
- point="repository">
- <repository name="default" label="label.default.repository">
- <pool minPoolSize="${nuxeo.vcs["min-pool-size"]}" maxPoolSize="${nuxeo.vcs["max-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.vcs["blocking-timeout-millis"]}" idleTimeoutMinutes="${nuxeo.vcs["idle-timeout-minutes"]}" />
- <clustering id="${repository.clustering.id}" enabled="${repository.clustering.enabled}" delay="${repository.clustering.delay}" />
-<#if "${repository.clustering.invalidation}" == "redis">
- <clusterInvalidatorClass>org.nuxeo.ecm.core.redis.contribs.RedisClusterInvalidator</clusterInvalidatorClass>
-</#if>
- <noDDL>${nuxeo.vcs.noddl}</noDDL>
- <ddlMode>${nuxeo.vcs.ddlmode}</ddlMode>
- <aclOptimizations enabled="${nuxeo.vcs.optimizations.acl.enabled}"/>
- <pathOptimizations enabled="${nuxeo.vcs.optimizations.path.enabled}"/>
- <idType>${nuxeo.vcs.idtype}</idType>
- <indexing>
-<#if "${nuxeo.db.type}" == "postgresql">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
- analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-<#elseif "${nuxeo.db.type}" == "oracle">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
- 
-<#elseif "${nuxeo.db.type}" == "mssql">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
- analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
- <index name="default">
- 
- </index>
- 
- </fulltext>
-<#elseif "${nuxeo.db.type}" == "mysql">
- 
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-<#else>
- 
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" analyzer="org.apache.lucene.analysis.standard.StandardAnalyzer">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-</#if>
- </indexing>
-<#if "${nuxeo.db.type}" != "mysql">
- <usersSeparator key="${nuxeo.db.user_separator_key}" />
-</#if>
-<#if "${nuxeo.db.type}" == "mysql">
- <schema>
- <field type="largetext">var_ParallelDocumentReview:review_result</field>
- </schema>
-</#if>
- </repository>
- </extension>
-<#else>
- <extension target="org.nuxeo.ecm.core.storage.mongodb.MongoDBRepositoryService"
- point="repository">
- <repository name="default" label="MongoDB Repository">
- <server>${nuxeo.mongodb.server}</server>
- <dbname>${nuxeo.mongodb.dbname}</dbname>
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" />
- </repository>
- </extension>
-</#if>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
deleted file mode 100644
index 9371179..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
+++ /dev/null
@@ -1,116 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.index.audit.contrib">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchIndex">
-
- <elasticSearchIndex name="${audit.elasticsearch.indexName}" type="entry" >
- <settings>{
-<#if "${elasticsearch.addressList}" != "">
- "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
- "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
-</#if>
- "analysis" : {
- "filter" : {
- "truncate_filter" : {
- "length" : 256,
- "type" : "truncate"
- },
- "word_delimiter_filter" : {
- "type" : "word_delimiter",
- "preserve_original" : true
- },
- "en_stem_filter" : {
- "name" : "minimal_english",
- "type" : "stemmer"
- },
- "en_stop_filter" : {
- "stopwords" : [
- "_english_"
- ],
- "type" : "stop"
- }
- },
- "tokenizer" : {
- "path_tokenizer" : {
- "delimiter" : "/",
- "type" : "path_hierarchy"
- }
- },
- "analyzer" : {
- "en_analyzer" : {
- "alias" : "fulltext",
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "en_stop_filter",
- "en_stem_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "path_analyzer" : {
- "type" : "custom",
- "tokenizer" : "path_tokenizer"
- },
- "default" : {
- "type" : "custom",
- "filter" : [ "truncate_filter" ],
- "tokenizer" : "keyword"
- }
- }
- }
-}
- </settings>
- <mapping>
- {
- "_all" : {
- "analyzer" : "fulltext"
- },
- "properties" : {
- "comment" : {
- "type" : "multi_field",
- "fields" : {
- "comment" : {
- "type" : "string"
- },
- "fulltext" : {
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "eventDate": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "logDate": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "docPath": {
- "type" : "multi_field",
- "fields" : {
- "children" : {
- "search_analyzer" : "keyword",
- "index_analyzer" : "path_analyzer",
- "type" : "string"
- },
- "docPath" : {
- "index" : "not_analyzed",
- "type" : "string"
- }
- }
- }
- }
- }
- </mapping>
- </elasticSearchIndex>
-
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
deleted file mode 100644
index 2fe1e69..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
+++ /dev/null
@@ -1,17 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<#assign ppNames="${elasticsearch.override.pageproviders}"?split(",") />
-<component name="org.nuxeo.ecm.platform.query.api.PageProviderservice.replacers.defaultConfig">
-
- <extension target="org.nuxeo.ecm.platform.query.api.PageProviderService" point="replacers">
-
- <replacer withClass="org.nuxeo.elasticsearch.provider.ElasticSearchNxqlPageProvider"
- enabled="${r"${elasticsearch.enabled:=true}"}">
-<#list ppNames as ppName>
- <provider>${ppName?trim}</provider>
-</#list>
- </replacer>
-
- </extension>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
deleted file mode 100644
index 0967ae2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
+++ /dev/null
@@ -1,255 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.defaultConfig">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
-<#if "${elasticsearch.addressList}" == "">
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchLocal">
- <elasticSearchLocal
- clusterName="${elasticsearch.clusterName}"
- nodeName="${elasticsearch.nodeName}"
- pathData="${nuxeo.data.dir}/elasticsearch"
- pathLogs="${nuxeo.log.dir}/elasticsearch"
- httpEnabled="${elasticsearch.httpEnabled}"
- networkHost="${elasticsearch.networkHost}" />
- </extension>
-<#else>
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchRemote">
- <elasticSearchRemote
- clusterName="${elasticsearch.clusterName}"
- addressList="${elasticsearch.addressList}"
- clientTransportSniff="false"
- clientTransportIgnoreClusterName="false"
- clientTransportPingTimeout="5s"
- clientTransportNodesSamplerInterval="5s" />
- </extension>
-</#if>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchIndex">
- <elasticSearchIndex name="${elasticsearch.indexName}" type="doc" repository="default">
- <fetchFromSource>
- <include>ecm:*</include>
- <include>dc:*</include>
- <exclude>ecm:binarytext</exclude>
- </fetchFromSource>
-
- <settings>
-{
-<#if "${elasticsearch.addressList}" != "">
- "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
- "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
-</#if>
- "analysis" : {
- "filter" : {
- "truncate_filter" : {
- "length" : 256,
- "type" : "truncate"
- },
- "word_delimiter_filter" : {
- "type" : "word_delimiter",
- "preserve_original" : true
- },
- "asciifolding_filter" : {
- "type" : "asciifolding",
- "preserve_original" : true
- },
- "en_stem_filter" : {
- "name" : "minimal_english",
- "type" : "stemmer"
- },
- "en_stop_filter" : {
- "stopwords" : [
- "_english_"
- ],
- "type" : "stop"
- },
- "fr_elision_filter" : {
- "articles" : [
- "c",
- "l",
- "m",
- "t",
- "qu",
- "n",
- "s",
- "j"
- ],
- "type" : "elision"
- },
- "fr_stem_filter" : {
- "name" : "minimal_french",
- "type" : "stemmer"
- },
- "fr_stop_filter" : {
- "stopwords" : [
- "_french_"
- ],
- "type" : "stop"
- }
- },
- "tokenizer" : {
- "path_tokenizer" : {
- "delimiter" : "/",
- "type" : "path_hierarchy"
- }
- },
- "analyzer" : {
- "en_analyzer" : {
- "alias" : "fulltext",
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "en_stop_filter",
- "en_stem_filter",
- "asciifolding_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "fr_analyzer" : {
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "fr_stop_filter",
- "fr_stem_filter",
- "asciifolding_filter",
- "fr_elision_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "path_analyzer" : {
- "type" : "custom",
- "tokenizer" : "path_tokenizer"
- },
- "lowercase_analyzer" : {
- "type" : "custom",
- "filter" : [ "truncate_filter", "lowercase", "asciifolding" ],
- "tokenizer" : "keyword"
- },
- "default" : {
- "type" : "custom",
- "filter" : [ "truncate_filter" ],
- "tokenizer" : "keyword"
- }
- }
- }
-}
- </settings>
- <mapping>
-{
- "_size" : {
- "enabled" : true
- },
- "_all" : {
- "analyzer" : "fulltext"
- },
- "dynamic_templates": [ {
- "no_thumbnail_template": {
- "path_match": "thumb:thumbnail.*",
- "mapping": {
- "index": "no",
- "include_in_all": false
- }
- }
- }, {
- "no_picture_template": {
- "path_match": "picture:views.*",
- "mapping": {
- "index": "no",
- "include_in_all": false
- }
- }
- } ],
- "properties" : {
- "dc:title" : {
- "type" : "multi_field",
- "fields" : {
- "dc:title" : {
- "type" : "string"
- },
- "fulltext" : {
- "boost": 2,
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "dc:description" : {
- "type" : "multi_field",
- "fields" : {
- "dc:description" : {
- "index" : "no",
- "include_in_all" : true,
- "type" : "string"
- },
- "fulltext" : {
- "boost": 1.5,
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "note:note" : {
- "type" : "multi_field",
- "fields" : {
- "note:note" : {
- "index" : "no",
- "include_in_all" : true,
- "type" : "string"
- },
- "fulltext" : {
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "ecm:binarytext" : {
- "type" : "string",
- "index" : "no",
- "include_in_all" : true
- },
- "ecm:path" : {
- "type" : "multi_field",
- "fields" : {
- "children" : {
- "search_analyzer" : "keyword",
- "index_analyzer" : "path_analyzer",
- "type" : "string"
- },
- "ecm:path" : {
- "index" : "not_analyzed",
- "type" : "string"
- }
- }
- },
- "ecm:pos": {
- "type": "integer"
- },
- "dc:created": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "dc:modified": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "common:icon": {
- "type": "string",
- "index" : "no",
- "include_in_all" : false
- }
- }
-}
- </mapping>
-
- </elasticSearchIndex>
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
deleted file mode 100644
index 156d74f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
+++ /dev/null
@@ -1,31 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.index.sequence.contrib">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
-
- <elasticSearchIndex name="${seqgen.elasticsearch.indexName}" type="seqId">
-
- <settings>
- {
- "number_of_shards" : 1,
- "auto_expand_replicas" : "0-all"
- }
- </settings>
-
- <mapping>
- {
- "_source" : {"enabled": false},
- "_all" : {"enabled": false},
- "_type" : {"index": "no"},
- "enabled" : false
- }
- </mapping>
-
- </elasticSearchIndex>
-
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
deleted file mode 100644
index a259904..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
+++ /dev/null
@@ -1,53 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.redis.config">
- <require>org.nuxeo.ecm.core.work.config</require>
-
-<#if "${nuxeo.redis.enabled}" == "true">
- <extension target="org.nuxeo.ecm.core.redis"
- point="configuration">
-<#if "${nuxeo.redis.ha.enabled}" == "true">
- <sentinel>
- <master>${nuxeo.redis.ha.master}</master>
- <failoverTimeout>${nuxeo.redis.ha.timeout}</failoverTimeout>
-<#assign names="${nuxeo.redis.ha.hosts}"?split(",") />
-<#list names as name>
- <host name="${name}" port="${nuxeo.redis.ha.port}"/>
-</#list>
- <password>${nuxeo.redis.password}</password>
- <database>${nuxeo.redis.database}</database>
- <timeout>${nuxeo.redis.timeout}</timeout>
- <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
- <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
- <prefix>${nuxeo.redis.prefix}</prefix>
- </sentinel>
-<#else>
- <server>
- <host>${nuxeo.redis.host}</host>
- <port>${nuxeo.redis.port}</port>
- <password>${nuxeo.redis.password}</password>
- <database>${nuxeo.redis.database}</database>
- <timeout>${nuxeo.redis.timeout}</timeout>
- <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
- <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
- <prefix>${nuxeo.redis.prefix}</prefix>
- </server>
-</#if>
- </extension>
-
-
-<#if "${nuxeo.lock.manager}" == "redis">
-  <extension target="org.nuxeo.ecm.core.storage.lock.LockManagerService" point="lockmanager">
-    <lockmanager name="default" class="org.nuxeo.ecm.core.redis.contribs.RedisLockManager" />
-  </extension>
-</#if>
-
-<#if "${nuxeo.work.queuing}" == "redis">
- <extension target="org.nuxeo.ecm.core.work.service" point="implementation">
- <queuing class="org.nuxeo.ecm.core.redis.contribs.RedisWorkQueuing"/>
- </extension>
-</#if>
-</#if>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
deleted file mode 100644
index 6f8e4b2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.nuxeo.ecm.webengine.skinPathPrefix=${org.nuxeo.ecm.contextPath}/site/skin
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
deleted file mode 100644
index f8b8c71..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-<#escape x as x?xml>
-<#if "${nuxeo.db.type}" == "postgresql">
- <property name="ServerName">${nuxeo.db.host}</property>
- <property name="PortNumber">${nuxeo.db.port}</property>
- <property name="DatabaseName">${nuxeo.db.name}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#elseif "${nuxeo.db.type}" == "oracle">
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#elseif "${nuxeo.db.type}" == "mssql">
- <property name="ServerName">${nuxeo.db.host}</property>
- <property name="PortNumber">${nuxeo.db.port}</property>
- <property name="DatabaseName">${nuxeo.db.name}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
- <property name="UseCursors">true</property>
-<#elseif "${nuxeo.db.type}" == "mysql">
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#else>
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-</#if>
-</#escape>
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
deleted file mode 100644
index c4c50fa..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<META HTTP-EQUIV="refresh" CONTENT="0;URL=${org.nuxeo.ecm.contextPath}">
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
deleted file mode 100644
index d57f246..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<container>
-
- <template name="application" src="META-INF/templates/application.xml"
- installPath="META-INF/application.xml" required="true" />
-
- <template name="web" src="META-INF/templates/web.xml" installPath="nuxeo.war/WEB-INF/web.xml"
- required="true" />
-
- <template name="faces-config" src="META-INF/templates/faces-config.xml"
- installPath="nuxeo.war/WEB-INF/faces-config.xml" required="true" />
-
- <template name="pages" src="META-INF/templates/pages.xml"
- installPath="nuxeo.war/WEB-INF/pages.xml" required="true" />
-
- <template name="components" src="META-INF/templates/components.xml"
- installPath="nuxeo.war/WEB-INF/components.xml" required="true" />
-
- <template name="jaxws" src="META-INF/templates/sun-jaxws.xml"
- installPath="nuxeo.war/WEB-INF/sun-jaxws.xml" required="false" />
-
- <directory>bundles</directory>
- <directory>plugins</directory>
-
- <install>
- <property name="war" value="/nuxeo.war" />
- <property name="datasources" value="datasources" />
-
- 
- <delete path="/META-INF/application.xml" />
- </install>
-</container>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
deleted file mode 100644
index d4caeca..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
-
- <display-name>Nuxeo EP</display-name>
-
- %{MODULE}%
-
- <module>
- <web>
- <web-uri>nuxeo.war</web-uri>
- <context-root>${org.nuxeo.ecm.contextPath}</context-root>
- </web>
- </module>
-
-</application>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
deleted file mode 100644
index 44f28e2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:mail="http://jboss.com/products/seam/mail">
-
- <component name="org.jboss.seam.core.init">
- <property name="debug">false</property>
- <property name="myFacesLifecycleBug">false</property>
- <property name="jndiPattern">nuxeo/#{ejbName}/local</property>
- </component>
-
- <component name="org.jboss.seam.core.manager">
- %{SEAM_CORE_MANAGER}%
- </component>
-
- 
- <mail:mailSession sessionJndiName="java:/Mail" />
-
-</components>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
deleted file mode 100644
index 8445332..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
-
- <factory>
-
- %{FACTORY}%
-
- </factory>
-
- %{NAVIGATION-RULE}%
-
- <navigation-rule>
-
- %{NAVIGATION}%
-
- </navigation-rule>
-
- %{MANAGED-BEAN}%
-
- 
- <application>
-
- %{APPLICATION}%
-
- %{APPLICATION_LOCALE}%
-
- </application>
-
- <lifecycle>
-
- %{PHASE-LISTENER}%
-
- </lifecycle>
-
- 
-
- %{COMPONENT}%
-
- <render-kit>
-
- %{RENDERER}%
-
- </render-kit>
-
- %{CONVERTER}%
-
- %{VALIDATOR}%
-
-</faces-config>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
deleted file mode 100644
index 0cb9d06..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
- <deployment>
- <exclude-subsystems>
- <subsystem name="jpa"/>
- <subsystem name="ejb3"/>
- <subsystem name="webservices" />
- <subsystem name="jsf" />
- <subsystem name="jaxrs" />
- <subsystem name="weld" />
- <subsystem name="pojo" />
- <subsystem name="remoting" />
- <subsystem name="sar" />
- <subsystem name="io.understow.jsp"/>
- </exclude-subsystems>
-
- <exclusions>
- <module name="org.hibernate" />
- <module name="org.hibernate.validator" />
- </exclusions>
-
- <dependencies>
- <module name="org.apache.commons.lang" />
- <module name="org.apache.commons.logging" />
- <module name="org.apache.log4j" />
- <module name="org.jboss.logging" />
- <module name="org.jboss.logging.jul-to-slf4j-stub" />
- <module name="org.jboss.logmanager" />
- <module name="org.slf4j" />
- <module name="org.slf4j.impl" />
- <module name="javax.servlet.api"/>
- <module name="javax.jws.api"/>
- <module name="javax.xml.soap.api"/>
- <module name="io.undertow.jsp"/>
- <module name="org.apache.xerces"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
deleted file mode 100644
index 5dd4f6c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_3_0.dtd">
-
-<jboss-web>
-
- <context-root>${org.nuxeo.ecm.contextPath}</context-root>
-
-</jboss-web>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
deleted file mode 100644
index da585a4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-
- %{PAGES}%
-
-</pages>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
deleted file mode 100644
index 3ca0a97..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- %{LISTENER}%
-
- %{EXCEPTION-FILTER}%
-
- %{CORS-FILTER}%
-
- %{AUTH-FILTER}%
-
- %{STD-AUTH-FILTER}%
-
- 
- %{FIRST-FILTER}%
-
- %{FILTER}%
-
- %{FILTER-MAPPING}%
-
- %{CONTEXT-PARAM}%
-
- %{CONTEXT-PARAM-RICHFACES}%
-
- %{LOGIN-CONFIG}%
-
- %{SERVLET}%
-
- %{SERVLET-MAPPING}%
-
- %{ERROR-PAGE}%
-
- %{SECURITY-CONSTRAINT}%
-
- %{LAST-SERVLET}%
-
- <security-role>
- <description>The role required to access restricted content</description>
- <role-name>admin</role-name>
- </security-role>
-
- <security-role>
- <description>The role required to access restricted content</description>
- <role-name>regular</role-name>
- </security-role>
-
- <session-config>
- <session-timeout>${session.timeout}</session-timeout>
- </session-config>
-
-</web-app>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
deleted file mode 100644
index 08bbdd4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains the Nuxeo modules
-These modules are required to run the nuxeo framework
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
deleted file mode 100644
index a647ddf..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<component
- name="org.nuxeo.coreserver.auth">
-
- 
- <require>org.nuxeo.ecm.platform.ui.web.auth.defaultConfig</require>
- <require>org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService
- </require>
-
- <extension
- target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
- point="specificChains">
-
- <specificAuthenticationChain
- name="Site">
- <urlPatterns>
- <url>(.*)/site.*</url>
- </urlPatterns>
-
- <replacementChain>
- <plugin>BASIC_AUTH2</plugin>
- </replacementChain>
- </specificAuthenticationChain>
- </extension>
-
- <extension
- target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
- point="authenticators">
-
- <authenticationPlugin
- name="BASIC_AUTH2"
- enabled="true"
- class="org.nuxeo.ecm.platform.ui.web.auth.plugins.BasicAuthenticator">
- <needStartingURLSaving>false</needStartingURLSaving>
- <stateful>false</stateful>
- <parameters>
- <parameter
- name="RealmName">Nuxeo CoreServer</parameter>
- <parameter
- name="AutoPrompt">true</parameter>
- </parameters>
- </authenticationPlugin>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
deleted file mode 100644
index 1921626..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
+++ /dev/null
@@ -1,10 +0,0 @@
-<#escape x as x?xml>
-org.nuxeo.runtime.trackers.files.threadstracking.config
-<#if elasticsearch.enabled != "true" || audit.elasticsearch.enabled != "true">
-org.nuxeo.elasticsearch.audit.contrib
-org.nuxeo.elasticsearch.index.audit.contrib
-org.nuxeo.ecm.platform.audit.PageProviderservice.es.contrib
-org.nuxeo.ecm.platform.audit.search.contrib
-org.nuxeo.admin.audit.es.contentView.contrib
-</#if>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
deleted file mode 100644
index 7f9654d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.cache.config">
-
- <#if "${nuxeo.redis.enabled}" == "true" && "${nuxeo.cache.type}" == "redis">
- <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisCache" />
- <#else>
- <#assign className = "org.nuxeo.ecm.core.cache.InMemoryCacheImpl" />
- </#if>
-
- <extension target="org.nuxeo.ecm.core.cache.CacheService"
- point="caches">
- <cache name="default-cache" class="${className}">
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-user-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-user-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-group-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-group-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-user-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-user-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-group-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-group-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-digestauth-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-digestauth-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
deleted file mode 100644
index 2ddd1b2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.directory.ldap.storage.users">
-
-<#if "${nuxeo.directory.type}" == "default">
- 
-<#else>
- <implementation class="org.nuxeo.ecm.directory.ldap.LDAPDirectoryDescriptor" />
- <implementation class="org.nuxeo.ecm.directory.ldap.LDAPServerDescriptor" />
- <require>org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory</require>
-
- 
- <require>org.nuxeo.ecm.directory.sql.storage</require>
- <require>org.nuxeo.ecm.platform.usermanager.UserManagerImpl</require>
-
- <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
- point="servers">
-
- 
- <server name="default">
-
- <ldapUrl>${nuxeo.ldap.url}</ldapUrl>
- 
-
- 
- <bindDn>${nuxeo.ldap.binddn}</bindDn>
- <bindPassword>${nuxeo.ldap.bindpassword}</bindPassword>
- 
- <retries>${nuxeo.ldap.retries}</retries>
- </server>
-
- </extension>
-
- <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
- point="directories">
-
- <directory name="ldapUserDirectory">
- <server>default</server>
- <schema>user</schema>
- <idField>username</idField>
- <passwordField>password</passwordField>
-
- <searchBaseDn>${nuxeo.ldap.user.searchBaseDn}</searchBaseDn>
- <searchClass>${nuxeo.ldap.user.searchClass}</searchClass>
- 
-<#if "${nuxeo.ldap.user.searchFilter}" != "">
- <searchFilter>${nuxeo.ldap.user.searchFilter}</searchFilter>
-</#if>
-
- 
- <searchScope>${nuxeo.ldap.user.searchScope}</searchScope>
-
- 
- <substringMatchType>${nuxeo.ldap.user.searchBehavior}</substringMatchType>
-
- <readOnly>${nuxeo.ldap.user.readonly}</readOnly>
-
- 
- <cacheEntryName>ldap-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>ldap-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- 
- <missingIdFieldCase>lower</missingIdFieldCase>
-
- 
- <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
-
- 
- <queryTimeLimit>0</queryTimeLimit>
-
- <creationBaseDn>ou=people,dc=example,dc=com</creationBaseDn>
- <creationClass>top</creationClass>
- <creationClass>person</creationClass>
- <creationClass>organizationalPerson</creationClass>
- <creationClass>inetOrgPerson</creationClass>
-
- <rdnAttribute>${nuxeo.ldap.user.mapping.rdn}</rdnAttribute>
- <fieldMapping name="username">${nuxeo.ldap.user.mapping.username}</fieldMapping>
- <fieldMapping name="password">${nuxeo.ldap.user.mapping.password}</fieldMapping>
- <fieldMapping name="firstName">${nuxeo.ldap.user.mapping.firstname}</fieldMapping>
- <fieldMapping name="lastName">${nuxeo.ldap.user.mapping.lastname}</fieldMapping>
- <fieldMapping name="company">${nuxeo.ldap.user.mapping.company}</fieldMapping>
- <fieldMapping name="email">${nuxeo.ldap.user.mapping.email}</fieldMapping>
-
- <references>
-<#if "${nuxeo.user.group.storage}" == "default">
- <inverseReference field="groups" directory="ldapGroupDirectory"
- dualReferenceField="members" />
-</#if>
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <inverseReference field="groups" directory="sqlGroupDirectory"
- dualReferenceField="members" />
-</#if>
-<#if "${nuxeo.user.group.storage}" == "ldapUserMultiGroup" || "${nuxeo.user.group.storage}" == "multiUserGroup">
- <inverseReference field="groups" directory="multiGroupDirectory"
- dualReferenceField="members" />
-</#if>
- </references>
-
- </directory>
-
-<#if "${nuxeo.user.group.storage}" != "userLdapOnly" && "${nuxeo.user.group.storage}" != "multiUserSqlGroup">
- <directory name="ldapGroupDirectory">
-
- 
- <server>default</server>
-
- <schema>group</schema>
- <idField>groupname</idField>
-
- <searchBaseDn>${nuxeo.ldap.group.searchBaseDn}</searchBaseDn>
- <searchFilter>
- ${nuxeo.ldap.group.searchFilter}
- </searchFilter>
- <searchScope>${nuxeo.ldap.group.searchScope}</searchScope>
-
- <readOnly>${nuxeo.ldap.group.readonly}</readOnly>
-
- 
- <cacheEntryName>ldap-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>ldap-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <creationBaseDn>ou=groups,dc=example,dc=com</creationBaseDn>
- <creationClass>top</creationClass>
- <creationClass>groupOfUniqueNames</creationClass>
-
- 
- <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
-
- 
- <queryTimeLimit>${nuxeo.ldap.query.timeLimit}</queryTimeLimit>
-
- <rdnAttribute>${nuxeo.ldap.group.mapping.rdn}</rdnAttribute>
- <fieldMapping name="groupname">${nuxeo.ldap.group.mapping.name}</fieldMapping>
- 
- <fieldMapping name="grouplabel">${nuxeo.ldap.group.mapping.label}</fieldMapping>
-
- <references>
- 
- <ldapReference field="members" directory="ldapUserDirectory"
- forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
- dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
-
- <ldapReference field="subGroups" directory="ldapGroupDirectory"
- forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
- dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
-
-<#if "${nuxeo.user.group.storage}" == "default">
- <inverseReference field="parentGroups" directory="ldapGroupDirectory"
-<#else>
- <inverseReference field="parentGroups" directory="multiGroupDirectory"
-</#if>
- dualReferenceField="subGroups" />
-
- 
- <ldapTreeReference field="directChildren" directory="unitDirectory"
- scope="onelevel" />
- <ldapTreeReference field="children" directory="unitDirectory"
- scope="subtree" />
-
- </references>
-
- </directory>
-</#if>
- </extension>
-
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.directory.type}" == "multi">
- <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
- <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
-
-<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <directory name="sqlUserDirectory">
-
- <schema>user</schema>
-
- <dataSource>jdbc/nxsqldirectory</dataSource>
-
- <table>users</table>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
- <autoincrementIdField>false</autoincrementIdField>
- <computeMultiTenantId>false</computeMultiTenantId>
- <dataFile>users.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <querySizeLimit>50</querySizeLimit>
-
- <cacheEntryName>sql-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <inverseReference field="groups" directory="sqlGroupDirectory"
- dualReferenceField="members" />
- </references>
-
- </directory>
-</#if>
-<#if "${nuxeo.directory.type}" == "multi" || "${nuxeo.user.group.storage}" == "userLdapOnly">
- <directory name="sqlGroupDirectory">
-
- <schema>group</schema>
- <dataSource>jdbc/nxsqldirectory</dataSource>
- <table>groups</table>
- <idField>groupname</idField>
- <dataFile>groups.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <autoincrementIdField>false</autoincrementIdField>
-
- <cacheEntryName>sql-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <tableReference field="members" directory="ldapUserDirectory"
-<#else>
- <tableReference field="members" directory="multiUserDirectory"
-</#if>
- table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
- dataFile="user2group.csv" />
-<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <tableReference field="subGroups" directory="multiGroupDirectory"
-<#else>
- <tableReference field="subGroups" directory="sqlGroupDirectory"
-</#if>
- table="group2group" sourceColumn="parentGroupId"
- targetColumn="childGroupId" schema="group2group" />
- <inverseReference field="parentGroups" directory="sqlGroupDirectory"
- dualReferenceField="subGroups" />
- </references>
-
- </directory>
-</#if>
- </extension>
-</#if>
-
-<#if "${nuxeo.directory.type}" == "multi">
- <extension
- target="org.nuxeo.ecm.directory.multi.MultiDirectoryFactory"
- point="directories">
-
- <directory name="multiUserDirectory">
- <schema>user</schema>
- <idField>username</idField>
- <passwordField>password</passwordField>
-
- <source name="userSQLsource" creation="true">
- <subDirectory name="sqlUserDirectory" />
- </source>
-
- <source name="userLDAPsource">
- <subDirectory name="ldapUserDirectory" />
- </source>
- </directory>
-
- <directory name="multiGroupDirectory">
- <schema>group</schema>
- <idField>groupname</idField>
-
- <source name="groupSQLsource" creation="true">
- <subDirectory name="sqlGroupDirectory" />
- </source>
-
- <source name="groupLDAPsource">
- <subDirectory name="ldapGroupDirectory" />
- </source>
- </directory>
-
- </extension>
-</#if>
-
- <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
-
- <userManager>
- <userCacheName>default-cache</userCacheName>
-<#if "${nuxeo.ldap.defaultAdministratorId}" != "">
- <defaultAdministratorId>${nuxeo.ldap.defaultAdministratorId}</defaultAdministratorId>
-</#if>
-<#if "${nuxeo.ldap.defaultMembersGroup}" != "">
- <defaultGroup>${nuxeo.ldap.defaultMembersGroup}</defaultGroup>
-</#if>
- <users>
-<#if "${nuxeo.directory.type}" == "ldap" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <directory>ldapUserDirectory</directory>
-<#else>
- <directory>multiUserDirectory</directory>
-</#if>
-<#if "${nuxeo.user.emergency.enable}" == "true">
- <virtualUser id="${nuxeo.user.emergency.username}" searchable="false">
- <password>${nuxeo.user.emergency.password}</password>
- <property name="firstName">${nuxeo.user.emergency.firstname}</property>
- <property name="lastName">${nuxeo.user.emergency.lastname}</property>
- <group>administrators</group>
- </virtualUser>
-</#if>
-<#if "${nuxeo.user.anonymous.enable}" == "true">
- <anonymousUser id="Guest">
- <property name="firstName">Guest</property>
- <property name="lastName">User</property>
- </anonymousUser>
-</#if>
- </users>
- <groups>
-<#if "${nuxeo.user.group.storage}" == "default">
- <directory>ldapGroupDirectory</directory>
-<#elseif "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <directory>sqlGroupDirectory</directory>
-<#else>
- <directory>multiGroupDirectory</directory>
-</#if>
- </groups>
- </userManager>
-
- </extension>
-</#if>
-
-</component>
-
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
deleted file mode 100644
index da08313..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.directory.sql.storage">
-
- <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
-
- <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
- <require>org.nuxeo.ecm.platform.digestauth.config</require>
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
-
- <directory name="userDirectory">
-
- <schema>user</schema>
-
- <dataSource>jdbc/nxsqldirectory</dataSource>
-
- <table>users</table>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
- <autoincrementIdField>false</autoincrementIdField>
- <computeMultiTenantId>false</computeMultiTenantId>
- <dataFile>users.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <querySizeLimit>50</querySizeLimit>
-
- 
- <cacheEntryName>sql-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <inverseReference field="groups" directory="groupDirectory"
- dualReferenceField="members" />
- </references>
-
- </directory>
-
- <directory name="groupDirectory">
-
- <schema>group</schema>
- <dataSource>jdbc/nxsqldirectory</dataSource>
- <table>groups</table>
- <idField>groupname</idField>
- <dataFile>groups.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <autoincrementIdField>false</autoincrementIdField>
-
- 
- <cacheEntryName>sql-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <tableReference field="members" directory="userDirectory"
- table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
- dataFile="user2group.csv" />
- 
- <tableReference field="subGroups" directory="groupDirectory"
- table="group2group" sourceColumn="parentGroupId"
- targetColumn="childGroupId" schema="group2group" />
- <inverseReference field="parentGroups" directory="groupDirectory"
- dualReferenceField="subGroups" />
- </references>
-
- </directory>
-
- <directory name="digestauth">
- <cacheEntryName>sql-digestauth-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-digestauth-entry-cache-without-references</cacheEntryWithoutReferencesName>
- <schema>digestauth</schema>
- <table>digestauth</table>
- <autoincrementIdField>false</autoincrementIdField>
- <dataSource>java:/nxsqldirectory</dataSource>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- </directory>
-
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
deleted file mode 100644
index 6a68e21..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-## DO NOT EDIT - This file must be filled at packaging time, here are required properties:
-#org.nuxeo.distribution.name=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.server=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.version=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.date=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.package=PACKAGING_MUST_FILL_IT
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
deleted file mode 100644
index 8726ebd..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-jms.useTransactedConnection=True
-jms.isDeliveryPersistent=False
-jms.isDisableMessageID=True
-jms.isDisableMessageTimestamp=True
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
deleted file mode 100644
index d111c11..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
- <documentation>
- Login modules used on Tomcat
- @author Bogdan Stefanescu (***@nuxeo.com)
- </documentation>
-
-
- <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
-
- <domain name="nuxeo-system-login">
- <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
- <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="multi-threaded">true</option>
- </login-module>
- </domain>
-
- <domain name="nuxeo-client-login">
- <login-module code="org.nuxeo.ecm.platform.login.NuxeoLoginModule"
- flag="required">
- <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
- <option name="useUserIdentificationInfoCB">true</option>
- </login-module>
- <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="restore-login-identity">true</option>
- <option name="multi-threaded">true</option>
- </login-module>
- </domain>
-
-
- <domain name="nuxeo-webengine">
- <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
- flag = "required">
- <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
- <option name="useUserIdentificationInfoCB">true</option>
- </login-module>
- 
- </domain>
-
- </extension>
-
-
-</component>
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
deleted file mode 100644
index 3f99931..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.digestauth.config">
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
- <directory name="digestauth">
- <schema>digestauth</schema>
- <table>digestauth</table>
- <autoincrementIdField>false</autoincrementIdField>
- <dataSource>java:/nxsqldirectory</dataSource>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- </directory>
- </extension>
-
- <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
- <userManager>
- <digestAuthDirectory>digestauth</digestAuthDirectory>
- <digestAuthRealm>NUXEO</digestAuthRealm>
- <userCacheName>default-cache</userCacheName>
- </userManager>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
deleted file mode 100644
index cc74965..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.runtime.management.ServerLocatorContrib">
-
- 
-
- 
- <extension target="org.nuxeo.runtime.management.ServerLocator"
- point="locators">
- <locator domain="jboss" default="true" />
- </extension>
-
- 
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
deleted file mode 100644
index f70ad04..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- 
- <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NuxeoMessages">
- <attribute name="JNDIName">topic/NuxeoMessages</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- 
- <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NXPMessages">
- <attribute name="JNDIName">topic/NXPMessages</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
-</server>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
deleted file mode 100644
index d72936f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.ear.config.notification">
-
- <extension
- target="org.nuxeo.ecm.platform.ec.notification.service.NotificationService"
- point="generalSettings">
- <settings>
- <serverPrefix>${nuxeo.url}/</serverPrefix>
- <eMailSubjectPrefix>${nuxeo.notification.eMailSubjectPrefix} </eMailSubjectPrefix>
- <mailSessionJndiName>${jndi.base}/Mail</mailSessionJndiName>
- </settings>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
deleted file mode 100644
index 670b79d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# avoid initializing nuxeo relations at startup (for faster startup)
-org.nuxeo.ecm.platform.relations.initOnStartup=false
-
-jndi.java.mail=${jndi.base}/Mail
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
deleted file mode 100644
index f8f924d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Properties for exporting search results to CSV
-org.nuxeo.ecm.webapp.search.csv.separator=,
-org.nuxeo.ecm.webapp.search.csv.quotechar="
-org.nuxeo.ecm.webapp.search.csv.endofline=\n
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
deleted file mode 100644
index 3a55311..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# application instance config
-org.nuxeo.ecm.instance.host=localhost
-
-# runtime remoting config
-org.nuxeo.runtime.server.locator=socket://${nuxeo.bind.address}:62474/?datatype=nuxeo
-
-# streaming config
-org.nuxeo.runtime.streaming.isServer=false
-org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
-
-# runtime management config
-org.nuxeo.runtime.management.exist=false
-org.nuxeo.runtime.management.serverRmiPort=2100
-
-# needed for the JNDI auto configuration of clients
-# you need to change this if using JNDI through HTTP
-nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
-nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# for email attachment, to decode the encoded(utf) filenames.
-mail.mime.decodefilename=true
-
-# LiveEdit configuration detection (client/server/both)
-org.nuxeo.ecm.platform.liveedit.config=client
-
-# Uncomment to activate Nuxeo Runtime REST API for Management
-# accessible via http://server:port/nuxeo/site/server/html on JBoss
-#org.nuxeo.runtime.rest.management=true
-
-# size limit to use the specific download servlet for big files (use SI or IEC prefix)
-#org.nuxeo.big.file.size.limit=5Mi
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
deleted file mode 100644
index d38430f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.mail.scheduler.config">
-
- <extension
- target="org.nuxeo.ecm.platform.scheduler.core.service.SchedulerRegistryService"
- point="schedule">
-
- <schedule id="mailReceivedSchedule">
- <eventId>MailReceivedEvent</eventId>
- <eventCategory>default</eventCategory>
- 
- <cronExpression>0 0/30 * * * ?</cronExpression>
- </schedule>
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
deleted file mode 100644
index 57ab876..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.convert.ooomanager.config.default">
- <require>org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent</require>
-
- <extension
- target="org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent"
- point="oooManagerConfig">
-
- <OOoManager>
-
- 
- 
- <portNumbers>
- <portNumber>2003</portNumber>
- </portNumbers>
-
- 
-
- </OOoManager>
- </extension>
-</component>
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
deleted file mode 100644
index 06b5440..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = NON_CLUSTERED
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
deleted file mode 100644
index 5eace81..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Jena database type and transaction mode
-<#if "${nuxeo.db.type}" == "postgresql">
-org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL
-<#elseif "${nuxeo.db.type}" == "oracle">
-org.nuxeo.ecm.sql.jena.databaseType=Oracle
-<#elseif "${nuxeo.db.type}" == "mssql">
-org.nuxeo.ecm.sql.jena.databaseType=MsSQL
-<#elseif "${nuxeo.db.type}" == "mysql">
-org.nuxeo.ecm.sql.jena.databaseType=MySQL
-<#else>
-# We tell Jena we're using Derby even if the database is actually h2. This works.
-org.nuxeo.ecm.sql.jena.databaseType=Derby
-</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
deleted file mode 100644
index 7aadb20..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.transient.store.config">
-
- <#if "${nuxeo.redis.enabled}" == "true">
- <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisTransientStore" />
- <#else>
- <#assign className = "org.nuxeo.ecm.core.transientstore.SimpleTransientStore" />
- </#if>
-
- <extension target="org.nuxeo.ecm.core.transientstore.TransientStorageComponent"
- point="store">
-
- <store name="default" class="${className}">
- <targetMaxSizeMB>-1</targetMaxSizeMB>
- <absoluteMaxSizeMB>-1</absoluteMaxSizeMB>
- <firstLevelTTL>240</firstLevelTTL>
- <secondLevelTTL>10</secondLevelTTL>
- <minimalRetention>10</minimalRetention>
- </store>
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
deleted file mode 100644
index 7a82b36..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
+++ /dev/null
@@ -1,4 +0,0 @@
-org.nuxeo.app.preprocessing=false
-<#if "${nuxeo.server.sdk}" == "true">
-org.nuxeo.app.installReloadTimer=true
-</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
deleted file mode 100644
index be3823d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains static libraries used by nuxeo components
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
deleted file mode 100644
index 109d04b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
+++ /dev/null
@@ -1,56 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common-base
-
-org.nuxeo.ecm.instance.description=Nuxeo
-
-org.nuxeo.runtime.server.enabled=false
-facelets.REFRESH_PERIOD=-1
-org.nuxeo.ecm.platform.liveedit.autoversioning=none
-
-zip.entry.encoding=
-
-# default|ldap|multi
-nuxeo.directory.type=default
-# (default|userLdapOnly) || (multiUserGroup|multiUserSqlGroup|ldapUserMultiGroup)
-nuxeo.user.group.storage=default
-nuxeo.ldap.url=
-nuxeo.ldap.binddn=
-nuxeo.ldap.bindpassword=
-nuxeo.ldap.retries=5
-nuxeo.ldap.query.sizeLimit=200
-nuxeo.ldap.query.timeLimit=0
-nuxeo.ldap.user.searchBaseDn=
-nuxeo.ldap.user.searchClass=person
-nuxeo.ldap.user.searchFilter=
-nuxeo.ldap.user.searchScope=onelevel
-nuxeo.ldap.user.searchBehavior=subany
-nuxeo.ldap.user.readonly=true
-nuxeo.ldap.user.mapping.rdn=
-nuxeo.ldap.user.mapping.username=
-nuxeo.ldap.user.mapping.password=
-nuxeo.ldap.user.mapping.firstname=
-nuxeo.ldap.user.mapping.lastname=
-nuxeo.ldap.user.mapping.email=
-nuxeo.ldap.user.mapping.company=
-nuxeo.ldap.group.searchBaseDn=
-nuxeo.ldap.group.searchFilter=(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))
-nuxeo.ldap.group.searchScope=subtree
-nuxeo.ldap.group.readonly=true
-nuxeo.ldap.group.mapping.rdn=
-nuxeo.ldap.group.mapping.name=
-nuxeo.ldap.group.mapping.label=
-nuxeo.ldap.group.mapping.members.staticAttributeId=uniqueMember
-nuxeo.ldap.group.mapping.members.dynamicAttributeId=memberURL
-nuxeo.ldap.defaultAdministratorId=
-nuxeo.ldap.defaultMembersGroup=members
-nuxeo.user.anonymous.enable=true
-nuxeo.user.emergency.enable=true
-nuxeo.user.emergency.username=MyAdministrator
-nuxeo.user.emergency.password=secret
-nuxeo.user.emergency.firstname=
-nuxeo.user.emergency.lastname=
-
-nuxeo.cache.type=redis
-nuxeo.cache.ttl=20
-nuxeo.cache.maxsize=100
-nuxeo.cache.concurrencylevel=500
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png
deleted file mode 100644
index 5cc89ab..0000000
Binary files a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png and /dev/null differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png
deleted file mode 100644
index 873245f..0000000
Binary files a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png and /dev/null differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
deleted file mode 100644
index b23a77a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
- <head>
- <title>Nuxeo CoreServer</title>
- <link href="img/favicon.png" type="image/png" rel="icon">
- <style type="text/css">
-
-
-</style>
- </head>
- <body>
- <div class="header"><img src="img/nuxeo.png"></div>
- <div class="welcome">
- <p class="welcomeText">
- Welcome to your Nuxeo server.
- </p>
- </div>
- <div class="footer">Copyright © 2001-2016 Nuxeo SA (http://nuxeo.com/) and others.</div>
- </body>
-</html>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
deleted file mode 100644
index 1ea4aac..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains the external modules on top of the nuxeo platform
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
deleted file mode 100644
index f812e03..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
+++ /dev/null
@@ -1 +0,0 @@
-Put here the custom bundles to deploy when activating the custom template.
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
deleted file mode 100644
index 3f563a8..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-## Edit this file to customize your configuration ##
-## See http://doc.nuxeo.com/x/LANc
-custom.target=nxserver
-
-# Set list of templates to include, comma separated values.
-#nuxeo.template.includes=common
-
-# Customize default values associated with this template
-#org.nuxeo.ecm.instance.description=Nuxeo ECM customized
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
deleted file mode 100644
index 642da06..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-db2.target=.
-
-nuxeo.db.type=db2
-nuxeo.db.host=localhost
-nuxeo.db.port=3700
-nuxeo.db.name=nuxeo
-nuxeo.db.user=user
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:db2://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
-nuxeo.db.driver=com.ibm.db2.jcc.DB2Driver
-nuxeo.db.xadatasource=com.ibm.db2.jcc.DB2XADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
deleted file mode 100644
index a5a6e8b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-default.target=.
-
-nuxeo.db.type=default
-nuxeo.db.name=nuxeo
-nuxeo.db.user=sa
-nuxeo.db.password=
-nuxeo.db.jdbc.url=jdbc:h2:$${nuxeo.data.dir}/h2/${nuxeo.db.name};DB_CLOSE_ON_EXIT=false
-nuxeo.db.driver=org.h2.Driver
-nuxeo.db.xadatasource=org.h2.jdbcx.JdbcDataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
deleted file mode 100644
index 2635cfc..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=mongodb
-gridfsbinaries.target=.
-
-nuxeo.mongodb.gridfs.bucket=default.fs
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
deleted file mode 100644
index 01d2d77..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="org.nuxeo.gridfs.config">
- <require>default-repository-config</require>
-
- <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
- <blobprovider name="default">
- <class>org.nuxeo.ecm.core.storage.mongodb.GridFSBinaryManager</class>
- <property name="server">${nuxeo.mongodb.server}</property>
- <property name="dbname">${nuxeo.mongodb.dbname}</property>
- <property name="bucket">${nuxeo.mongodb.gridfs.bucket}</property>
- </blobprovider>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
deleted file mode 100644
index 11e0b7c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-https.target=conf
-https.deprecated=true
-https.deprecation=HTTPS will be automatically activated if you set nuxeo.server.https.port to non-zero
-
-nuxeo.server.https.port=443
-nuxeo.server.https.keystoreFile=/path/to/keystore
-nuxeo.server.https.keystorePass=password
-
-nuxeo.url=https://localhost/nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
deleted file mode 100644
index b4e79a7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-mongodb.target=.
-
-nuxeo.dbnosql.type=mongodb
-nuxeo.mongodb.server=localhost:27017
-#nuxeo.mongodb.server=mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
-nuxeo.mongodb.dbname=nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index 9287904..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=mssql
-mssql-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 4e1f2d7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = QRTZ_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
deleted file mode 100644
index c23f762..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-mssql.target=.
-
-nuxeo.db.type=mssql
-nuxeo.db.host=localhost
-nuxeo.db.port=1433
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:jtds:sqlserver://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name};useCursors=true
-nuxeo.db.driver=net.sourceforge.jtds.jdbc.Driver
-nuxeo.db.xadatasource=net.sourceforge.jtds.jdbcx.JtdsDataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
deleted file mode 100644
index 99320f4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-mysql.target=.
-
-nuxeo.db.type=mysql
-nuxeo.db.host=localhost
-nuxeo.db.port=3306
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.min-pool-size=5
-nuxeo.db.jdbc.url=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true
-nuxeo.db.driver=com.mysql.jdbc.Driver
-nuxeo.db.xadatasource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
deleted file mode 100644
index eec177a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
+++ /dev/null
@@ -1,89 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-
-# Default configuration values for templates
-# Specific default values are defined in templates/{template_name}/nuxeo.defaults
-nuxeo.data.dir=nxserver/data
-nuxeo.server.dir=nxserver
-
-jndi.base=java:comp/env
-
-# Default template to use if not defined in nuxeo.conf
-nuxeo.templates=default
-
-# Default IP address binding
-nuxeo.bind.address=0.0.0.0
-
-# publicly visible URL
-nuxeo.url=http://localhost:8080/nuxeo
-
-# Application context path
-org.nuxeo.ecm.contextPath=/nuxeo
-
-org.nuxeo.ecm.product.name=Nuxeo Platform
-org.nuxeo.ecm.product.version=FT 8.3-SNAPSHOT
-
-# Various other default values
-#nuxeo.db.host=
-#nuxeo.db.port=
-#nuxeo.db.name=
-#nuxeo.db.user=
-#nuxeo.db.password=
-nuxeo.db.min-pool-size=5
-nuxeo.db.max-pool-size=100
-nuxeo.db.blocking-timeout-millis=10000
-# Database transaction timeout in seconds
-nuxeo.db.transactiontimeout=300
-
-# Redis
-nuxeo.redis.enabled=false
-nuxeo.redis.prefix=nuxeo:
-nuxeo.redis.host=localhost
-nuxeo.redis.port=6379
-nuxeo.redis.password=
-nuxeo.redis.database=0
-nuxeo.redis.timeout=2000
-nuxeo.redis.maxTotal=16
-nuxeo.redis.maxIdle=8
-nuxeo.redis.ha.enabled=false
-nuxeo.redis.ha.master=mymaster
-nuxeo.redis.ha.hosts=localhost
-nuxeo.redis.ha.timeout=300
-nuxeo.redis.ha.port=26379
-nuxeo.work.queuing=redis
-nuxeo.lock.manager=redis
-
-# MongoDB
-nuxeo.mongodb.server=
-
-nuxeo.notification.eMailSubjectPrefix=[Nuxeo]
-nuxeo.notification.eMailSigner=The Nuxeo team
-
-# The protocol used to connect to OpenOffice
-# Can be either SOCKET or PIPE, default is SOCKET
-jod.connection.protocol=SOCKET
-jod.max.tasks.per.process=
-jod.task.execution.timeout=
-jod.task.queue.timeout=
-jod.office.home=
-jod.jpipe.lib.path=
-jod.template.profile.dir=
-
-opensocial.gadgets.embeddedServer=true
-opensocial.gadgets.host=localhost
-opensocial.gadgets.port=8080
-opensocial.gadgets.path=/site/gadgets
-opensocial.trusted.hosts=
-
-# Clustering
-repository.clustering.enabled=false
-repository.clustering.id=
-repository.clustering.delay=1000
-repository.clustering.invalidation=default
-# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries
-repository.binary.store=
-
-nuxeo.plaintext_parsing_extensions=xml,properties,nx,html,js
-nuxeo.freemarker_parsing_extensions=nxftl
-
-session.timeout=60
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index c37be53..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=oracle
-oracle-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 42d1952..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = qrtz_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
deleted file mode 100644
index 4f00af4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-oracle.target=.
-
-nuxeo.db.user_separator_key=|
-nuxeo.db.type=oracle
-nuxeo.db.host=localhost
-nuxeo.db.port=1521
-nuxeo.db.name=NUXEO
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:oracle:thin:${nuxeo.db.user}/${nuxeo.db.password}@${nuxeo.db.host}:${nuxeo.db.port}:${nuxeo.db.name}
-nuxeo.db.driver=oracle.jdbc.OracleDriver
-nuxeo.db.xadatasource=oracle.jdbc.xa.client.OracleXADataSource
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
deleted file mode 100644
index 733cc1d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
+++ /dev/null
@@ -1 +0,0 @@
-hibernate.default_schema=${nuxeo.db.user}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
deleted file mode 100644
index cf1a82b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
+++ /dev/null
@@ -1,33 +0,0 @@
-perf.target=.
-
-# Use a bigger pool size for db/vcs
-nuxeo.db.max-pool-size=52
-nuxeo.vcs.max-pool-size=50
-
-# Use a descent cache size for directories
-nuxeo.cache.maxsize=510
-nuxeo.cache.ttl=20
-nuxeo.cache.concurrencylevel=50
-
-# Use Elasticsearch for all page provider
-elasticsearch.override.pageproviders=default_search,document_content,section_content,document_content,tree_children,default_document_suggestion,simple_search,advanced_search,nxql_search,DEFAULT_DOCUMENT_SUGGESTION,REST_API_SEARCH_ADAPTER
-
-# Disable db fulltext indexing
-nuxeo.vcs.fulltext.search.disabled=true
-
-# Disable db stored procedure
-nuxeo.vcs.optimizations.acl.enabled=false
-nuxeo.vcs.optimizations.path.enabled=false
-
-# When in cluster mode use Redis invalidation
-repository.clustering.invalidation=redis
-
-# Do not use Redis for directory cache
-nuxeo.cache.type=memory
-
-# Tune Elasticsearch indexing
-elasticsearch.indexing.maxThreads=6
-elasticsearch.reindex.bucketReadSize=1000
-elasticsearch.reindex.bucketWriteSize=200
-#elasticsearch.indexing.clearCompletedAfterSeconds=30
-elasticsearch.adminCenter.displayClusterInfo=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
deleted file mode 100644
index f8e40f0..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<component name="perf-audit-config">
- <require>org.nuxeo.ecm.platform.audit.service.NXAuditEventsService</require>
- <extension target="org.nuxeo.ecm.platform.audit.service.NXAuditEventsService" point="event">
- <event enabled="false" name="loginSuccess" />
- <event enabled="false" name="logout"/>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
deleted file mode 100644
index 01c0f95..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<component name="perf-nothumb-config">
- <require>org.nuxeo.ecm.platform.thumbnail.listener</require>
- <extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
- <listener name="updateThumbListener" enabled="false"/>
- <listener name="checkBlobUpdate" enabled="false"/>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index 7a1e512..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=postgresql
-postgresql-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 27c7635..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = qrtz_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
deleted file mode 100644
index 71e367a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-postgresql.target=.
-
-nuxeo.db.type=postgresql
-nuxeo.db.host=localhost
-nuxeo.db.port=5432
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:postgresql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
-nuxeo.db.driver=org.postgresql.Driver
-nuxeo.db.xadatasource=org.postgresql.xa.PGXADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
deleted file mode 100644
index 388a319..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-sdk.target=.
-nuxeo.template.includes=default
-
-nuxeo.server.sdk=true
-facelets.REFRESH_PERIOD=2
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
new file mode 100644
index 0000000..c9b10e6
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
@@ -0,0 +1,123 @@
+-----
+About
+-----
+
+The templates in this directory are used to generate configuration and datasource
+files at server startup when it is not already configured.
+
+1) Usage
+
+1.1) General instructions
+
+Edit nuxeo.conf and set the name of the template(s) to use (default template is "default").
+
+Set the properties you want to customize, see nuxeo.defaults files for available parameters.
+For example, recommended changes are:
+ nuxeo.templates=default
+ nuxeo.bind.address=0.0.0.0
+And, for example, if you use a database template:
+ nuxeo.db.host=localhost
+ nuxeo.db.name=nuxeo
+ nuxeo.db.user=user
+ nuxeo.db.password=password
+
+Default values are used for undefined properties in nuxeo.conf
+Take care that the following sample is defining an empty property:
+ nuxeo.sample.value=
+
+*DO NOT EDIT* nuxeo.defaults files except, if needed, the one in custom template.
+
+1.2) Technical overview
+
+A server is considered as already configured when it has a config directory.
+When the config directory doesn't exist, templates will be used to generate all
+configuration files (config and datasources).
+
+The template files contain parameters defined such as ${sample.parameter}
+Values for parameters replacement are calculated by this way:
+ * If nuxeo.conf does not define nuxeo.templates, then nuxeo.templates equals "default"
+ (deprecated parameter nuxeo.template is still read for backward compliance).
+ * The ${nuxeo.templates} value is used for determining the chosen template(s).
+ * For each value "nuxeo.template" of ${nuxeo.templates} (comma separated values,
+ relative to "templates/" directory or absolute path), the corresponding file
+ ${nuxeo.template}/nuxeo.defaults is read for defining new default values
+ and eventually including other templates which are recursively parsed.
+ * The file templates/nuxeo.defaults is read for default values not already defined.
+ * The file nuxeo.conf is read for custom values (overwriting default values).
+
+Configuration files are then generated by this way:
+ * For each comma separated value of nuxeo.templates and nuxeo.template.includes
+ (let say sample.template), files in templates/${sample.template}/ are copied
+ using the previously calculated values for replacing parameters.
+ * Every included template will potentially overwrite its precedents.
+
+1.3) Customization
+
+"custom" template allows to add customization such as using multiple databases,
+configuring services, ...
+
+ * Add your own template files in "templates/custom" directory.
+ You can use either existing or new parameters in these new template files.
+ * Edit nuxeo.conf, set your parameters' values and set nuxeo.templates=custom
+ (you can refer to custom templates directory with a relative path or to your
+ own custom templates directory with an absolute path).
+ * Edit custom/nuxeo.defaults and set nuxeo.template.includes parameter to define
+ the list of existing templates to include (comma separated values); your custom
+ template will be used at last.
+ Note since NXP-5139, nuxeo.defaults files from included templates are read.
+
+In case you need multiple customizations, create multiple directories and reference
+them in nuxeo.conf of each server.
+
+2) Available templates
+
+2.1) default
+
+Default Nuxeo configuration.
+Designed for development or test purpose.
+Repository backend: H2
+Services backend: Derby
+
+2.2) postgresql
+
+Recommended configuration for production, based on PostgreSQL.
+See http://doc.nuxeo.com/x/fwQz
+
+Repository backend: PostgreSQL XA
+Services backend: PostgreSQL XA
+
+Copy JDBC3 driver http://jdbc.postgresql.org/download.html#current
+into $TOMCAT/lib/
+
+2.3) oracle
+
+See http://doc.nuxeo.com/x/ywE7
+
+Repository backend: Oracle XA
+Services backend: Oracle
+
+Copy JDBC driver http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
+into $TOMCAT/lib/
+
+2.4) mssql
+
+See http://doc.nuxeo.com/x/EgI7
+
+Repository backend: Ms SQL Server XA
+Services backend: Ms SQL Server XA
+
+Copy JDBC driver http://repo2.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar
+into $TOMCAT/lib/
+
+2.5) custom
+
+Sample custom template. It's quite empty, feel free to play with it in order to
+create your own template.
+
+2.6) https
+
+Not recommended: Nuxeo recommends to use a HTTP server in front of Tomcat instead of
+configuring Tomcat to directly listen to port 443.
+
+That template is configuring the server to listen to port 443 (HTTPS) on its public
+address(es) but still use port 80 (HTTP) for its local calls (loopback url).
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
new file mode 100644
index 0000000..6956521
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
@@ -0,0 +1,28 @@
+/*
+ * (C) Copyright 2015 Nuxeo SA (http://nuxeo.com/) and contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Contributors:
+ * Julien Carsique
+ */
+
+import org.nuxeo.ecm.core.blob.binary.BinaryManagerStatus;
+import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatus;
+import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatusMBean;
+
+SQLRepositoryStatusMBean status = new SQLRepositoryStatus();
+if (!status.isBinariesGCInProgress()) {
+ BinaryManagerStatus binaryManagerStatus = status.gcBinaries(true);
+ println("Orphaned binaries garbage collecting result: " + binaryManagerStatus);
+} else {
+ println("Orphaned binaries garbage collecting is already in progress.");
+}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
new file mode 100644
index 0000000..8e96e2e
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
@@ -0,0 +1,88 @@
+<#escape x as x?xml>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context antiResourceLocking="false" privileged="true"
+ path="${org.nuxeo.ecm.contextPath}" docBase="../nxserver/nuxeo.war">
+
+ 
+ <Manager pathname="" />
+
+ 
+<#if "${nuxeo.server.sdk}" == "false">
+ <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
+ loaderClass="org.nuxeo.runtime.tomcat.NuxeoWebappClassLoader" />
+<#else>
+ <Valve className="org.nuxeo.runtime.tomcat.dev.DevValve" />
+ <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
+ loaderClass="org.nuxeo.runtime.tomcat.dev.NuxeoDevWebappClassLoader" />
+</#if>
+
+ <Listener className="org.nuxeo.runtime.tomcat.ContextSecurityGrabber" />
+<#noparse>
+ <Listener className="org.nuxeo.runtime.tomcat.NuxeoLauncher" home="${catalina.base}/nxserver" />
+</#noparse>
+
+ 
+
+<#if nuxeo.db.embeddedDatasources == "false">
+ <ResourceLink name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+<#if "${nuxeo.quartz.enable}" == "true">
+ <ResourceLink name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+</#if>
+</#if>
+
+ <Resource name="TransactionManager" auth="Container"
+ type="javax.transaction.TransactionManager" factory="org.nuxeo.runtime.jtajca.NuxeoTransactionManagerFactory"
+ transactionTimeoutSeconds="${nuxeo.db.transactiontimeout}" />
+ <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory" />
+
+ <Resource auth="Container" name="Mail" type="javax.mail.Session" factory="org.nuxeo.ecm.platform.ec.notification.email.EmailResourceFactory"
+ mail.from="${mail.from}"
+<#if "${mail.debug}" == "true">
+ mail.debug="${mail.debug}"
+</#if>
+ mail.store.protocol="${mail.store.protocol}"
+ mail.${mail.store.protocol}.host="${mail.store.host}"
+<#if "${mail.store.port}" != "-1">
+ mail.${mail.store.protocol}.port="${mail.store.port}"
+</#if>
+ mail.${mail.store.protocol}.user="${mail.store.user}"
+ mail.${mail.store.protocol}.password="${mail.store.password}"
+ mail.transport.protocol="${mail.transport.protocol}"
+ mail.${mail.transport.protocol}.host="${mail.transport.host}"
+<#if "${mail.transport.port}" != "-1">
+ mail.${mail.transport.protocol}.port="${mail.transport.port}"
+</#if>
+<#if "${mail.transport.auth}" == "true">
+ mail.${mail.transport.protocol}.user="${mail.transport.user}"
+ mail.${mail.transport.protocol}.password="${mail.transport.password}"
+ mail.${mail.transport.protocol}.auth="${mail.transport.auth}"
+</#if>
+<#if "${mail.transport.usetls}" == "true">
+ mail.${mail.transport.protocol}.starttls.enable="${mail.transport.usetls}"
+</#if>
+ />
+
+</Context>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
new file mode 100644
index 0000000..7d5a4d1
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
@@ -0,0 +1,191 @@
+<#escape x as x?xml>
+<#assign isTomcat7 = tomcat.version?split(".")[0]?number == 7>
+<#assign isWizard = (nuxeo.wizard?? && nuxeo.wizard.done?? && nuxeo.wizard.done == "false")>
+<?xml version='1.0' encoding='utf-8'?>
+
+
+<Server address="${nuxeo.server.tomcat_admin.host}" port="${nuxeo.server.tomcat_admin.port}" shutdown="SHUTDOWN">
+
+
+ 
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ 
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ 
+<#if !isTomcat7>
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+</#if>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ 
+ <GlobalNamingResources>
+ 
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+
+ <#if !isWizard && nuxeo.db.embeddedDatasources == "false">
+ 
+ <Resource name="${nuxeo.db.commonds}" auth="Container" type="javax.sql.DataSource"
+ maxActive="${nuxeo.db["max-pool-size"]}" maxIdle="30" maxWait="10000" driverClassName="${nuxeo.db.driver}"
+ url="${nuxeo.db.jdbc.url}" validationQuery="${nuxeo.db.validationQuery}"
+ username="${nuxeo.db.user}" password="${nuxeo.db.password}"
+ accessToUnderlyingConnectionAllowed="true" />
+ </#if>
+
+ </GlobalNamingResources>
+
+ 
+ <Service name="Catalina">
+
+ 
+ 
+
+
+ 
+ <Connector port="${nuxeo.server.http.port}" protocol="HTTP/1.1" URIEncoding="UTF-8"
+<#if nuxeo.server.https.port == "0">
+ address="${nuxeo.bind.address}"
+<#else>
+ address="127.0.0.1"
+ redirectPort="${nuxeo.server.https.port}"
+</#if>
+<#if nuxeo.server.signature??>
+ server="${nuxeo.server.signature}"
+</#if>
+ compression="on"
+ compressionMinSize="512"
+ compressableMimeType="text/css,application/javascript,text/xml,text/html"
+ connectionTimeout="20000" />
+ 
+ 
+<#if nuxeo.server.https.port != "0">
+ 
+ <Connector port="${nuxeo.server.https.port}" protocol="HTTP/1.1" SSLEnabled="true"
+ address="${nuxeo.bind.address}"
+<#if nuxeo.server.signature??>
+ server="${nuxeo.server.signature}"
+</#if>
+ compression="on"
+ compressionMinSize="512"
+ compressableMimeType="text/css,application/javascript,text/xml,text/html"
+ maxThreads="150" scheme="https" secure="true"
+ keystoreFile="${nuxeo.server.https.keystoreFile}"
+ keystorePass="${nuxeo.server.https.keystorePass}"
+ clientAuth="false" sslProtocol="TLS" />
+</#if>
+
+ 
+ <Connector port="${nuxeo.server.ajp.port}" protocol="AJP/1.3"
+ address="${nuxeo.bind.address}"
+ redirectPort="${nuxeo.server.https.port}" />
+
+
+ 
+
+ 
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="${nuxeo.server.jvmRoute}">
+
+ 
+ 
+
+ 
+ 
+
+ 
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ 
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true"
+ autoDeploy="${isWizard?string('true', 'false')}" >
+
+<#if !isWizard>
+ 
+ <Listener className="org.nuxeo.runtime.tomcat.NuxeoDeployer" home="nxserver" />
+</#if>
+
+ 
+ 
+
+ 
+ 
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
new file mode 100644
index 0000000..aa5c457
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
@@ -0,0 +1,107 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+common-base.target=.
+
+nuxeo.server.sdk=false
+nuxeo.server.http.port=8080
+nuxeo.server.ajp.port=8009
+nuxeo.server.https.port=0
+nuxeo.server.tomcat_admin.host=localhost
+nuxeo.server.tomcat_admin.port=8005
+nuxeo.server.jvmRoute=nuxeo
+NuxeoContainer.autoactivation=false
+
+# GlobalNamingResources datasource (not visible from webapp)
+nuxeo.db.embeddedDatasources=true
+nuxeo.db.xaMode=false
+nuxeo.db.commonds=jdbc/nuxeo
+
+nuxeo.db.min-pool-size=5
+nuxeo.db.max-pool-size=100
+nuxeo.db.blocking-timeout-millis=1000
+nuxeo.db.idle-timeout-minutes=5
+nuxeo.db.validationQuery=
+nuxeo.db.sql-exception-sorter=org.nuxeo.runtime.datasource.DatasourceExceptionSorter
+nuxeo.db.user_separator_key=,
+
+nuxeo.vcs.min-pool-size=0
+nuxeo.vcs.max-pool-size=20
+nuxeo.vcs.blocking-timeout-millis=100
+nuxeo.vcs.idle-timeout-minutes=10
+nuxeo.vcs.fulltext.disabled=false
+nuxeo.vcs.fulltext.search.disabled=false
+nuxeo.vcs.noddl=false
+nuxeo.vcs.ddlmode=execute
+nuxeo.vcs.idtype=varchar
+nuxeo.vcs.fulltext.analyzer.language=english
+nuxeo.vcs.optimizations.acl.enabled=true
+nuxeo.vcs.optimizations.path.enabled=true
+
+# Mail server
+mail.store.protocol=pop3
+mail.store.host=localhost
+mail.store.port=110
+mail.store.user=anonymous
+mail.store.password=secret
+# Mail transport
+mail.transport.protocol=smtp
+mail.transport.host=localhost
+mail.transport.port=25
+mail.transport.user=anonymous
+mail.transport.password=secret
+mail.transport.usetls=false
+mail.transport.auth=false
+# User who will receive mail
+mail.user=nobody
+# Enable debugging output from the javamail classes
+mail.debug=false
+mail.from=***@nuxeo.com
+
+nuxeo.core.binarymanager=org.nuxeo.ecm.core.blob.binary.DefaultBinaryManager
+nuxeo.core.binarymanager_key=
+nuxeo.quartz.enable=false
+###
+# Elasticsearch
+elasticsearch.enabled=true
+# Name of the Elasticsearch index for the default document repository
+elasticsearch.indexName=nuxeo
+# Comma separated list of Elasticsearch nodes, if empty use a local in JVM node
+elasticsearch.addressList=
+# Name of the Elasticsearch cluster to join
+elasticsearch.clusterName=nuxeoCluster
+# Number of replicas (not for local node)
+elasticsearch.indexNumberOfReplicas=1
+# Number of shards (not for local node)
+elasticsearch.indexNumberOfShards=5
+# Name of the local node
+elasticsearch.nodeName=nuxeoNode
+# Does the local node accept HTTP request on port 9200
+elasticsearch.httpEnabled=false
+# Network binding. Policy is to accept request from local machine only.
+elasticsearch.networkHost=127.0.0.1
+# Load document model from Elasticsearch result (experimental)
+# if false load from document from VCS
+elasticsearch.fetchDocFromEs=false
+# Comma separated list of CorePageProvider names to supersede by Elasticsearch
+elasticsearch.override.pageproviders=default_search,default_document_suggestion,DEFAULT_DOCUMENT_SUGGESTION,advanced_document_content
+# Reindexing option, number of documents to process per worker @since 6.0-HF02
+elasticsearch.reindex.bucketReadSize=500
+# Reindexing option, number of documents to submit to Elasticsearch per bulk command @since 6.0-HF02
+elasticsearch.reindex.bucketWriteSize=50
+# Maximum size of the indexing thread pool @since 6.0-HF02
+elasticsearch.indexing.maxThreads=4
+# Time to keep the completed indexing worker states @since 6.0-HF02
+elasticsearch.indexing.clearCompletedAfterSeconds=90
+# Display Elasticsearch cluster and nodes information in the admin center @since 6.0-HF06, always true for embedded mode
+elasticsearch.adminCenter.displayClusterInfo=false
+# Reindex the repository content on startup if the index is empty
+elastcisearch.reindex.onStartup=false
+# Use Elasticsearch as a backend for audit logs
+audit.elasticsearch.enabled=false
+# Name of the Elasticsearch index for audit logs
+audit.elasticsearch.indexName=${elasticsearch.indexName}-audit
+# Name of the Elasticsearch index for the uid sequencer
+seqgen.elasticsearch.indexName=${elasticsearch.indexName}-uidgen
+# Migrate audit logs from SQL storage to Elasticsearch indexing, requires audit.elasticsearch.enabled=true
+audit.elasticsearch.migration=false
+# Batch size for audit logs migration, only useful with audit.elasticsearch.migration=true
+audit.elasticsearch.migration.batchSize=1000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
new file mode 100644
index 0000000..4bccf7c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
@@ -0,0 +1,46 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.runtime.datasource.server.contrib">
+
+<#if nuxeo.db.embeddedDatasources == "true">
+ <extension target="org.nuxeo.runtime.datasource" point="datasources">
+<#if nuxeo.db.xaMode == "false">
+ <datasource name="${nuxeo.db.commonds}" driverClassName="${nuxeo.db.driver}"
+ url="${nuxeo.db.jdbc.url}" username="${nuxeo.db.user}" password="${nuxeo.db.password}"
+ maxPoolSize="${nuxeo.db["max-pool-size"]}"
+ minPoolSize="${nuxeo.db["min-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
+ idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
+ sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
+ validationQuery="${nuxeo.db.validationQuery}"
+ accessToUnderlyingConnectionAllowed="true" />
+<#else>
+ <datasource name="${nuxeo.db.commonds}" xaDataSource="${nuxeo.db.xadatasource}"
+ maxPoolSize="${nuxeo.db["max-pool-size"]}"
+ minPoolSize="${nuxeo.db["min-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
+ idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
+ sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
+ validationQuery="${nuxeo.db.validationQuery}"
+ accessToUnderlyingConnectionAllowed="true" >
+<#include "xadatasource-params.ftl" parse=true />
+ </datasource>
+</#if>
+ <link name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/repository_default" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+<#if "${nuxeo.quartz.enable}" == "true">
+ <link name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+</#if>
+ </extension>
+</#if>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
new file mode 100644
index 0000000..11e45a7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
@@ -0,0 +1,118 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="default-repository-config">
+ <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
+ <blobprovider name="default">
+ <class>${nuxeo.core.binarymanager}</class>
+ <property name="path">${repository.binary.store}</property>
+ <property name="key">${nuxeo.core.binarymanager_key}</property>
+ </blobprovider>
+ </extension>
+<#if "${nuxeo.mongodb.server}" == "">
+ <extension target="org.nuxeo.ecm.core.storage.sql.RepositoryService"
+ point="repository">
+ <repository name="default" label="label.default.repository">
+ <pool minPoolSize="${nuxeo.vcs["min-pool-size"]}" maxPoolSize="${nuxeo.vcs["max-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.vcs["blocking-timeout-millis"]}" idleTimeoutMinutes="${nuxeo.vcs["idle-timeout-minutes"]}" />
+ <clustering id="${repository.clustering.id}" enabled="${repository.clustering.enabled}" delay="${repository.clustering.delay}" />
+<#if "${repository.clustering.invalidation}" == "redis">
+ <clusterInvalidatorClass>org.nuxeo.ecm.core.redis.contribs.RedisClusterInvalidator</clusterInvalidatorClass>
+</#if>
+ <noDDL>${nuxeo.vcs.noddl}</noDDL>
+ <ddlMode>${nuxeo.vcs.ddlmode}</ddlMode>
+ <aclOptimizations enabled="${nuxeo.vcs.optimizations.acl.enabled}"/>
+ <pathOptimizations enabled="${nuxeo.vcs.optimizations.path.enabled}"/>
+ <idType>${nuxeo.vcs.idtype}</idType>
+ <indexing>
+<#if "${nuxeo.db.type}" == "postgresql">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
+ analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+<#elseif "${nuxeo.db.type}" == "oracle">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+ 
+<#elseif "${nuxeo.db.type}" == "mssql">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
+ analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
+ <index name="default">
+ 
+ </index>
+ 
+ </fulltext>
+<#elseif "${nuxeo.db.type}" == "mysql">
+ 
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+<#else>
+ 
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" analyzer="org.apache.lucene.analysis.standard.StandardAnalyzer">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+</#if>
+ </indexing>
+<#if "${nuxeo.db.type}" != "mysql">
+ <usersSeparator key="${nuxeo.db.user_separator_key}" />
+</#if>
+<#if "${nuxeo.db.type}" == "mysql">
+ <schema>
+ <field type="largetext">var_ParallelDocumentReview:review_result</field>
+ </schema>
+</#if>
+ </repository>
+ </extension>
+<#else>
+ <extension target="org.nuxeo.ecm.core.storage.mongodb.MongoDBRepositoryService"
+ point="repository">
+ <repository name="default" label="MongoDB Repository">
+ <server>${nuxeo.mongodb.server}</server>
+ <dbname>${nuxeo.mongodb.dbname}</dbname>
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" />
+ </repository>
+ </extension>
+</#if>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
new file mode 100644
index 0000000..9371179
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
@@ -0,0 +1,116 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.index.audit.contrib">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchIndex">
+
+ <elasticSearchIndex name="${audit.elasticsearch.indexName}" type="entry" >
+ <settings>{
+<#if "${elasticsearch.addressList}" != "">
+ "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
+ "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
+</#if>
+ "analysis" : {
+ "filter" : {
+ "truncate_filter" : {
+ "length" : 256,
+ "type" : "truncate"
+ },
+ "word_delimiter_filter" : {
+ "type" : "word_delimiter",
+ "preserve_original" : true
+ },
+ "en_stem_filter" : {
+ "name" : "minimal_english",
+ "type" : "stemmer"
+ },
+ "en_stop_filter" : {
+ "stopwords" : [
+ "_english_"
+ ],
+ "type" : "stop"
+ }
+ },
+ "tokenizer" : {
+ "path_tokenizer" : {
+ "delimiter" : "/",
+ "type" : "path_hierarchy"
+ }
+ },
+ "analyzer" : {
+ "en_analyzer" : {
+ "alias" : "fulltext",
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "en_stop_filter",
+ "en_stem_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "path_analyzer" : {
+ "type" : "custom",
+ "tokenizer" : "path_tokenizer"
+ },
+ "default" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter" ],
+ "tokenizer" : "keyword"
+ }
+ }
+ }
+}
+ </settings>
+ <mapping>
+ {
+ "_all" : {
+ "analyzer" : "fulltext"
+ },
+ "properties" : {
+ "comment" : {
+ "type" : "multi_field",
+ "fields" : {
+ "comment" : {
+ "type" : "string"
+ },
+ "fulltext" : {
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "eventDate": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "logDate": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "docPath": {
+ "type" : "multi_field",
+ "fields" : {
+ "children" : {
+ "search_analyzer" : "keyword",
+ "index_analyzer" : "path_analyzer",
+ "type" : "string"
+ },
+ "docPath" : {
+ "index" : "not_analyzed",
+ "type" : "string"
+ }
+ }
+ }
+ }
+ }
+ </mapping>
+ </elasticSearchIndex>
+
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
new file mode 100644
index 0000000..2fe1e69
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
@@ -0,0 +1,17 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<#assign ppNames="${elasticsearch.override.pageproviders}"?split(",") />
+<component name="org.nuxeo.ecm.platform.query.api.PageProviderservice.replacers.defaultConfig">
+
+ <extension target="org.nuxeo.ecm.platform.query.api.PageProviderService" point="replacers">
+
+ <replacer withClass="org.nuxeo.elasticsearch.provider.ElasticSearchNxqlPageProvider"
+ enabled="${r"${elasticsearch.enabled:=true}"}">
+<#list ppNames as ppName>
+ <provider>${ppName?trim}</provider>
+</#list>
+ </replacer>
+
+ </extension>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
new file mode 100644
index 0000000..0967ae2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
@@ -0,0 +1,255 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.defaultConfig">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+<#if "${elasticsearch.addressList}" == "">
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchLocal">
+ <elasticSearchLocal
+ clusterName="${elasticsearch.clusterName}"
+ nodeName="${elasticsearch.nodeName}"
+ pathData="${nuxeo.data.dir}/elasticsearch"
+ pathLogs="${nuxeo.log.dir}/elasticsearch"
+ httpEnabled="${elasticsearch.httpEnabled}"
+ networkHost="${elasticsearch.networkHost}" />
+ </extension>
+<#else>
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchRemote">
+ <elasticSearchRemote
+ clusterName="${elasticsearch.clusterName}"
+ addressList="${elasticsearch.addressList}"
+ clientTransportSniff="false"
+ clientTransportIgnoreClusterName="false"
+ clientTransportPingTimeout="5s"
+ clientTransportNodesSamplerInterval="5s" />
+ </extension>
+</#if>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchIndex">
+ <elasticSearchIndex name="${elasticsearch.indexName}" type="doc" repository="default">
+ <fetchFromSource>
+ <include>ecm:*</include>
+ <include>dc:*</include>
+ <exclude>ecm:binarytext</exclude>
+ </fetchFromSource>
+
+ <settings>
+{
+<#if "${elasticsearch.addressList}" != "">
+ "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
+ "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
+</#if>
+ "analysis" : {
+ "filter" : {
+ "truncate_filter" : {
+ "length" : 256,
+ "type" : "truncate"
+ },
+ "word_delimiter_filter" : {
+ "type" : "word_delimiter",
+ "preserve_original" : true
+ },
+ "asciifolding_filter" : {
+ "type" : "asciifolding",
+ "preserve_original" : true
+ },
+ "en_stem_filter" : {
+ "name" : "minimal_english",
+ "type" : "stemmer"
+ },
+ "en_stop_filter" : {
+ "stopwords" : [
+ "_english_"
+ ],
+ "type" : "stop"
+ },
+ "fr_elision_filter" : {
+ "articles" : [
+ "c",
+ "l",
+ "m",
+ "t",
+ "qu",
+ "n",
+ "s",
+ "j"
+ ],
+ "type" : "elision"
+ },
+ "fr_stem_filter" : {
+ "name" : "minimal_french",
+ "type" : "stemmer"
+ },
+ "fr_stop_filter" : {
+ "stopwords" : [
+ "_french_"
+ ],
+ "type" : "stop"
+ }
+ },
+ "tokenizer" : {
+ "path_tokenizer" : {
+ "delimiter" : "/",
+ "type" : "path_hierarchy"
+ }
+ },
+ "analyzer" : {
+ "en_analyzer" : {
+ "alias" : "fulltext",
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "en_stop_filter",
+ "en_stem_filter",
+ "asciifolding_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "fr_analyzer" : {
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "fr_stop_filter",
+ "fr_stem_filter",
+ "asciifolding_filter",
+ "fr_elision_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "path_analyzer" : {
+ "type" : "custom",
+ "tokenizer" : "path_tokenizer"
+ },
+ "lowercase_analyzer" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter", "lowercase", "asciifolding" ],
+ "tokenizer" : "keyword"
+ },
+ "default" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter" ],
+ "tokenizer" : "keyword"
+ }
+ }
+ }
+}
+ </settings>
+ <mapping>
+{
+ "_size" : {
+ "enabled" : true
+ },
+ "_all" : {
+ "analyzer" : "fulltext"
+ },
+ "dynamic_templates": [ {
+ "no_thumbnail_template": {
+ "path_match": "thumb:thumbnail.*",
+ "mapping": {
+ "index": "no",
+ "include_in_all": false
+ }
+ }
+ }, {
+ "no_picture_template": {
+ "path_match": "picture:views.*",
+ "mapping": {
+ "index": "no",
+ "include_in_all": false
+ }
+ }
+ } ],
+ "properties" : {
+ "dc:title" : {
+ "type" : "multi_field",
+ "fields" : {
+ "dc:title" : {
+ "type" : "string"
+ },
+ "fulltext" : {
+ "boost": 2,
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "dc:description" : {
+ "type" : "multi_field",
+ "fields" : {
+ "dc:description" : {
+ "index" : "no",
+ "include_in_all" : true,
+ "type" : "string"
+ },
+ "fulltext" : {
+ "boost": 1.5,
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "note:note" : {
+ "type" : "multi_field",
+ "fields" : {
+ "note:note" : {
+ "index" : "no",
+ "include_in_all" : true,
+ "type" : "string"
+ },
+ "fulltext" : {
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "ecm:binarytext" : {
+ "type" : "string",
+ "index" : "no",
+ "include_in_all" : true
+ },
+ "ecm:path" : {
+ "type" : "multi_field",
+ "fields" : {
+ "children" : {
+ "search_analyzer" : "keyword",
+ "index_analyzer" : "path_analyzer",
+ "type" : "string"
+ },
+ "ecm:path" : {
+ "index" : "not_analyzed",
+ "type" : "string"
+ }
+ }
+ },
+ "ecm:pos": {
+ "type": "integer"
+ },
+ "dc:created": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "dc:modified": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "common:icon": {
+ "type": "string",
+ "index" : "no",
+ "include_in_all" : false
+ }
+ }
+}
+ </mapping>
+
+ </elasticSearchIndex>
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
new file mode 100644
index 0000000..156d74f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
@@ -0,0 +1,31 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.index.sequence.contrib">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
+
+ <elasticSearchIndex name="${seqgen.elasticsearch.indexName}" type="seqId">
+
+ <settings>
+ {
+ "number_of_shards" : 1,
+ "auto_expand_replicas" : "0-all"
+ }
+ </settings>
+
+ <mapping>
+ {
+ "_source" : {"enabled": false},
+ "_all" : {"enabled": false},
+ "_type" : {"index": "no"},
+ "enabled" : false
+ }
+ </mapping>
+
+ </elasticSearchIndex>
+
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
new file mode 100644
index 0000000..a259904
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
@@ -0,0 +1,53 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.redis.config">
+ <require>org.nuxeo.ecm.core.work.config</require>
+
+<#if "${nuxeo.redis.enabled}" == "true">
+ <extension target="org.nuxeo.ecm.core.redis"
+ point="configuration">
+<#if "${nuxeo.redis.ha.enabled}" == "true">
+ <sentinel>
+ <master>${nuxeo.redis.ha.master}</master>
+ <failoverTimeout>${nuxeo.redis.ha.timeout}</failoverTimeout>
+<#assign names="${nuxeo.redis.ha.hosts}"?split(",") />
+<#list names as name>
+ <host name="${name}" port="${nuxeo.redis.ha.port}"/>
+</#list>
+ <password>${nuxeo.redis.password}</password>
+ <database>${nuxeo.redis.database}</database>
+ <timeout>${nuxeo.redis.timeout}</timeout>
+ <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
+ <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
+ <prefix>${nuxeo.redis.prefix}</prefix>
+ </sentinel>
+<#else>
+ <server>
+ <host>${nuxeo.redis.host}</host>
+ <port>${nuxeo.redis.port}</port>
+ <password>${nuxeo.redis.password}</password>
+ <database>${nuxeo.redis.database}</database>
+ <timeout>${nuxeo.redis.timeout}</timeout>
+ <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
+ <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
+ <prefix>${nuxeo.redis.prefix}</prefix>
+ </server>
+</#if>
+ </extension>
+
+
+<#if "${nuxeo.lock.manager}" == "redis">
+  <extension target="org.nuxeo.ecm.core.storage.lock.LockManagerService" point="lockmanager">
+    <lockmanager name="default" class="org.nuxeo.ecm.core.redis.contribs.RedisLockManager" />
+  </extension>
+</#if>
+
+<#if "${nuxeo.work.queuing}" == "redis">
+ <extension target="org.nuxeo.ecm.core.work.service" point="implementation">
+ <queuing class="org.nuxeo.ecm.core.redis.contribs.RedisWorkQueuing"/>
+ </extension>
+</#if>
+</#if>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
new file mode 100644
index 0000000..6f8e4b2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
@@ -0,0 +1 @@
+org.nuxeo.ecm.webengine.skinPathPrefix=${org.nuxeo.ecm.contextPath}/site/skin
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
new file mode 100644
index 0000000..f8b8c71
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
@@ -0,0 +1,28 @@
+<#escape x as x?xml>
+<#if "${nuxeo.db.type}" == "postgresql">
+ <property name="ServerName">${nuxeo.db.host}</property>
+ <property name="PortNumber">${nuxeo.db.port}</property>
+ <property name="DatabaseName">${nuxeo.db.name}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#elseif "${nuxeo.db.type}" == "oracle">
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#elseif "${nuxeo.db.type}" == "mssql">
+ <property name="ServerName">${nuxeo.db.host}</property>
+ <property name="PortNumber">${nuxeo.db.port}</property>
+ <property name="DatabaseName">${nuxeo.db.name}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+ <property name="UseCursors">true</property>
+<#elseif "${nuxeo.db.type}" == "mysql">
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#else>
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+</#if>
+</#escape>
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
new file mode 100644
index 0000000..c4c50fa
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
@@ -0,0 +1 @@
+<META HTTP-EQUIV="refresh" CONTENT="0;URL=${org.nuxeo.ecm.contextPath}">
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
new file mode 100644
index 0000000..d57f246
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<container>
+
+ <template name="application" src="META-INF/templates/application.xml"
+ installPath="META-INF/application.xml" required="true" />
+
+ <template name="web" src="META-INF/templates/web.xml" installPath="nuxeo.war/WEB-INF/web.xml"
+ required="true" />
+
+ <template name="faces-config" src="META-INF/templates/faces-config.xml"
+ installPath="nuxeo.war/WEB-INF/faces-config.xml" required="true" />
+
+ <template name="pages" src="META-INF/templates/pages.xml"
+ installPath="nuxeo.war/WEB-INF/pages.xml" required="true" />
+
+ <template name="components" src="META-INF/templates/components.xml"
+ installPath="nuxeo.war/WEB-INF/components.xml" required="true" />
+
+ <template name="jaxws" src="META-INF/templates/sun-jaxws.xml"
+ installPath="nuxeo.war/WEB-INF/sun-jaxws.xml" required="false" />
+
+ <directory>bundles</directory>
+ <directory>plugins</directory>
+
+ <install>
+ <property name="war" value="/nuxeo.war" />
+ <property name="datasources" value="datasources" />
+
+ 
+ <delete path="/META-INF/application.xml" />
+ </install>
+</container>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
new file mode 100644
index 0000000..d4caeca
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
+
+ <display-name>Nuxeo EP</display-name>
+
+ %{MODULE}%
+
+ <module>
+ <web>
+ <web-uri>nuxeo.war</web-uri>
+ <context-root>${org.nuxeo.ecm.contextPath}</context-root>
+ </web>
+ </module>
+
+</application>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
new file mode 100644
index 0000000..44f28e2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
@@ -0,0 +1,17 @@
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:mail="http://jboss.com/products/seam/mail">
+
+ <component name="org.jboss.seam.core.init">
+ <property name="debug">false</property>
+ <property name="myFacesLifecycleBug">false</property>
+ <property name="jndiPattern">nuxeo/#{ejbName}/local</property>
+ </component>
+
+ <component name="org.jboss.seam.core.manager">
+ %{SEAM_CORE_MANAGER}%
+ </component>
+
+ 
+ <mail:mailSession sessionJndiName="java:/Mail" />
+
+</components>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
new file mode 100644
index 0000000..8445332
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+ <factory>
+
+ %{FACTORY}%
+
+ </factory>
+
+ %{NAVIGATION-RULE}%
+
+ <navigation-rule>
+
+ %{NAVIGATION}%
+
+ </navigation-rule>
+
+ %{MANAGED-BEAN}%
+
+ 
+ <application>
+
+ %{APPLICATION}%
+
+ %{APPLICATION_LOCALE}%
+
+ </application>
+
+ <lifecycle>
+
+ %{PHASE-LISTENER}%
+
+ </lifecycle>
+
+ 
+
+ %{COMPONENT}%
+
+ <render-kit>
+
+ %{RENDERER}%
+
+ </render-kit>
+
+ %{CONVERTER}%
+
+ %{VALIDATOR}%
+
+</faces-config>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
new file mode 100644
index 0000000..0cb9d06
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
@@ -0,0 +1,37 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+ <deployment>
+ <exclude-subsystems>
+ <subsystem name="jpa"/>
+ <subsystem name="ejb3"/>
+ <subsystem name="webservices" />
+ <subsystem name="jsf" />
+ <subsystem name="jaxrs" />
+ <subsystem name="weld" />
+ <subsystem name="pojo" />
+ <subsystem name="remoting" />
+ <subsystem name="sar" />
+ <subsystem name="io.understow.jsp"/>
+ </exclude-subsystems>
+
+ <exclusions>
+ <module name="org.hibernate" />
+ <module name="org.hibernate.validator" />
+ </exclusions>
+
+ <dependencies>
+ <module name="org.apache.commons.lang" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.log4j" />
+ <module name="org.jboss.logging" />
+ <module name="org.jboss.logging.jul-to-slf4j-stub" />
+ <module name="org.jboss.logmanager" />
+ <module name="org.slf4j" />
+ <module name="org.slf4j.impl" />
+ <module name="javax.servlet.api"/>
+ <module name="javax.jws.api"/>
+ <module name="javax.xml.soap.api"/>
+ <module name="io.undertow.jsp"/>
+ <module name="org.apache.xerces"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
new file mode 100644
index 0000000..5dd4f6c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_0.dtd">
+
+<jboss-web>
+
+ <context-root>${org.nuxeo.ecm.contextPath}</context-root>
+
+</jboss-web>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
new file mode 100644
index 0000000..da585a4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+
+ %{PAGES}%
+
+</pages>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
new file mode 100644
index 0000000..3ca0a97
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ %{LISTENER}%
+
+ %{EXCEPTION-FILTER}%
+
+ %{CORS-FILTER}%
+
+ %{AUTH-FILTER}%
+
+ %{STD-AUTH-FILTER}%
+
+ 
+ %{FIRST-FILTER}%
+
+ %{FILTER}%
+
+ %{FILTER-MAPPING}%
+
+ %{CONTEXT-PARAM}%
+
+ %{CONTEXT-PARAM-RICHFACES}%
+
+ %{LOGIN-CONFIG}%
+
+ %{SERVLET}%
+
+ %{SERVLET-MAPPING}%
+
+ %{ERROR-PAGE}%
+
+ %{SECURITY-CONSTRAINT}%
+
+ %{LAST-SERVLET}%
+
+ <security-role>
+ <description>The role required to access restricted content</description>
+ <role-name>admin</role-name>
+ </security-role>
+
+ <security-role>
+ <description>The role required to access restricted content</description>
+ <role-name>regular</role-name>
+ </security-role>
+
+ <session-config>
+ <session-timeout>${session.timeout}</session-timeout>
+ </session-config>
+
+</web-app>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
new file mode 100644
index 0000000..08bbdd4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
@@ -0,0 +1,2 @@
+This folder contains the Nuxeo modules
+These modules are required to run the nuxeo framework
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
new file mode 100644
index 0000000..332a58d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<component
+ name="org.nuxeo.server.auth">
+
+ 
+ <require>org.nuxeo.ecm.platform.ui.web.auth.defaultConfig</require>
+ <require>org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService
+ </require>
+
+ <extension
+ target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
+ point="specificChains">
+
+ <specificAuthenticationChain
+ name="Site">
+ <urlPatterns>
+ <url>(.*)/site.*</url>
+ </urlPatterns>
+
+ <replacementChain>
+ <plugin>BASIC_AUTH2</plugin>
+ </replacementChain>
+ </specificAuthenticationChain>
+ </extension>
+
+ <extension
+ target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
+ point="authenticators">
+
+ <authenticationPlugin
+ name="BASIC_AUTH2"
+ enabled="true"
+ class="org.nuxeo.ecm.platform.ui.web.auth.plugins.BasicAuthenticator">
+ <needStartingURLSaving>false</needStartingURLSaving>
+ <stateful>false</stateful>
+ <parameters>
+ <parameter
+ name="RealmName">Nuxeo Server</parameter>
+ <parameter
+ name="AutoPrompt">true</parameter>
+ </parameters>
+ </authenticationPlugin>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
new file mode 100644
index 0000000..1921626
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
@@ -0,0 +1,10 @@
+<#escape x as x?xml>
+org.nuxeo.runtime.trackers.files.threadstracking.config
+<#if elasticsearch.enabled != "true" || audit.elasticsearch.enabled != "true">
+org.nuxeo.elasticsearch.audit.contrib
+org.nuxeo.elasticsearch.index.audit.contrib
+org.nuxeo.ecm.platform.audit.PageProviderservice.es.contrib
+org.nuxeo.ecm.platform.audit.search.contrib
+org.nuxeo.admin.audit.es.contentView.contrib
+</#if>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
new file mode 100644
index 0000000..7f9654d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.cache.config">
+
+ <#if "${nuxeo.redis.enabled}" == "true" && "${nuxeo.cache.type}" == "redis">
+ <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisCache" />
+ <#else>
+ <#assign className = "org.nuxeo.ecm.core.cache.InMemoryCacheImpl" />
+ </#if>
+
+ <extension target="org.nuxeo.ecm.core.cache.CacheService"
+ point="caches">
+ <cache name="default-cache" class="${className}">
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-user-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-user-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-group-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-group-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-user-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-user-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-group-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-group-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-digestauth-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-digestauth-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
new file mode 100644
index 0000000..2ddd1b2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
@@ -0,0 +1,369 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.directory.ldap.storage.users">
+
+<#if "${nuxeo.directory.type}" == "default">
+ 
+<#else>
+ <implementation class="org.nuxeo.ecm.directory.ldap.LDAPDirectoryDescriptor" />
+ <implementation class="org.nuxeo.ecm.directory.ldap.LDAPServerDescriptor" />
+ <require>org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory</require>
+
+ 
+ <require>org.nuxeo.ecm.directory.sql.storage</require>
+ <require>org.nuxeo.ecm.platform.usermanager.UserManagerImpl</require>
+
+ <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
+ point="servers">
+
+ 
+ <server name="default">
+
+ <ldapUrl>${nuxeo.ldap.url}</ldapUrl>
+ 
+
+ 
+ <bindDn>${nuxeo.ldap.binddn}</bindDn>
+ <bindPassword>${nuxeo.ldap.bindpassword}</bindPassword>
+ 
+ <retries>${nuxeo.ldap.retries}</retries>
+ </server>
+
+ </extension>
+
+ <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
+ point="directories">
+
+ <directory name="ldapUserDirectory">
+ <server>default</server>
+ <schema>user</schema>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+
+ <searchBaseDn>${nuxeo.ldap.user.searchBaseDn}</searchBaseDn>
+ <searchClass>${nuxeo.ldap.user.searchClass}</searchClass>
+ 
+<#if "${nuxeo.ldap.user.searchFilter}" != "">
+ <searchFilter>${nuxeo.ldap.user.searchFilter}</searchFilter>
+</#if>
+
+ 
+ <searchScope>${nuxeo.ldap.user.searchScope}</searchScope>
+
+ 
+ <substringMatchType>${nuxeo.ldap.user.searchBehavior}</substringMatchType>
+
+ <readOnly>${nuxeo.ldap.user.readonly}</readOnly>
+
+ 
+ <cacheEntryName>ldap-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>ldap-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ 
+ <missingIdFieldCase>lower</missingIdFieldCase>
+
+ 
+ <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
+
+ 
+ <queryTimeLimit>0</queryTimeLimit>
+
+ <creationBaseDn>ou=people,dc=example,dc=com</creationBaseDn>
+ <creationClass>top</creationClass>
+ <creationClass>person</creationClass>
+ <creationClass>organizationalPerson</creationClass>
+ <creationClass>inetOrgPerson</creationClass>
+
+ <rdnAttribute>${nuxeo.ldap.user.mapping.rdn}</rdnAttribute>
+ <fieldMapping name="username">${nuxeo.ldap.user.mapping.username}</fieldMapping>
+ <fieldMapping name="password">${nuxeo.ldap.user.mapping.password}</fieldMapping>
+ <fieldMapping name="firstName">${nuxeo.ldap.user.mapping.firstname}</fieldMapping>
+ <fieldMapping name="lastName">${nuxeo.ldap.user.mapping.lastname}</fieldMapping>
+ <fieldMapping name="company">${nuxeo.ldap.user.mapping.company}</fieldMapping>
+ <fieldMapping name="email">${nuxeo.ldap.user.mapping.email}</fieldMapping>
+
+ <references>
+<#if "${nuxeo.user.group.storage}" == "default">
+ <inverseReference field="groups" directory="ldapGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <inverseReference field="groups" directory="sqlGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+<#if "${nuxeo.user.group.storage}" == "ldapUserMultiGroup" || "${nuxeo.user.group.storage}" == "multiUserGroup">
+ <inverseReference field="groups" directory="multiGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+ </references>
+
+ </directory>
+
+<#if "${nuxeo.user.group.storage}" != "userLdapOnly" && "${nuxeo.user.group.storage}" != "multiUserSqlGroup">
+ <directory name="ldapGroupDirectory">
+
+ 
+ <server>default</server>
+
+ <schema>group</schema>
+ <idField>groupname</idField>
+
+ <searchBaseDn>${nuxeo.ldap.group.searchBaseDn}</searchBaseDn>
+ <searchFilter>
+ ${nuxeo.ldap.group.searchFilter}
+ </searchFilter>
+ <searchScope>${nuxeo.ldap.group.searchScope}</searchScope>
+
+ <readOnly>${nuxeo.ldap.group.readonly}</readOnly>
+
+ 
+ <cacheEntryName>ldap-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>ldap-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <creationBaseDn>ou=groups,dc=example,dc=com</creationBaseDn>
+ <creationClass>top</creationClass>
+ <creationClass>groupOfUniqueNames</creationClass>
+
+ 
+ <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
+
+ 
+ <queryTimeLimit>${nuxeo.ldap.query.timeLimit}</queryTimeLimit>
+
+ <rdnAttribute>${nuxeo.ldap.group.mapping.rdn}</rdnAttribute>
+ <fieldMapping name="groupname">${nuxeo.ldap.group.mapping.name}</fieldMapping>
+ 
+ <fieldMapping name="grouplabel">${nuxeo.ldap.group.mapping.label}</fieldMapping>
+
+ <references>
+ 
+ <ldapReference field="members" directory="ldapUserDirectory"
+ forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
+ dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
+
+ <ldapReference field="subGroups" directory="ldapGroupDirectory"
+ forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
+ dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
+
+<#if "${nuxeo.user.group.storage}" == "default">
+ <inverseReference field="parentGroups" directory="ldapGroupDirectory"
+<#else>
+ <inverseReference field="parentGroups" directory="multiGroupDirectory"
+</#if>
+ dualReferenceField="subGroups" />
+
+ 
+ <ldapTreeReference field="directChildren" directory="unitDirectory"
+ scope="onelevel" />
+ <ldapTreeReference field="children" directory="unitDirectory"
+ scope="subtree" />
+
+ </references>
+
+ </directory>
+</#if>
+ </extension>
+
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.directory.type}" == "multi">
+ <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
+ <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+
+<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <directory name="sqlUserDirectory">
+
+ <schema>user</schema>
+
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+
+ <table>users</table>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
+ <autoincrementIdField>false</autoincrementIdField>
+ <computeMultiTenantId>false</computeMultiTenantId>
+ <dataFile>users.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <querySizeLimit>50</querySizeLimit>
+
+ <cacheEntryName>sql-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <inverseReference field="groups" directory="sqlGroupDirectory"
+ dualReferenceField="members" />
+ </references>
+
+ </directory>
+</#if>
+<#if "${nuxeo.directory.type}" == "multi" || "${nuxeo.user.group.storage}" == "userLdapOnly">
+ <directory name="sqlGroupDirectory">
+
+ <schema>group</schema>
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+ <table>groups</table>
+ <idField>groupname</idField>
+ <dataFile>groups.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <autoincrementIdField>false</autoincrementIdField>
+
+ <cacheEntryName>sql-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <tableReference field="members" directory="ldapUserDirectory"
+<#else>
+ <tableReference field="members" directory="multiUserDirectory"
+</#if>
+ table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
+ dataFile="user2group.csv" />
+<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <tableReference field="subGroups" directory="multiGroupDirectory"
+<#else>
+ <tableReference field="subGroups" directory="sqlGroupDirectory"
+</#if>
+ table="group2group" sourceColumn="parentGroupId"
+ targetColumn="childGroupId" schema="group2group" />
+ <inverseReference field="parentGroups" directory="sqlGroupDirectory"
+ dualReferenceField="subGroups" />
+ </references>
+
+ </directory>
+</#if>
+ </extension>
+</#if>
+
+<#if "${nuxeo.directory.type}" == "multi">
+ <extension
+ target="org.nuxeo.ecm.directory.multi.MultiDirectoryFactory"
+ point="directories">
+
+ <directory name="multiUserDirectory">
+ <schema>user</schema>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+
+ <source name="userSQLsource" creation="true">
+ <subDirectory name="sqlUserDirectory" />
+ </source>
+
+ <source name="userLDAPsource">
+ <subDirectory name="ldapUserDirectory" />
+ </source>
+ </directory>
+
+ <directory name="multiGroupDirectory">
+ <schema>group</schema>
+ <idField>groupname</idField>
+
+ <source name="groupSQLsource" creation="true">
+ <subDirectory name="sqlGroupDirectory" />
+ </source>
+
+ <source name="groupLDAPsource">
+ <subDirectory name="ldapGroupDirectory" />
+ </source>
+ </directory>
+
+ </extension>
+</#if>
+
+ <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
+
+ <userManager>
+ <userCacheName>default-cache</userCacheName>
+<#if "${nuxeo.ldap.defaultAdministratorId}" != "">
+ <defaultAdministratorId>${nuxeo.ldap.defaultAdministratorId}</defaultAdministratorId>
+</#if>
+<#if "${nuxeo.ldap.defaultMembersGroup}" != "">
+ <defaultGroup>${nuxeo.ldap.defaultMembersGroup}</defaultGroup>
+</#if>
+ <users>
+<#if "${nuxeo.directory.type}" == "ldap" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <directory>ldapUserDirectory</directory>
+<#else>
+ <directory>multiUserDirectory</directory>
+</#if>
+<#if "${nuxeo.user.emergency.enable}" == "true">
+ <virtualUser id="${nuxeo.user.emergency.username}" searchable="false">
+ <password>${nuxeo.user.emergency.password}</password>
+ <property name="firstName">${nuxeo.user.emergency.firstname}</property>
+ <property name="lastName">${nuxeo.user.emergency.lastname}</property>
+ <group>administrators</group>
+ </virtualUser>
+</#if>
+<#if "${nuxeo.user.anonymous.enable}" == "true">
+ <anonymousUser id="Guest">
+ <property name="firstName">Guest</property>
+ <property name="lastName">User</property>
+ </anonymousUser>
+</#if>
+ </users>
+ <groups>
+<#if "${nuxeo.user.group.storage}" == "default">
+ <directory>ldapGroupDirectory</directory>
+<#elseif "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <directory>sqlGroupDirectory</directory>
+<#else>
+ <directory>multiGroupDirectory</directory>
+</#if>
+ </groups>
+ </userManager>
+
+ </extension>
+</#if>
+
+</component>
+
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
new file mode 100644
index 0000000..da08313
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.directory.sql.storage">
+
+ <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
+
+ <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
+ <require>org.nuxeo.ecm.platform.digestauth.config</require>
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+
+ <directory name="userDirectory">
+
+ <schema>user</schema>
+
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+
+ <table>users</table>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
+ <autoincrementIdField>false</autoincrementIdField>
+ <computeMultiTenantId>false</computeMultiTenantId>
+ <dataFile>users.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <querySizeLimit>50</querySizeLimit>
+
+ 
+ <cacheEntryName>sql-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <inverseReference field="groups" directory="groupDirectory"
+ dualReferenceField="members" />
+ </references>
+
+ </directory>
+
+ <directory name="groupDirectory">
+
+ <schema>group</schema>
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+ <table>groups</table>
+ <idField>groupname</idField>
+ <dataFile>groups.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <autoincrementIdField>false</autoincrementIdField>
+
+ 
+ <cacheEntryName>sql-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <tableReference field="members" directory="userDirectory"
+ table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
+ dataFile="user2group.csv" />
+ 
+ <tableReference field="subGroups" directory="groupDirectory"
+ table="group2group" sourceColumn="parentGroupId"
+ targetColumn="childGroupId" schema="group2group" />
+ <inverseReference field="parentGroups" directory="groupDirectory"
+ dualReferenceField="subGroups" />
+ </references>
+
+ </directory>
+
+ <directory name="digestauth">
+ <cacheEntryName>sql-digestauth-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-digestauth-entry-cache-without-references</cacheEntryWithoutReferencesName>
+ <schema>digestauth</schema>
+ <table>digestauth</table>
+ <autoincrementIdField>false</autoincrementIdField>
+ <dataSource>java:/nxsqldirectory</dataSource>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ </directory>
+
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
new file mode 100644
index 0000000..6a68e21
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
@@ -0,0 +1,6 @@
+## DO NOT EDIT - This file must be filled at packaging time, here are required properties:
+#org.nuxeo.distribution.name=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.server=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.version=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.date=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.package=PACKAGING_MUST_FILL_IT
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
new file mode 100644
index 0000000..8726ebd
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
@@ -0,0 +1,4 @@
+jms.useTransactedConnection=True
+jms.isDeliveryPersistent=False
+jms.isDisableMessageID=True
+jms.isDisableMessageTimestamp=True
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
new file mode 100644
index 0000000..d111c11
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
+ <documentation>
+ Login modules used on Tomcat
+ @author Bogdan Stefanescu (***@nuxeo.com)
+ </documentation>
+
+
+ <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
+
+ <domain name="nuxeo-system-login">
+ <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
+ <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
+ <option name="password-stacking">true</option>
+ <option name="multi-threaded">true</option>
+ </login-module>
+ </domain>
+
+ <domain name="nuxeo-client-login">
+ <login-module code="org.nuxeo.ecm.platform.login.NuxeoLoginModule"
+ flag="required">
+ <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
+ <option name="useUserIdentificationInfoCB">true</option>
+ </login-module>
+ <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
+ <option name="password-stacking">true</option>
+ <option name="restore-login-identity">true</option>
+ <option name="multi-threaded">true</option>
+ </login-module>
+ </domain>
+
+
+ <domain name="nuxeo-webengine">
+ <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
+ flag = "required">
+ <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
+ <option name="useUserIdentificationInfoCB">true</option>
+ </login-module>
+ 
+ </domain>
+
+ </extension>
+
+
+</component>
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
new file mode 100644
index 0000000..3f99931
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.digestauth.config">
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+ <directory name="digestauth">
+ <schema>digestauth</schema>
+ <table>digestauth</table>
+ <autoincrementIdField>false</autoincrementIdField>
+ <dataSource>java:/nxsqldirectory</dataSource>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ </directory>
+ </extension>
+
+ <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
+ <userManager>
+ <digestAuthDirectory>digestauth</digestAuthDirectory>
+ <digestAuthRealm>NUXEO</digestAuthRealm>
+ <userCacheName>default-cache</userCacheName>
+ </userManager>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
new file mode 100644
index 0000000..cc74965
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.runtime.management.ServerLocatorContrib">
+
+ 
+
+ 
+ <extension target="org.nuxeo.runtime.management.ServerLocator"
+ point="locators">
+ <locator domain="jboss" default="true" />
+ </extension>
+
+ 
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
new file mode 100644
index 0000000..f70ad04
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ 
+ <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NuxeoMessages">
+ <attribute name="JNDIName">topic/NuxeoMessages</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ 
+ <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NXPMessages">
+ <attribute name="JNDIName">topic/NXPMessages</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+</server>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
new file mode 100644
index 0000000..d72936f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.ear.config.notification">
+
+ <extension
+ target="org.nuxeo.ecm.platform.ec.notification.service.NotificationService"
+ point="generalSettings">
+ <settings>
+ <serverPrefix>${nuxeo.url}/</serverPrefix>
+ <eMailSubjectPrefix>${nuxeo.notification.eMailSubjectPrefix} </eMailSubjectPrefix>
+ <mailSessionJndiName>${jndi.base}/Mail</mailSessionJndiName>
+ </settings>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
new file mode 100644
index 0000000..670b79d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
@@ -0,0 +1,4 @@
+# avoid initializing nuxeo relations at startup (for faster startup)
+org.nuxeo.ecm.platform.relations.initOnStartup=false
+
+jndi.java.mail=${jndi.base}/Mail
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
new file mode 100644
index 0000000..f8f924d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
@@ -0,0 +1,4 @@
+# Properties for exporting search results to CSV
+org.nuxeo.ecm.webapp.search.csv.separator=,
+org.nuxeo.ecm.webapp.search.csv.quotechar="
+org.nuxeo.ecm.webapp.search.csv.endofline=\n
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
new file mode 100644
index 0000000..3a55311
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
@@ -0,0 +1,32 @@
+# application instance config
+org.nuxeo.ecm.instance.host=localhost
+
+# runtime remoting config
+org.nuxeo.runtime.server.locator=socket://${nuxeo.bind.address}:62474/?datatype=nuxeo
+
+# streaming config
+org.nuxeo.runtime.streaming.isServer=false
+org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
+
+# runtime management config
+org.nuxeo.runtime.management.exist=false
+org.nuxeo.runtime.management.serverRmiPort=2100
+
+# needed for the JNDI auto configuration of clients
+# you need to change this if using JNDI through HTTP
+nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
+nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+
+# for email attachment, to decode the encoded(utf) filenames.
+mail.mime.decodefilename=true
+
+# LiveEdit configuration detection (client/server/both)
+org.nuxeo.ecm.platform.liveedit.config=client
+
+# Uncomment to activate Nuxeo Runtime REST API for Management
+# accessible via http://server:port/nuxeo/site/server/html on JBoss
+#org.nuxeo.runtime.rest.management=true
+
+# size limit to use the specific download servlet for big files (use SI or IEC prefix)
+#org.nuxeo.big.file.size.limit=5Mi
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
new file mode 100644
index 0000000..d38430f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.mail.scheduler.config">
+
+ <extension
+ target="org.nuxeo.ecm.platform.scheduler.core.service.SchedulerRegistryService"
+ point="schedule">
+
+ <schedule id="mailReceivedSchedule">
+ <eventId>MailReceivedEvent</eventId>
+ <eventCategory>default</eventCategory>
+ 
+ <cronExpression>0 0/30 * * * ?</cronExpression>
+ </schedule>
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
new file mode 100644
index 0000000..57ab876
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.convert.ooomanager.config.default">
+ <require>org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent</require>
+
+ <extension
+ target="org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent"
+ point="oooManagerConfig">
+
+ <OOoManager>
+
+ 
+ 
+ <portNumbers>
+ <portNumber>2003</portNumber>
+ </portNumbers>
+
+ 
+
+ </OOoManager>
+ </extension>
+</component>
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
new file mode 100644
index 0000000..06b5440
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
@@ -0,0 +1,14 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = NON_CLUSTERED
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
new file mode 100644
index 0000000..5eace81
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
@@ -0,0 +1,13 @@
+# Jena database type and transaction mode
+<#if "${nuxeo.db.type}" == "postgresql">
+org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL
+<#elseif "${nuxeo.db.type}" == "oracle">
+org.nuxeo.ecm.sql.jena.databaseType=Oracle
+<#elseif "${nuxeo.db.type}" == "mssql">
+org.nuxeo.ecm.sql.jena.databaseType=MsSQL
+<#elseif "${nuxeo.db.type}" == "mysql">
+org.nuxeo.ecm.sql.jena.databaseType=MySQL
+<#else>
+# We tell Jena we're using Derby even if the database is actually h2. This works.
+org.nuxeo.ecm.sql.jena.databaseType=Derby
+</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
new file mode 100644
index 0000000..7aadb20
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.transient.store.config">
+
+ <#if "${nuxeo.redis.enabled}" == "true">
+ <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisTransientStore" />
+ <#else>
+ <#assign className = "org.nuxeo.ecm.core.transientstore.SimpleTransientStore" />
+ </#if>
+
+ <extension target="org.nuxeo.ecm.core.transientstore.TransientStorageComponent"
+ point="store">
+
+ <store name="default" class="${className}">
+ <targetMaxSizeMB>-1</targetMaxSizeMB>
+ <absoluteMaxSizeMB>-1</absoluteMaxSizeMB>
+ <firstLevelTTL>240</firstLevelTTL>
+ <secondLevelTTL>10</secondLevelTTL>
+ <minimalRetention>10</minimalRetention>
+ </store>
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
new file mode 100644
index 0000000..7a82b36
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
@@ -0,0 +1,4 @@
+org.nuxeo.app.preprocessing=false
+<#if "${nuxeo.server.sdk}" == "true">
+org.nuxeo.app.installReloadTimer=true
+</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
new file mode 100644
index 0000000..be3823d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
@@ -0,0 +1 @@
+This folder contains static libraries used by nuxeo components
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
new file mode 100644
index 0000000..109d04b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
@@ -0,0 +1,56 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common-base
+
+org.nuxeo.ecm.instance.description=Nuxeo
+
+org.nuxeo.runtime.server.enabled=false
+facelets.REFRESH_PERIOD=-1
+org.nuxeo.ecm.platform.liveedit.autoversioning=none
+
+zip.entry.encoding=
+
+# default|ldap|multi
+nuxeo.directory.type=default
+# (default|userLdapOnly) || (multiUserGroup|multiUserSqlGroup|ldapUserMultiGroup)
+nuxeo.user.group.storage=default
+nuxeo.ldap.url=
+nuxeo.ldap.binddn=
+nuxeo.ldap.bindpassword=
+nuxeo.ldap.retries=5
+nuxeo.ldap.query.sizeLimit=200
+nuxeo.ldap.query.timeLimit=0
+nuxeo.ldap.user.searchBaseDn=
+nuxeo.ldap.user.searchClass=person
+nuxeo.ldap.user.searchFilter=
+nuxeo.ldap.user.searchScope=onelevel
+nuxeo.ldap.user.searchBehavior=subany
+nuxeo.ldap.user.readonly=true
+nuxeo.ldap.user.mapping.rdn=
+nuxeo.ldap.user.mapping.username=
+nuxeo.ldap.user.mapping.password=
+nuxeo.ldap.user.mapping.firstname=
+nuxeo.ldap.user.mapping.lastname=
+nuxeo.ldap.user.mapping.email=
+nuxeo.ldap.user.mapping.company=
+nuxeo.ldap.group.searchBaseDn=
+nuxeo.ldap.group.searchFilter=(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))
+nuxeo.ldap.group.searchScope=subtree
+nuxeo.ldap.group.readonly=true
+nuxeo.ldap.group.mapping.rdn=
+nuxeo.ldap.group.mapping.name=
+nuxeo.ldap.group.mapping.label=
+nuxeo.ldap.group.mapping.members.staticAttributeId=uniqueMember
+nuxeo.ldap.group.mapping.members.dynamicAttributeId=memberURL
+nuxeo.ldap.defaultAdministratorId=
+nuxeo.ldap.defaultMembersGroup=members
+nuxeo.user.anonymous.enable=true
+nuxeo.user.emergency.enable=true
+nuxeo.user.emergency.username=MyAdministrator
+nuxeo.user.emergency.password=secret
+nuxeo.user.emergency.firstname=
+nuxeo.user.emergency.lastname=
+
+nuxeo.cache.type=redis
+nuxeo.cache.ttl=20
+nuxeo.cache.maxsize=100
+nuxeo.cache.concurrencylevel=500
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png
new file mode 100644
index 0000000..5cc89ab
Binary files /dev/null and b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png
new file mode 100644
index 0000000..873245f
Binary files /dev/null and b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
new file mode 100644
index 0000000..530a02b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
@@ -0,0 +1,124 @@
+<html>
+ <head>
+ <title>Nuxeo Server</title>
+ <link href="img/favicon.png" type="image/png" rel="icon">
+ <style type="text/css">
+
+
+</style>
+ </head>
+ <body>
+ <div class="header"><img src="img/nuxeo.png"></div>
+ <div class="welcome">
+ <p class="welcomeText">
+ Welcome to your Nuxeo server.
+ </p>
+ </div>
+ <div class="footer">Copyright © 2001-2016 Nuxeo SA (http://nuxeo.com/) and others.</div>
+ </body>
+</html>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
new file mode 100644
index 0000000..1ea4aac
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
@@ -0,0 +1 @@
+This folder contains the external modules on top of the nuxeo platform
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
new file mode 100644
index 0000000..f812e03
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
@@ -0,0 +1 @@
+Put here the custom bundles to deploy when activating the custom template.
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
new file mode 100644
index 0000000..3f563a8
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
@@ -0,0 +1,10 @@
+## Edit this file to customize your configuration ##
+## See http://doc.nuxeo.com/x/LANc
+custom.target=nxserver
+
+# Set list of templates to include, comma separated values.
+#nuxeo.template.includes=common
+
+# Customize default values associated with this template
+#org.nuxeo.ecm.instance.description=Nuxeo ECM customized
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
new file mode 100644
index 0000000..642da06
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+db2.target=.
+
+nuxeo.db.type=db2
+nuxeo.db.host=localhost
+nuxeo.db.port=3700
+nuxeo.db.name=nuxeo
+nuxeo.db.user=user
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:db2://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
+nuxeo.db.driver=com.ibm.db2.jcc.DB2Driver
+nuxeo.db.xadatasource=com.ibm.db2.jcc.DB2XADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
new file mode 100644
index 0000000..a5a6e8b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
@@ -0,0 +1,12 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+default.target=.
+
+nuxeo.db.type=default
+nuxeo.db.name=nuxeo
+nuxeo.db.user=sa
+nuxeo.db.password=
+nuxeo.db.jdbc.url=jdbc:h2:$${nuxeo.data.dir}/h2/${nuxeo.db.name};DB_CLOSE_ON_EXIT=false
+nuxeo.db.driver=org.h2.Driver
+nuxeo.db.xadatasource=org.h2.jdbcx.JdbcDataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
new file mode 100644
index 0000000..2635cfc
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
@@ -0,0 +1,5 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=mongodb
+gridfsbinaries.target=.
+
+nuxeo.mongodb.gridfs.bucket=default.fs
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
new file mode 100644
index 0000000..01d2d77
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
@@ -0,0 +1,12 @@
+<component name="org.nuxeo.gridfs.config">
+ <require>default-repository-config</require>
+
+ <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
+ <blobprovider name="default">
+ <class>org.nuxeo.ecm.core.storage.mongodb.GridFSBinaryManager</class>
+ <property name="server">${nuxeo.mongodb.server}</property>
+ <property name="dbname">${nuxeo.mongodb.dbname}</property>
+ <property name="bucket">${nuxeo.mongodb.gridfs.bucket}</property>
+ </blobprovider>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
new file mode 100644
index 0000000..11e0b7c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
@@ -0,0 +1,11 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+https.target=conf
+https.deprecated=true
+https.deprecation=HTTPS will be automatically activated if you set nuxeo.server.https.port to non-zero
+
+nuxeo.server.https.port=443
+nuxeo.server.https.keystoreFile=/path/to/keystore
+nuxeo.server.https.keystorePass=password
+
+nuxeo.url=https://localhost/nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
new file mode 100644
index 0000000..b4e79a7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
@@ -0,0 +1,7 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+mongodb.target=.
+
+nuxeo.dbnosql.type=mongodb
+nuxeo.mongodb.server=localhost:27017
+#nuxeo.mongodb.server=mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+nuxeo.mongodb.dbname=nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..9287904
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=mssql
+mssql-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..4e1f2d7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = QRTZ_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
new file mode 100644
index 0000000..c23f762
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+mssql.target=.
+
+nuxeo.db.type=mssql
+nuxeo.db.host=localhost
+nuxeo.db.port=1433
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:jtds:sqlserver://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name};useCursors=true
+nuxeo.db.driver=net.sourceforge.jtds.jdbc.Driver
+nuxeo.db.xadatasource=net.sourceforge.jtds.jdbcx.JtdsDataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
new file mode 100644
index 0000000..99320f4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
@@ -0,0 +1,15 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+mysql.target=.
+
+nuxeo.db.type=mysql
+nuxeo.db.host=localhost
+nuxeo.db.port=3306
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.min-pool-size=5
+nuxeo.db.jdbc.url=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true
+nuxeo.db.driver=com.mysql.jdbc.Driver
+nuxeo.db.xadatasource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
new file mode 100644
index 0000000..eec177a
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
@@ -0,0 +1,89 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+
+# Default configuration values for templates
+# Specific default values are defined in templates/{template_name}/nuxeo.defaults
+nuxeo.data.dir=nxserver/data
+nuxeo.server.dir=nxserver
+
+jndi.base=java:comp/env
+
+# Default template to use if not defined in nuxeo.conf
+nuxeo.templates=default
+
+# Default IP address binding
+nuxeo.bind.address=0.0.0.0
+
+# publicly visible URL
+nuxeo.url=http://localhost:8080/nuxeo
+
+# Application context path
+org.nuxeo.ecm.contextPath=/nuxeo
+
+org.nuxeo.ecm.product.name=Nuxeo Platform
+org.nuxeo.ecm.product.version=FT 8.3-SNAPSHOT
+
+# Various other default values
+#nuxeo.db.host=
+#nuxeo.db.port=
+#nuxeo.db.name=
+#nuxeo.db.user=
+#nuxeo.db.password=
+nuxeo.db.min-pool-size=5
+nuxeo.db.max-pool-size=100
+nuxeo.db.blocking-timeout-millis=10000
+# Database transaction timeout in seconds
+nuxeo.db.transactiontimeout=300
+
+# Redis
+nuxeo.redis.enabled=false
+nuxeo.redis.prefix=nuxeo:
+nuxeo.redis.host=localhost
+nuxeo.redis.port=6379
+nuxeo.redis.password=
+nuxeo.redis.database=0
+nuxeo.redis.timeout=2000
+nuxeo.redis.maxTotal=16
+nuxeo.redis.maxIdle=8
+nuxeo.redis.ha.enabled=false
+nuxeo.redis.ha.master=mymaster
+nuxeo.redis.ha.hosts=localhost
+nuxeo.redis.ha.timeout=300
+nuxeo.redis.ha.port=26379
+nuxeo.work.queuing=redis
+nuxeo.lock.manager=redis
+
+# MongoDB
+nuxeo.mongodb.server=
+
+nuxeo.notification.eMailSubjectPrefix=[Nuxeo]
+nuxeo.notification.eMailSigner=The Nuxeo team
+
+# The protocol used to connect to OpenOffice
+# Can be either SOCKET or PIPE, default is SOCKET
+jod.connection.protocol=SOCKET
+jod.max.tasks.per.process=
+jod.task.execution.timeout=
+jod.task.queue.timeout=
+jod.office.home=
+jod.jpipe.lib.path=
+jod.template.profile.dir=
+
+opensocial.gadgets.embeddedServer=true
+opensocial.gadgets.host=localhost
+opensocial.gadgets.port=8080
+opensocial.gadgets.path=/site/gadgets
+opensocial.trusted.hosts=
+
+# Clustering
+repository.clustering.enabled=false
+repository.clustering.id=
+repository.clustering.delay=1000
+repository.clustering.invalidation=default
+# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries
+repository.binary.store=
+
+nuxeo.plaintext_parsing_extensions=xml,properties,nx,html,js
+nuxeo.freemarker_parsing_extensions=nxftl
+
+session.timeout=60
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..c37be53
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=oracle
+oracle-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..42d1952
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = qrtz_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
new file mode 100644
index 0000000..4f00af4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+oracle.target=.
+
+nuxeo.db.user_separator_key=|
+nuxeo.db.type=oracle
+nuxeo.db.host=localhost
+nuxeo.db.port=1521
+nuxeo.db.name=NUXEO
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:oracle:thin:${nuxeo.db.user}/${nuxeo.db.password}@${nuxeo.db.host}:${nuxeo.db.port}:${nuxeo.db.name}
+nuxeo.db.driver=oracle.jdbc.OracleDriver
+nuxeo.db.xadatasource=oracle.jdbc.xa.client.OracleXADataSource
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
new file mode 100644
index 0000000..733cc1d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
@@ -0,0 +1 @@
+hibernate.default_schema=${nuxeo.db.user}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
new file mode 100644
index 0000000..cf1a82b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
@@ -0,0 +1,33 @@
+perf.target=.
+
+# Use a bigger pool size for db/vcs
+nuxeo.db.max-pool-size=52
+nuxeo.vcs.max-pool-size=50
+
+# Use a descent cache size for directories
+nuxeo.cache.maxsize=510
+nuxeo.cache.ttl=20
+nuxeo.cache.concurrencylevel=50
+
+# Use Elasticsearch for all page provider
+elasticsearch.override.pageproviders=default_search,document_content,section_content,document_content,tree_children,default_document_suggestion,simple_search,advanced_search,nxql_search,DEFAULT_DOCUMENT_SUGGESTION,REST_API_SEARCH_ADAPTER
+
+# Disable db fulltext indexing
+nuxeo.vcs.fulltext.search.disabled=true
+
+# Disable db stored procedure
+nuxeo.vcs.optimizations.acl.enabled=false
+nuxeo.vcs.optimizations.path.enabled=false
+
+# When in cluster mode use Redis invalidation
+repository.clustering.invalidation=redis
+
+# Do not use Redis for directory cache
+nuxeo.cache.type=memory
+
+# Tune Elasticsearch indexing
+elasticsearch.indexing.maxThreads=6
+elasticsearch.reindex.bucketReadSize=1000
+elasticsearch.reindex.bucketWriteSize=200
+#elasticsearch.indexing.clearCompletedAfterSeconds=30
+elasticsearch.adminCenter.displayClusterInfo=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
new file mode 100644
index 0000000..f8e40f0
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<component name="perf-audit-config">
+ <require>org.nuxeo.ecm.platform.audit.service.NXAuditEventsService</require>
+ <extension target="org.nuxeo.ecm.platform.audit.service.NXAuditEventsService" point="event">
+ <event enabled="false" name="loginSuccess" />
+ <event enabled="false" name="logout"/>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
new file mode 100644
index 0000000..01c0f95
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<component name="perf-nothumb-config">
+ <require>org.nuxeo.ecm.platform.thumbnail.listener</require>
+ <extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
+ <listener name="updateThumbListener" enabled="false"/>
+ <listener name="checkBlobUpdate" enabled="false"/>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..7a1e512
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=postgresql
+postgresql-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..27c7635
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = qrtz_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
new file mode 100644
index 0000000..71e367a
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+postgresql.target=.
+
+nuxeo.db.type=postgresql
+nuxeo.db.host=localhost
+nuxeo.db.port=5432
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:postgresql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
+nuxeo.db.driver=org.postgresql.Driver
+nuxeo.db.xadatasource=org.postgresql.xa.PGXADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
new file mode 100644
index 0000000..388a319
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
@@ -0,0 +1,6 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+sdk.target=.
+nuxeo.template.includes=default
+
+nuxeo.server.sdk=true
+facelets.REFRESH_PERIOD=2
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties
new file mode 100644
index 0000000..e69de29
diff --git a/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok b/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
new file mode 100644
index 0000000..1b9703d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/assemble"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin/main"/>
+</classpath>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/.project.ok b/nuxeo-distribution/nuxeo-distribution-server/.project.ok
new file mode 100644
index 0000000..671bf49
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/.project.ok
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>nuxeo-distribution-server</name>
+ <comment>Nuxeo Server NXR</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/pom.xml b/nuxeo-distribution/nuxeo-distribution-server/pom.xml
new file mode 100644
index 0000000..df4ce9f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/pom.xml
@@ -0,0 +1,364 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution</artifactId>
+ <version>8.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>nuxeo-distribution-server</artifactId>
+ <packaging>zip</packaging>
+ <name>Nuxeo Server NXR</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuxeo.common</groupId>
+ <artifactId>nuxeo-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-deploy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-metrics</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-schema</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-mimetype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-dmk-adaptor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-sql-management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.lib.core</groupId>
+ <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-dbs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-mongodb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-mem</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert-plugins</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-convert</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-types-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-types-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-audit-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.localconf</groupId>
+ <artifactId>nuxeo-localconf-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-audit-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-commandline-executor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-types-contrib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-multi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-dublincore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-core-listener</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login-digest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-default-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-core-listener</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-usermanager-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-usermanager-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-versioning-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-versioning-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-content-template-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-io-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-io-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-admin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-rendering</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-platform-lang-ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-scripting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-ws</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-opencmis-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-opencmis-bindings</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-webdav</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-rest-api-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-rest-api-server</artifactId>
+ </dependency>
+
+ 
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuxeo.build</groupId>
+ <artifactId>ant-assembly-maven-plugin</artifactId>
+ <configuration>
+ <buildFile>${basedir}/src/main/assemble/assembly.xml</buildFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>os-notwindows</id>
+ <activation>
+ <os>
+ <family>!windows</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.tattletale</groupId>
+ <artifactId>tattletale-maven</artifactId>
+ <configuration>
+ <source>${project.build.directory}/nxr/lib:${project.build.directory}/nxr/bundles</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
new file mode 100644
index 0000000..0aa404b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
@@ -0,0 +1,44 @@
+<project name="nuxeo-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
+ <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
+ <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
+
+ <target name="build" description="Build Nuxeo Server NXR">
+ <echo level="info">Building Nuxeo Server NXR</echo>
+ <property name="outdir" value="${maven.project.build.directory}" />
+ <artifact:nuxeo-expand includeTestScope="true" />
+ <artifact:print output="${outdir}/artifacts-server.properties" mode="sdk" />
+ <artifact:print output="${outdir}/test-artifacts-server.properties" mode="sdk" scopes="test" />
+ <artifact:print output="${outdir}/dependency-tree.log" />
+
+ <property name="nxr" value="${outdir}/nxr" />
+ <delete failonerror="false" dir="${nxr}" />
+ <mkdir dir="${nxr}" />
+ <copy todir="${nxr}/bundles" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="org.nuxeo*" scope="!test" type="!pom" />
+ </includes>
+ <excludes>
+ <artifact groupId="org.nuxeo.lib*" />
+ </excludes>
+ </artifact:set>
+ </copy>
+
+ <copy todir="${nxr}/lib" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="!org.nuxeo*" scope="!test" />
+ <artifact groupId="org.nuxeo.lib*" scope="!test" />
+ </includes>
+ </artifact:set>
+ </copy>
+ <nx:rmdups dir="${nxr}/lib" />
+
+ <copy file="${outdir}/artifacts-server.properties" todir="${nxr}" />
+ <copy file="${outdir}/test-artifacts-server.properties" todir="${nxr}" />
+
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" basedir="${nxr}" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" type="zip" />
+ </target>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
deleted file mode 100644
index d0f6571..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
+++ /dev/null
@@ -1,9 +0,0 @@
-<projectDescription>
- <name>nuxeo-distribution-tomcat-coreserver</name>
- <comment>Nuxeo Distribution Tomcat CoreServer</comment>
- <projects/>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
deleted file mode 100644
index b8c3b87..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution</artifactId>
- <version>8.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
- <packaging>pom</packaging>
- <name>Nuxeo CoreServer Tomcat Build</name>
- <description>Package Nuxeo CoreServer with Tomcat</description>
-
- <properties>
- 
- <tomcat.classifier>light</tomcat.classifier>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-jtajca</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-datasource</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.lib.runtime</groupId>
- <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-management-jtajca</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-ws-sun-jaxws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- </dependency>
- 
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>doc</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>root</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>bin</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>templates-coreserver</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-startup-wizard</artifactId>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.shell</groupId>
- <artifactId>nuxeo-shell</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-ecm</artifactId>
- <type>zip</type>
- <classifier>tools</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-seam-debug</artifactId>
- <scope>provided</scope>
- </dependency>
- 
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-marketplace-dm</artifactId>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>all</id>
- 
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>nuxeo-coreserver</id>
- <properties>
- <product.name>coreserver</product.name>
- </properties>
- 
- </profile>
- <profile>
- <id>sdk</id>
- 
- </profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.tattletale</groupId>
- <artifactId>tattletale-maven</artifactId>
- <configuration>
- <source>${project.build.directory}/nuxeo-coreserver-${project.version}-tomcat/nxserver/lib
- </source>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuxeo.build</groupId>
- <artifactId>ant-assembly-maven-plugin</artifactId>
- <configuration>
- <buildFiles>
- <buildFile>${basedir}/src/main/assemble/assembly.xml
- </buildFile>
- </buildFiles>
- </configuration>
- <executions>
- <execution>
- <id>packaging</id>
- <goals>
- <goal>build</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
deleted file mode 100644
index 4db8f37..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<project name="tomcat-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
- <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
- <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
-
- <target name="init" unless="init.done">
- <tstamp />
- <condition property="build.sdk">
- <or>
- <isset property="maven.profile.release" />
- <isset property="maven.profile.sdk" />
- <isset property="maven.profile.nightly" />
- </or>
- </condition>
-
- <property name="outdir" value="${maven.project.build.directory}" />
- <antcall target="expand" />
- <property name="init.done" value="true" />
- </target>
-
- <target name="expand" unless="no.build">
- <artifact:nuxeo-expand />
- <artifact:print output="${outdir}/artifacts-tomcat.properties" mode="sdk" />
- <artifact:print output="${outdir}/dependency-tree.log" />
- </target>
-
- <target name="build" depends="init" unless="no.build">
- <echo level="info">Building Tomcat standard distributions...</echo>
- <property name="tomcat" value="${outdir}/tomcat.tmp" />
- <antcall target="prepare-tomcat" />
- <artifact:attach file="pom.xml" type="pom" />
- <antcall target="build-nuxeo-coreserver">
- <param name="classifier" value="nuxeo-coreserver" />
- </antcall>
- <delete dir="${tomcat}" failonerror="false" />
- </target>
-
- <target name="prepare-tomcat">
- <unzip dest="${outdir}">
- <artifact:resolveFile key="org.apache.tomcat:tomcat:${tomcat.version}:zip:${tomcat.classifier}" />
- </unzip>
- <move todir="${tomcat}">
- <fileset dir="${outdir}/apache-tomcat-${tomcat.version}" />
- </move>
- <copy tofile="${tomcat}/bin/tomcat-juli.jar">
- <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli" />
- </copy>
- <copy tofile="${tomcat}/lib/tomcat-juli-adapters.jar">
- <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli-adapters" />
- </copy>
-
- <unzip dest="${tomcat}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:doc" />
- </unzip>
- <copy todir="${tomcat}">
- <fileset dir="src/main/resources/common" />
- </copy>
- <unzip dest="${tomcat}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:root" />
- </unzip>
- <unzip dest="${tomcat}/bin">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:bin" />
- </unzip>
-
- <unzip dest="${tomcat}/templates" overwrite="true">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:templates-coreserver" />
- </unzip>
-
- <echo message="tomcat.version=${tomcat.version}" append="true" file="${tomcat}/templates/nuxeo.defaults" />
-
- <copy tofile="${tomcat}/templates/nuxeo-wizard.war">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-startup-wizard:${nuxeo.distribution.version}:war" />
- </copy>
-
- <copy todir="${tomcat}/client">
- <artifact:file key="org.nuxeo.shell:nuxeo-shell" />
- </copy>
- </target>
-
- <target name="copy-packages-xml">
- 
- <copy file="src/main/resources/packages.xml" tofile="${tomcat}/setupWizardDownloads/packages.xml">
- </copy>
- </target>
-
- <target name="sample-installAfterRestart-files">
- <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">init
-install nuxeo-sc
- </echo>
- <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">init
-install nuxeo-dam</echo>
- </target>
-
- <target name="build-nuxeo-coreserver"
- depends="sample-installAfterRestart-files,copy-packages-xml"
- description="Build Tomcat distribution with Nuxeo CoreServer">
- <echo level="info">Building Nuxeo CoreServer...</echo>
- <property name="distribution.dir" value="${outdir}/${classifier}-${maven.project.version}-tomcat" />
- <delete failonerror="false" dir="${distribution.dir}" />
- <copy todir="${distribution.dir}">
- <fileset dir="${tomcat}" />
- </copy>
- <antcall target="chmodx" />
-
- 
- <unzip dest="${distribution.dir}/nxserver">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-coreserver:${nuxeo.distribution.version}:zip" />
- </unzip>
-
- <antcall target="set-distribution-properties">
- <param name="org.nuxeo.distribution.name" value="coreserver" />
- </antcall>
-
- <echo file="${distribution.dir}/setupWizardDownloads/packages-default-selection.properties"
- message="preset=nuxeo-coreserver-preset" />
-
- <antcall target="reorganize-libs" />
- <antcall target="build-server" />
- <antcall target="build-sdk" />
- </target>
-
- <target name="build-server">
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
- basedir="${outdir}"
- includes="${classifier}-${maven.project.version}-tomcat/**" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
- classifier="${classifier}"
- type="zip" />
- </target>
-
- <target name="reorganize-libs">
- 
- <copy todir="${distribution.dir}/nxserver/bundles" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="org.nuxeo*" />
- </includes>
- <excludes>
- <artifact groupId="org.nuxeo.lib*" />
- </excludes>
- </artifact:set>
- </copy>
- <copy todir="${distribution.dir}/nxserver/lib" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="!org.nuxeo*" scope="!test" />
- <artifact groupId="org.nuxeo.lib*" scope="!test" />
- </includes>
- </artifact:set>
- </copy>
- 
- <delete>
- <fileset dir="${distribution.dir}/nxserver/lib">
- 
- 
- 
- <include name="jetty-naming*" />
- <include name="el-api*" />
- <include name="jsp-*" />
- <include name="juel-api-*" />
- <include name="tomcat-dbcp-*" />
- </fileset>
- 
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="commons-logging*" />
- </fileset>
- </delete>
- 
- <move todir="${distribution.dir}/lib">
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="nuxeo-runtime-*" />
- <include name="commons-lang-*" />
- <include name="commons-lang3-*" />
- <include name="freemarker-*" />
- <include name="mail-*" />
- <include name="xercesImpl-*" />
- <include name="xml-apis-*" />
- 
- <include name="slf4j*" />
- <include name="jcl-over-slf4j*" />
- <include name="log4j-*" />
- </fileset>
- </move>
- <nx:rmdups dir="${distribution.dir}/nxserver/lib" />
- <nx:rmdups dir="${distribution.dir}/lib" />
-
- 
- <move todir="${distribution.dir}/endorsed">
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="jaxb-api-*" />
- <include name="jaxws-api-*" />
- </fileset>
- </move>
- </target>
-
- <target name="set-distribution-properties">
- <property name="distribution.properties.file"
- value="${distribution.dir}/templates/common/config/distribution.properties" />
- <echo append="false" file="${distribution.properties.file}">## DO NOT MANUALLY EDIT THIS FILE
-org.nuxeo.distribution.name=${org.nuxeo.distribution.name}
-org.nuxeo.distribution.server=tomcat
-org.nuxeo.distribution.version=${maven.project.version}
-org.nuxeo.distribution.date=${DSTAMP}${TSTAMP}
-org.nuxeo.distribution.package=zip</echo>
- </target>
-
- <target name="build-sdk" if="build.sdk">
- <copy file="${distribution.dir}/templates/common/config/distribution.properties" todir="${distribution.dir}/sdk" />
- <copy file="${outdir}/artifacts-tomcat.properties" todir="${distribution.dir}/sdk" />
- <move todir="${distribution.dir}/sdk">
- <fileset dir="${distribution.dir}/nxserver/">
- <filename name="*artifacts-*.properties" />
- </fileset>
- </move>
- <artifact:printMgt output="${distribution.dir}/sdk/artifacts-nuxeo.properties"
- key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
- scopes="compile,provided,runtime" />
- <artifact:printMgt output="${distribution.dir}/sdk/test-artifacts-nuxeo.properties"
- key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
- scopes="test,provided" />
-
- <copy todir="${distribution.dir}/sdk/sources">
- <artifact:resolveFiles source="${distribution.dir}/sdk/artifacts*.properties" classifier="sources" />
- <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" classifier="sources" />
- </copy>
- <copy todir="${distribution.dir}/sdk/tests">
- <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" />
- </copy>
-
- <unzip dest="${distribution.dir}/sdk/tools">
- <artifact:file key="org.nuxeo:nuxeo-ecm::zip:tools" />
- </unzip>
-
- <copy todir="${distribution.dir}/nxserver/bundles">
- <artifact:file key="org.nuxeo.ecm.platform:nuxeo-platform-seam-debug" />
- </copy>
-
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
- basedir="${outdir}"
- includes="${classifier}-${maven.project.version}-tomcat/**" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
- classifier="${classifier}-sdk"
- type="zip" />
- </target>
-
- <target name="chmodx">
- <chmod dir="${distribution.dir}" perm="ug+x" includes="*.command,bin/*.sh,bin/*ctl,bin/*.command" />
- </target>
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
deleted file mode 100755
index 1cbea53..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-java -DupdateWar=y -jar ../lib/nuxeo-runtime-tomcat-adapter-5.4.3-SNAPSHOT.jar
-
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
deleted file mode 100644
index 3158810..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false" threshold="null">
-
- 
- 
- 
-
- 
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/server.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%t] [%c] %m%n" />
- </layout>
- </appender>
-
- 
-
- 
- 
- 
-
- <appender name="ERROR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/nuxeo-error.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- 
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- 
- </layout>
- </appender>
-
- 
- 
- 
-
- <appender name="STDERR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/stderr.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- 
- 
- 
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
- </layout>
- <filter class="org.apache.log4j.varia.LevelRangeFilter">
- <param name="levelMin" value="INFO" />
- </filter>
- </appender>
-
- 
- 
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- <appender name="CLASSLOADER" class="org.apache.log4j.RollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/classloader.log" />
- <param name="Append" value="false" />
- <param name="MaxFileSize" value="500KB" />
- <param name="MaxBackupIndex" value="1" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- <appender name="TOMCAT" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${nuxeo.log.dir}/tomcat.log" />
- <param name="Append" value="false" />
- <param name="MaxFileSize" value="500KB" />
- <param name="MaxBackupIndex" value="1" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- 
- 
- 
-
- <category name="org.apache.catalina.loader" additivity="false">
- <appender-ref ref="CLASSLOADER"/>
- </category>
-
- <category name="org.apache.catalina.core.AprLifecycleListener" additivity="false">
- <priority value="INFO" />
- <appender-ref ref="TOMCAT"/>
- </category>
-
- <category name="org.jboss.seam">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.ejb3">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.seam.contexts.Contexts">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.seam.contexts.Lifecycle">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.mx.loading">
- <priority value="INFO" />
- </category>
- <category name="org.jboss.system.server.Server">
- <priority value="INFO" />
- </category>
- 
- <category name="org.jboss.management" additivity="true">
- <priority value="INFO" />
- </category>
- 
- <category name="org.jboss.serial" additivity="true">
- <priority value="INFO" />
- </category>
-
- 
- <category name="org.apache" additivity="true">
- <priority value="INFO" />
- </category>
- <category name="org.apache.cxf">
- <priority value="WARN" />
- </category>
- <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource">
- <priority value="ERROR" />
- </category>
-
- <category name="org.ajax4jsf">
- <priority value="INFO" />
- </category>
- <category name="org.ajax4jsf.cache.LRUMapCacheFactory">
- <priority value="ERROR" />
- </category>
-
- <category name="org.hibernate">
- <priority value="WARN" />
- </category>
- <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.impl.SessionFactoryObjectFactory">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.cache.EhCacheProvider">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.hql.ast.tree.FromElementType">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.ejb.Ejb3Configuration">
- <priority value="ERROR" />
- </category>
-
- <category name="org.jbpm">
- <priority value="INFO" />
- </category>
- <category name="org.jbpm.jpdl.xml.JpdlXmlReader">
- <priority value="ERROR" />
- </category>
-
-
- <category name="org.nuxeo">
- <priority value="WARN" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.ElasticSearchComponent">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.audit.ESAuditBackend">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.audit.ESAuditMigrationWork">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.ecm.platform.query.core.PageProviderClassReplacerRegistry">
- <priority value="INFO" />
- </category>
-
- 
- 
- 
- 
-
- 
- 
- <category name="org.nuxeo.runtime.reload">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService">
- <priority value="INFO" />
- </category>
- 
- 
- <category name="org.nuxeo.osgi.application.loader.FrameworkLoader">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.osgi.application.StandaloneApplication">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.osgi.application.FrameworkBootstrap">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.jboss.deployment.NuxeoDeployer">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.tomcat.NuxeoDeployer">
- <priority value="INFO" />
- </category>
- 
- 
- <category name="org.nuxeo.ecm.automation.core">
- <priority value="INFO" />
- </category>
- 
- <category name="org.nuxeo.ecm.automation.scripting">
- <priority value="WARN" />
- </category>
-
- <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
- <priority value="INFO" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.application">
- <priority value="INFO" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
- <priority value="INFO" />
- </category>
-
- 
- <category name="jacorb" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="org.jgroups" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="org.quartz" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="com.sun.jersey.spi.container.servlet.WebComponent">
- <priority value="ERROR" />
- </category>
-
- <category name="org.apache.shindig.common.xml.XmlUtil">
- <priority value="WARN" />
- </category>
-
- <category name="org.apache.myfaces.shared_tomahawk">
- <priority value="WARN" />
- </category>
-
- <category name="org.artofsolving.jodconverter">
- <priority value="WARN" />
- </category>
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- <category name="nuxeo-error-log">
- <priority value="TRACE" />
- <appender-ref ref="ERROR-FILE" />
- </category>
-
- 
- <category name="STDERR" additivity="false">
- <priority value="ERROR" />
- <appender-ref ref="STDERR-FILE" />
- </category>
-
- 
- 
- 
-
- <root>
- <level value="WARN" />
- <appender-ref ref="CONSOLE" />
- <appender-ref ref="FILE" />
- </root>
-
-</log4j:configuration>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
deleted file mode 100644
index e6f2662..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-derby.system.home=${nuxeo.data.dir}/derby
-org.nuxeo.launcher.libdirs=lib
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
deleted file mode 100644
index 045ab3c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<packages>
- <packageDefinitions baseUrl="http://cdn.nuxeo.com/nuxeo-8.3-SNAPSHOT/mp/">
- <package id="nuxeo-coreserver" label="Core Server" color="#635959" textcolor="#FFF"
- shortlabel="CORE" virtual="true" desc="Content Application Platform" />
- <package id="nuxeo-dam" label="Digital Asset Management (DAM)" color="#ffeb6d" textcolor="#333" shortlabel="DAM"
- desc="Digital Asset Management" />
- <package id="nuxeo-drive" label="Drive" color="#5AC456" textcolor="#FFF" shortlabel="DRIVE" desc="Drive" />
- <package id="nuxeo-diff" label="Nuxeo Diff (DIFF)" color="#5e9adf" textcolor="#FFF" shortlabel="DIFF"
- desc="Nuxeo Diff" />
- <package id="nuxeo-showcase-content" label="Showcase Content (DOCS)" color="#DB97FF" textcolor="#FFF"
- shortlabel="DOCS" desc="Showcase Content Sample" />
- <package id="nuxeo-spreadsheet" label="Spreadsheet (GRID)" color="#ff736e" textcolor="#FFF" shortlabel="GRID"
- desc="Spreadsheet" />
- <package id="nuxeo-web-mobile" label="Mobile (MOB)" color="#faac05" textcolor="#FFF" shortlabel="MOB"
- desc="Mobile" />
- <package id="nuxeo-template-rendering-samples" label="Template Rendering (TMPL)" color="#c3c7c9" textcolor="#FFF"
- shortlabel="TMPL" desc="Template Rendering" />
- <package id="nuxeo-liveconnect" label="Live Connect (LIVE)" color="#ff452a" textcolor="#FFF" shortlabel="LIVE"
- desc="Live Connect for Cloud Services" />
- <package id="nuxeo-review-workflows-dashboards" label="Review Workflows Dashboards (RWD)" color="#213F7D"
- textcolor="#FFF" shortlabel="RWD" desc="Data Visualization Dashboards for Review Workflows" />
- </packageDefinitions>
- <install>
- <packageOptions>
- <package ref="nuxeo-coreserver" exclusive="false">
- <package ref="nuxeo-dam" exclusive="false" />
- <package ref="nuxeo-drive" exclusive="false" />
- <package ref="nuxeo-diff" exclusive="false" />
- <package ref="nuxeo-showcase-content" exclusive="false" />
- <package ref="nuxeo-spreadsheet" exclusive="false" />
- <package ref="nuxeo-web-mobile" exclusive="false" />
- <package ref="nuxeo-template-rendering-samples" exclusive="false" />
- <package ref="nuxeo-liveconnect" exclusive="false" />
- <package ref="nuxeo-review-workflows-dashboards" exclusive="false" />
- </package>
- </packageOptions>
- </install>
- <presets>
- <preset id="nuxeo-coreserver-preset" label="Nuxeo CoreServer Preset">nuxeo-coreserver,nuxeo-dam,nuxeo-drive,nuxeo-web-mobile,nuxeo-showcase-content,nuxeo-template-rendering-samples</preset>
- </presets>
-</packages>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok b/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
new file mode 100644
index 0000000..4937a6f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
@@ -0,0 +1,9 @@
+<projectDescription>
+ <name>nuxeo-distribution-tomcat-server</name>
+ <comment>Nuxeo Distribution Tomcat Server</comment>
+ <projects/>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
new file mode 100644
index 0000000..af94b84
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
@@ -0,0 +1,186 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution</artifactId>
+ <version>8.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
+ <packaging>pom</packaging>
+ <name>Nuxeo Server Tomcat Build</name>
+ <description>Package Nuxeo Server with Tomcat</description>
+
+ <properties>
+ 
+ <tomcat.classifier>light</tomcat.classifier>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-jtajca</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-datasource</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.lib.runtime</groupId>
+ <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-management-jtajca</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-ws-sun-jaxws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ </dependency>
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>doc</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>root</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>templates-server</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-startup-wizard</artifactId>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-server</artifactId>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.shell</groupId>
+ <artifactId>nuxeo-shell</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-ecm</artifactId>
+ <type>zip</type>
+ <classifier>tools</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-seam-debug</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-marketplace-dm</artifactId>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>all</id>
+ 
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>nuxeo-server</id>
+ <properties>
+ <product.name>server</product.name>
+ </properties>
+ 
+ </profile>
+ <profile>
+ <id>sdk</id>
+ 
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.tattletale</groupId>
+ <artifactId>tattletale-maven</artifactId>
+ <configuration>
+ <source>${project.build.directory}/nuxeo-server-${project.version}-tomcat/nxserver/lib
+ </source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuxeo.build</groupId>
+ <artifactId>ant-assembly-maven-plugin</artifactId>
+ <configuration>
+ <buildFiles>
+ <buildFile>${basedir}/src/main/assemble/assembly.xml
+ </buildFile>
+ </buildFiles>
+ </configuration>
+ <executions>
+ <execution>
+ <id>packaging</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
new file mode 100644
index 0000000..b629b8b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
@@ -0,0 +1,248 @@
+<project name="tomcat-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
+ <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
+ <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
+
+ <target name="init" unless="init.done">
+ <tstamp />
+ <condition property="build.sdk">
+ <or>
+ <isset property="maven.profile.release" />
+ <isset property="maven.profile.sdk" />
+ <isset property="maven.profile.nightly" />
+ </or>
+ </condition>
+
+ <property name="outdir" value="${maven.project.build.directory}" />
+ <antcall target="expand" />
+ <property name="init.done" value="true" />
+ </target>
+
+ <target name="expand" unless="no.build">
+ <artifact:nuxeo-expand />
+ <artifact:print output="${outdir}/artifacts-tomcat.properties" mode="sdk" />
+ <artifact:print output="${outdir}/dependency-tree.log" />
+ </target>
+
+ <target name="build" depends="init" unless="no.build">
+ <echo level="info">Building Tomcat standard distributions...</echo>
+ <property name="tomcat" value="${outdir}/tomcat.tmp" />
+ <antcall target="prepare-tomcat" />
+ <artifact:attach file="pom.xml" type="pom" />
+ <antcall target="build-nuxeo-server">
+ <param name="classifier" value="nuxeo-server" />
+ </antcall>
+ <delete dir="${tomcat}" failonerror="false" />
+ </target>
+
+ <target name="prepare-tomcat">
+ <unzip dest="${outdir}">
+ <artifact:resolveFile key="org.apache.tomcat:tomcat:${tomcat.version}:zip:${tomcat.classifier}" />
+ </unzip>
+ <move todir="${tomcat}">
+ <fileset dir="${outdir}/apache-tomcat-${tomcat.version}" />
+ </move>
+ <copy tofile="${tomcat}/bin/tomcat-juli.jar">
+ <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli" />
+ </copy>
+ <copy tofile="${tomcat}/lib/tomcat-juli-adapters.jar">
+ <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli-adapters" />
+ </copy>
+
+ <unzip dest="${tomcat}">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:doc" />
+ </unzip>
+ <copy todir="${tomcat}">
+ <fileset dir="src/main/resources/common" />
+ </copy>
+ <unzip dest="${tomcat}">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:root" />
+ </unzip>
+ <unzip dest="${tomcat}/bin">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:bin" />
+ </unzip>
+
+ <unzip dest="${tomcat}/templates" overwrite="true">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:templates-server" />
+ </unzip>
+
+ <echo message="tomcat.version=${tomcat.version}" append="true" file="${tomcat}/templates/nuxeo.defaults" />
+
+ <copy tofile="${tomcat}/templates/nuxeo-wizard.war">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-startup-wizard:${nuxeo.distribution.version}:war" />
+ </copy>
+
+ <copy todir="${tomcat}/client">
+ <artifact:file key="org.nuxeo.shell:nuxeo-shell" />
+ </copy>
+ </target>
+
+ <target name="copy-packages-xml">
+ 
+ <copy file="src/main/resources/packages.xml" tofile="${tomcat}/setupWizardDownloads/packages.xml">
+ </copy>
+ </target>
+
+ <target name="sample-installAfterRestart-files">
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">init
+install nuxeo-sc
+ </echo>
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">init
+install nuxeo-dam</echo>
+ </target>
+
+ <target name="build-nuxeo-server"
+ depends="sample-installAfterRestart-files,copy-packages-xml"
+ description="Build Tomcat distribution with Nuxeo Server">
+ <echo level="info">Building Nuxeo Server...</echo>
+ <property name="distribution.dir" value="${outdir}/${classifier}-${maven.project.version}-tomcat" />
+ <delete failonerror="false" dir="${distribution.dir}" />
+ <copy todir="${distribution.dir}">
+ <fileset dir="${tomcat}" />
+ </copy>
+ <antcall target="chmodx" />
+
+ 
+ <unzip dest="${distribution.dir}/nxserver">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-server:${nuxeo.distribution.version}:zip" />
+ </unzip>
+
+ <antcall target="set-distribution-properties">
+ <param name="org.nuxeo.distribution.name" value="server" />
+ </antcall>
+
+ <echo file="${distribution.dir}/setupWizardDownloads/packages-default-selection.properties"
+ message="preset=nuxeo-server-preset" />
+
+ <antcall target="reorganize-libs" />
+ <antcall target="build-server" />
+ <antcall target="build-sdk" />
+ </target>
+
+ <target name="build-server">
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
+ basedir="${outdir}"
+ includes="${classifier}-${maven.project.version}-tomcat/**" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
+ classifier="${classifier}"
+ type="zip" />
+ </target>
+
+ <target name="reorganize-libs">
+ 
+ <copy todir="${distribution.dir}/nxserver/bundles" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="org.nuxeo*" />
+ </includes>
+ <excludes>
+ <artifact groupId="org.nuxeo.lib*" />
+ </excludes>
+ </artifact:set>
+ </copy>
+ <copy todir="${distribution.dir}/nxserver/lib" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="!org.nuxeo*" scope="!test" />
+ <artifact groupId="org.nuxeo.lib*" scope="!test" />
+ </includes>
+ </artifact:set>
+ </copy>
+ 
+ <delete>
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ 
+ 
+ 
+ <include name="jetty-naming*" />
+ <include name="el-api*" />
+ <include name="jsp-*" />
+ <include name="juel-api-*" />
+ <include name="tomcat-dbcp-*" />
+ </fileset>
+ 
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="commons-logging*" />
+ </fileset>
+ </delete>
+ 
+ <move todir="${distribution.dir}/lib">
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="nuxeo-runtime-*" />
+ <include name="commons-lang-*" />
+ <include name="commons-lang3-*" />
+ <include name="freemarker-*" />
+ <include name="mail-*" />
+ <include name="xercesImpl-*" />
+ <include name="xml-apis-*" />
+ 
+ <include name="slf4j*" />
+ <include name="jcl-over-slf4j*" />
+ <include name="log4j-*" />
+ </fileset>
+ </move>
+ <nx:rmdups dir="${distribution.dir}/nxserver/lib" />
+ <nx:rmdups dir="${distribution.dir}/lib" />
+
+ 
+ <move todir="${distribution.dir}/endorsed">
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="jaxb-api-*" />
+ <include name="jaxws-api-*" />
+ </fileset>
+ </move>
+ </target>
+
+ <target name="set-distribution-properties">
+ <property name="distribution.properties.file"
+ value="${distribution.dir}/templates/common/config/distribution.properties" />
+ <echo append="false" file="${distribution.properties.file}">## DO NOT MANUALLY EDIT THIS FILE
+org.nuxeo.distribution.name=${org.nuxeo.distribution.name}
+org.nuxeo.distribution.server=tomcat
+org.nuxeo.distribution.version=${maven.project.version}
+org.nuxeo.distribution.date=${DSTAMP}${TSTAMP}
+org.nuxeo.distribution.package=zip</echo>
+ </target>
+
+ <target name="build-sdk" if="build.sdk">
+ <copy file="${distribution.dir}/templates/common/config/distribution.properties" todir="${distribution.dir}/sdk" />
+ <copy file="${outdir}/artifacts-tomcat.properties" todir="${distribution.dir}/sdk" />
+ <move todir="${distribution.dir}/sdk">
+ <fileset dir="${distribution.dir}/nxserver/">
+ <filename name="*artifacts-*.properties" />
+ </fileset>
+ </move>
+ <artifact:printMgt output="${distribution.dir}/sdk/artifacts-nuxeo.properties"
+ key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
+ scopes="compile,provided,runtime" />
+ <artifact:printMgt output="${distribution.dir}/sdk/test-artifacts-nuxeo.properties"
+ key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
+ scopes="test,provided" />
+
+ <copy todir="${distribution.dir}/sdk/sources">
+ <artifact:resolveFiles source="${distribution.dir}/sdk/artifacts*.properties" classifier="sources" />
+ <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" classifier="sources" />
+ </copy>
+ <copy todir="${distribution.dir}/sdk/tests">
+ <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" />
+ </copy>
+
+ <unzip dest="${distribution.dir}/sdk/tools">
+ <artifact:file key="org.nuxeo:nuxeo-ecm::zip:tools" />
+ </unzip>
+
+ <copy todir="${distribution.dir}/nxserver/bundles">
+ <artifact:file key="org.nuxeo.ecm.platform:nuxeo-platform-seam-debug" />
+ </copy>
+
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
+ basedir="${outdir}"
+ includes="${classifier}-${maven.project.version}-tomcat/**" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
+ classifier="${classifier}-sdk"
+ type="zip" />
+ </target>
+
+ <target name="chmodx">
+ <chmod dir="${distribution.dir}" perm="ug+x" includes="*.command,bin/*.sh,bin/*ctl,bin/*.command" />
+ </target>
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
new file mode 100755
index 0000000..1cbea53
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+java -DupdateWar=y -jar ../lib/nuxeo-runtime-tomcat-adapter-5.4.3-SNAPSHOT.jar
+
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
new file mode 100644
index 0000000..3158810
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+ debug="false" threshold="null">
+
+ 
+ 
+ 
+
+ 
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/server.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%t] [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+
+ 
+ 
+ 
+
+ <appender name="ERROR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/nuxeo-error.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ 
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
+ 
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <appender name="STDERR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/stderr.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+ </layout>
+ <filter class="org.apache.log4j.varia.LevelRangeFilter">
+ <param name="levelMin" value="INFO" />
+ </filter>
+ </appender>
+
+ 
+ 
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ <appender name="CLASSLOADER" class="org.apache.log4j.RollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/classloader.log" />
+ <param name="Append" value="false" />
+ <param name="MaxFileSize" value="500KB" />
+ <param name="MaxBackupIndex" value="1" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ <appender name="TOMCAT" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${nuxeo.log.dir}/tomcat.log" />
+ <param name="Append" value="false" />
+ <param name="MaxFileSize" value="500KB" />
+ <param name="MaxBackupIndex" value="1" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <category name="org.apache.catalina.loader" additivity="false">
+ <appender-ref ref="CLASSLOADER"/>
+ </category>
+
+ <category name="org.apache.catalina.core.AprLifecycleListener" additivity="false">
+ <priority value="INFO" />
+ <appender-ref ref="TOMCAT"/>
+ </category>
+
+ <category name="org.jboss.seam">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.ejb3">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.seam.contexts.Contexts">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.seam.contexts.Lifecycle">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.mx.loading">
+ <priority value="INFO" />
+ </category>
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.jboss.management" additivity="true">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.jboss.serial" additivity="true">
+ <priority value="INFO" />
+ </category>
+
+ 
+ <category name="org.apache" additivity="true">
+ <priority value="INFO" />
+ </category>
+ <category name="org.apache.cxf">
+ <priority value="WARN" />
+ </category>
+ <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.ajax4jsf">
+ <priority value="INFO" />
+ </category>
+ <category name="org.ajax4jsf.cache.LRUMapCacheFactory">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="WARN" />
+ </category>
+ <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.impl.SessionFactoryObjectFactory">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.cache.EhCacheProvider">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.hql.ast.tree.FromElementType">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.ejb.Ejb3Configuration">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.jbpm">
+ <priority value="INFO" />
+ </category>
+ <category name="org.jbpm.jpdl.xml.JpdlXmlReader">
+ <priority value="ERROR" />
+ </category>
+
+
+ <category name="org.nuxeo">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.ElasticSearchComponent">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.audit.ESAuditBackend">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.audit.ESAuditMigrationWork">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.ecm.platform.query.core.PageProviderClassReplacerRegistry">
+ <priority value="INFO" />
+ </category>
+
+ 
+ 
+ 
+ 
+
+ 
+ 
+ <category name="org.nuxeo.runtime.reload">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService">
+ <priority value="INFO" />
+ </category>
+ 
+ 
+ <category name="org.nuxeo.osgi.application.loader.FrameworkLoader">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.osgi.application.StandaloneApplication">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.osgi.application.FrameworkBootstrap">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.jboss.deployment.NuxeoDeployer">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.tomcat.NuxeoDeployer">
+ <priority value="INFO" />
+ </category>
+ 
+ 
+ <category name="org.nuxeo.ecm.automation.core">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.nuxeo.ecm.automation.scripting">
+ <priority value="WARN" />
+ </category>
+
+ <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
+ <priority value="INFO" />
+ </category>
+ <category name="javax.enterprise.resource.webcontainer.jsf.application">
+ <priority value="INFO" />
+ </category>
+ <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
+ <priority value="INFO" />
+ </category>
+
+ 
+ <category name="jacorb" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="org.jgroups" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="org.quartz" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="com.sun.jersey.spi.container.servlet.WebComponent">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.apache.shindig.common.xml.XmlUtil">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.apache.myfaces.shared_tomahawk">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.artofsolving.jodconverter">
+ <priority value="WARN" />
+ </category>
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ <category name="nuxeo-error-log">
+ <priority value="TRACE" />
+ <appender-ref ref="ERROR-FILE" />
+ </category>
+
+ 
+ <category name="STDERR" additivity="false">
+ <priority value="ERROR" />
+ <appender-ref ref="STDERR-FILE" />
+ </category>
+
+ 
+ 
+ 
+
+ <root>
+ <level value="WARN" />
+ <appender-ref ref="CONSOLE" />
+ <appender-ref ref="FILE" />
+ </root>
+
+</log4j:configuration>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
new file mode 100644
index 0000000..e6f2662
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
@@ -0,0 +1,2 @@
+derby.system.home=${nuxeo.data.dir}/derby
+org.nuxeo.launcher.libdirs=lib
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
new file mode 100644
index 0000000..5ab8386
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
@@ -0,0 +1,41 @@
+<packages>
+ <packageDefinitions baseUrl="http://cdn.nuxeo.com/nuxeo-8.3-SNAPSHOT/mp/">
+ <package id="nuxeo-server" label="Server" color="#635959" textcolor="#FFF"
+ shortlabel="CORE" virtual="true" desc="Content Application Platform" />
+ <package id="nuxeo-dam" label="Digital Asset Management (DAM)" color="#ffeb6d" textcolor="#333" shortlabel="DAM"
+ desc="Digital Asset Management" />
+ <package id="nuxeo-drive" label="Drive" color="#5AC456" textcolor="#FFF" shortlabel="DRIVE" desc="Drive" />
+ <package id="nuxeo-diff" label="Nuxeo Diff (DIFF)" color="#5e9adf" textcolor="#FFF" shortlabel="DIFF"
+ desc="Nuxeo Diff" />
+ <package id="nuxeo-showcase-content" label="Showcase Content (DOCS)" color="#DB97FF" textcolor="#FFF"
+ shortlabel="DOCS" desc="Showcase Content Sample" />
+ <package id="nuxeo-spreadsheet" label="Spreadsheet (GRID)" color="#ff736e" textcolor="#FFF" shortlabel="GRID"
+ desc="Spreadsheet" />
+ <package id="nuxeo-web-mobile" label="Mobile (MOB)" color="#faac05" textcolor="#FFF" shortlabel="MOB"
+ desc="Mobile" />
+ <package id="nuxeo-template-rendering-samples" label="Template Rendering (TMPL)" color="#c3c7c9" textcolor="#FFF"
+ shortlabel="TMPL" desc="Template Rendering" />
+ <package id="nuxeo-liveconnect" label="Live Connect (LIVE)" color="#ff452a" textcolor="#FFF" shortlabel="LIVE"
+ desc="Live Connect for Cloud Services" />
+ <package id="nuxeo-review-workflows-dashboards" label="Review Workflows Dashboards (RWD)" color="#213F7D"
+ textcolor="#FFF" shortlabel="RWD" desc="Data Visualization Dashboards for Review Workflows" />
+ </packageDefinitions>
+ <install>
+ <packageOptions>
+ <package ref="nuxeo-server" exclusive="false">
+ <package ref="nuxeo-dam" exclusive="false" />
+ <package ref="nuxeo-drive" exclusive="false" />
+ <package ref="nuxeo-diff" exclusive="false" />
+ <package ref="nuxeo-showcase-content" exclusive="false" />
+ <package ref="nuxeo-spreadsheet" exclusive="false" />
+ <package ref="nuxeo-web-mobile" exclusive="false" />
+ <package ref="nuxeo-template-rendering-samples" exclusive="false" />
+ <package ref="nuxeo-liveconnect" exclusive="false" />
+ <package ref="nuxeo-review-workflows-dashboards" exclusive="false" />
+ </package>
+ </packageOptions>
+ </install>
+ <presets>
+ <preset id="nuxeo-server-preset" label="Nuxeo Server Preset">nuxeo-server,nuxeo-dam,nuxeo-drive,nuxeo-web-mobile,nuxeo-showcase-content,nuxeo-template-rendering-samples</preset>
+ </presets>
+</packages>
diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml b/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
index 45939e5..5c7c3be 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
@@ -16,7 +16,7 @@

<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
index a13f0cf..a6b28dc 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
@@ -18,22 +18,22 @@
</filterset>
</copy>

- 
+ 
<copy todir="${outdir}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-coreserver::zip" />
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-server::zip" />
<artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-cap::zip" />
</copy>


<nx:zipdiff file1="${outdir}/nuxeo-distribution-cap-${maven.project.version}.zip"
- file2="${outdir}/nuxeo-distribution-coreserver-${maven.project.version}.zip"
+ file2="${outdir}/nuxeo-distribution-server-${maven.project.version}.zip"
includesfile="${outdir}/includes"
excludesfile="${outdir}/excludesfile"
- patternsetid="cap.versus.coreserver"
+ patternsetid="cap.versus.server"
ignoreContentPattern=".*\.jar$">
</nx:zipdiff>
<unzip src="${outdir}/nuxeo-distribution-cap-${maven.project.version}.zip" dest="${marketplace}/install">
- <patternset refid="cap.versus.coreserver" />
+ <patternset refid="cap.versus.server" />
</unzip>


diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
index 177b485..7472e25 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
@@ -1,7 +1,7 @@
<package type="addon" name="nuxeo-cap" version="@VERSION@">
<title>Nuxeo CAP</title>
<description>
- <p>This package adds the JSF UI to Nuxeo CoreServer.</p>
+ <p>This package adds the JSF UI to Nuxeo Server.</p>
</description>
<home-page>http://doc.nuxeo.com/</home-page>
<vendor>Nuxeo</vendor>
@@ -13,8 +13,8 @@
<production-state>production_ready</production-state>
<supported>true</supported>
<platforms>
- <platform>coreserver-@VERSION@</platform>
- <platform>coreserver-@VERSION@-HF*</platform>
+ <platform>server-@VERSION@</platform>
+ <platform>server-@VERSION@-HF*</platform>
</platforms>
<license>Apache 2.0</license>
<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
diff --git a/nuxeo-distribution/pom.xml b/nuxeo-distribution/pom.xml
index c5c59c8..24b2dc1 100644
--- a/nuxeo-distribution/pom.xml
+++ b/nuxeo-distribution/pom.xml
@@ -28,10 +28,10 @@
<module>nuxeo-launcher</module>
<module>nuxeo-distribution-resources</module>
<module>nuxeo-distribution-tests</module>
- <module>nuxeo-distribution-coreserver</module>
+ <module>nuxeo-distribution-server</module>
<module>nuxeo-distribution-cap</module>
<module>nuxeo-marketplace-dm</module>
- <module>nuxeo-distribution-tomcat-coreserver</module>
+ <module>nuxeo-distribution-tomcat-server</module>
<module>nuxeo-distribution-tomcat</module>

<module>nuxeo-distribution-tomcat-wizard-tests</module>
@@ -135,13 +135,13 @@
<dependencies>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>pom</type>
</dependency>
@@ -165,13 +165,13 @@
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
<classifier>sdk</classifier>
@@ -223,7 +223,7 @@
<artifactId>nuxeo-distribution-resources</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
- <classifier>templates-coreserver</classifier>
+ <classifier>templates-server</classifier>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>

--
You received this message because you are subscribed to the Google Groups "ecm-checkins" group.
To unsubscribe from this group and stop receiving emails from it, send an email to ecm-checkins+***@lists.nuxeo.com.
Visit this group at https://groups.google.com/a/lists.nuxeo.com/group/ecm-checkins/.

Florent Guillaume

2016-05-25 15:06:27 UTC

Permalink

Message:
NXP-19634: rename CoreServer to Server

Repository: nuxeo
Branch: feature-NXP-19634-tomcat-coreserver
Author: Florent Guillaume <***@nuxeo.com>
Pusher: efge <***@nuxeo.com>
Date: 2016-05-25T14:06:55+02:00
URL: https://github.com/nuxeo/nuxeo/commit/c70f8598faaa854b26abd8ab10e84dc5822ee999
JIRA: https://jira.nuxeo.com/browse/NXP-19634

Files:
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
A nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties
A nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
A nuxeo-distribution/nuxeo-distribution-server/.project.ok
A nuxeo-distribution/nuxeo-distribution-server/pom.xml
A nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
A nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
A nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
D nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
D nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
D nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
D nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
D nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
D nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
M nuxeo-distribution/README.md
M nuxeo-distribution/nuxeo-distribution-cap/pom.xml
M nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
M nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
M nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
M nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
M nuxeo-distribution/pom.xml

diff --git a/nuxeo-distribution/README.md b/nuxeo-distribution/README.md
index e1a1b6e..686d511 100644
--- a/nuxeo-distribution/README.md
+++ b/nuxeo-distribution/README.md
@@ -58,7 +58,7 @@ Ant usage: `ant package`
* nuxeo-launcher: Control Panel and Launcher
* nuxeo-distribution-resources: Resources for packaging (doc, binaries, configuration templates)
* nuxeo-distribution-tests: Convenient helper POM listing the Nuxeo test dependencies
- * nuxeo-distribution-coreserver: Core Server NXR
+ * nuxeo-distribution-server: Server NXR
* nuxeo-distribution-cap: Content Application Platform NXR
* nuxeo-distribution-tomcat: Package Nuxeo CAP with Tomcat
* nuxeo-distribution-tomcat-wizard-tests: WebDriver tests on Startup Wizard
@@ -72,12 +72,12 @@ Ant usage: `ant package`
## Produced packages

* NXR packages
- * Core Server
+ * Server
* Content Application Platform (CAP)
* Nuxeo Packages
* Transitional Package for Advanced Document Management (DM)
* Tomcat packages
- * Core Server
+ * Server
* Content Application Platform (CAP)
* SDK

@@ -99,15 +99,15 @@ See also Nuxeo Documentation: [CORG/Maven+usage](http://doc.nuxeo.com/x/JQk7)

## Details about predefined applications

-### Nuxeo Core Server
+### Nuxeo Server

A minimal server NXR. An embedded repository will be started. No other platform services are available.

This application can be used to debug, test or develop nuxeo components that need a repository connection.

-Built NXR is in `nuxeo-distribution-coreserver/target/`.
+Built NXR is in `nuxeo-distribution-server/target/`.

-It is packaged within Tomcat in `nuxeo-distribution-tomcat/target/` (see "coreserver").
+It is packaged within Tomcat in `nuxeo-distribution-tomcat/target/` (see "server").

### Nuxeo CAP
diff --git a/nuxeo-distribution/nuxeo-distribution-cap/pom.xml b/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
index 35114de..ba105dd 100644
--- a/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
+++ b/nuxeo-distribution/nuxeo-distribution-cap/pom.xml
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<type>pom</type>
</dependency>
<dependency>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok b/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
deleted file mode 100644
index 1b9703d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/.classpath.ok
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/assemble"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin/main"/>
-</classpath>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok b/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
deleted file mode 100644
index 0999a6a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/.project.ok
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
- <name>nuxeo-distribution-coreserver</name>
- <comment>Nuxeo CoreServer EAR</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml b/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
deleted file mode 100644
index 71c51b9..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/pom.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution</artifactId>
- <version>8.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>nuxeo-distribution-coreserver</artifactId>
- <packaging>zip</packaging>
- <name>CoreServer NXR</name>
- <description>Nuxeo Core Server NXR</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuxeo.common</groupId>
- <artifactId>nuxeo-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-deploy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-metrics</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-schema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-mimetype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-dmk-adaptor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-sql</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-sql-management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.lib.core</groupId>
- <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-dbs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-mongodb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-storage-mem</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-query</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-persistence</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-convert-plugins</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-convert</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-types-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-types-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-audit-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.localconf</groupId>
- <artifactId>nuxeo-localconf-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-audit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-commandline-executor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-types-contrib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-ldap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-sql</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-directory-multi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-dublincore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-filemanager-core-listener</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-login-digest</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-default-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-core-listener</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-relations-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-usermanager-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-usermanager-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-versioning-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-versioning-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-content-template-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-io-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-io-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-admin</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.webengine</groupId>
- <artifactId>nuxeo-webengine-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-rendering</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-platform-lang-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.automation</groupId>
- <artifactId>nuxeo-automation-scripting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-ws</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-opencmis-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-opencmis-bindings</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-webdav</artifactId>
- </dependency>
-
- 
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-rest-api-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-rest-api-server</artifactId>
- </dependency>
-
- 
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuxeo.build</groupId>
- <artifactId>ant-assembly-maven-plugin</artifactId>
- <configuration>
- <buildFile>${basedir}/src/main/assemble/assembly.xml</buildFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>os-notwindows</id>
- <activation>
- <os>
- <family>!windows</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.tattletale</groupId>
- <artifactId>tattletale-maven</artifactId>
- <configuration>
- <source>${project.build.directory}/nxr/lib:${project.build.directory}/nxr/bundles</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
deleted file mode 100644
index 1315796..0000000
--- a/nuxeo-distribution/nuxeo-distribution-coreserver/src/main/assemble/assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project name="nuxeo-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
- <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
- <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
-
- <target name="build" description="Build Nuxeo CoreServer NXR">
- <echo level="info">Building Nuxeo CoreServer NXR</echo>
- <property name="outdir" value="${maven.project.build.directory}" />
- <artifact:nuxeo-expand includeTestScope="true" />
- <artifact:print output="${outdir}/artifacts-coreserver.properties" mode="sdk" />
- <artifact:print output="${outdir}/test-artifacts-coreserver.properties" mode="sdk" scopes="test" />
- <artifact:print output="${outdir}/dependency-tree.log" />
-
- <property name="nxr" value="${outdir}/nxr" />
- <delete failonerror="false" dir="${nxr}" />
- <mkdir dir="${nxr}" />
- <copy todir="${nxr}/bundles" overwrite="true">
- <artifact:set excludeRoots="true">
- <includes>
- <artifact groupId="org.nuxeo*" scope="" type="!pom" />
- </includes>
- <excludes>
- <artifact groupId="org.nuxeo.lib*" />
- </excludes>
- </artifact:set>
- </copy>
-
- <copy todir="${nxr}/lib" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="!org.nuxeo*" scope="" />
- <artifact groupId="org.nuxeo.lib*" scope="" />
- </includes>
- </artifact:set>
- </copy>
- <nx:rmdups dir="${nxr}/lib" />
-
- <copy file="${outdir}/artifacts-coreserver.properties" todir="${nxr}" />
- <copy file="${outdir}/test-artifacts-coreserver.properties" todir="${nxr}" />
-
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" basedir="${nxr}" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" type="zip" />
- </target>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
index 817a108..66106e1 100644
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/assemble/assembly.xml
@@ -31,7 +31,7 @@
<param name="derby-lib-dir" value="nxserver/lib" />
</antcall>
<antcall target="copy-resources-with-jdbc-lib">
- <param name="distribution" value="templates-coreserver" />
+ <param name="distribution" value="templates-server" />
<param name="h2-lib-dir" value="nxserver/lib" />
<param name="derby-lib-dir" value="nxserver/lib" />
</antcall>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
deleted file mode 100644
index c9b10e6..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/README.txt
+++ /dev/null
@@ -1,123 +0,0 @@
------
-About
------
-
-The templates in this directory are used to generate configuration and datasource
-files at server startup when it is not already configured.
-
-1) Usage
-
-1.1) General instructions
-
-Edit nuxeo.conf and set the name of the template(s) to use (default template is "default").
-
-Set the properties you want to customize, see nuxeo.defaults files for available parameters.
-For example, recommended changes are:
- nuxeo.templates=default
- nuxeo.bind.address=0.0.0.0
-And, for example, if you use a database template:
- nuxeo.db.host=localhost
- nuxeo.db.name=nuxeo
- nuxeo.db.user=user
- nuxeo.db.password=password
-
-Default values are used for undefined properties in nuxeo.conf
-Take care that the following sample is defining an empty property:
- nuxeo.sample.value=
-
-*DO NOT EDIT* nuxeo.defaults files except, if needed, the one in custom template.
-
-1.2) Technical overview
-
-A server is considered as already configured when it has a config directory.
-When the config directory doesn't exist, templates will be used to generate all
-configuration files (config and datasources).
-
-The template files contain parameters defined such as ${sample.parameter}
-Values for parameters replacement are calculated by this way:
- * If nuxeo.conf does not define nuxeo.templates, then nuxeo.templates equals "default"
- (deprecated parameter nuxeo.template is still read for backward compliance).
- * The ${nuxeo.templates} value is used for determining the chosen template(s).
- * For each value "nuxeo.template" of ${nuxeo.templates} (comma separated values,
- relative to "templates/" directory or absolute path), the corresponding file
- ${nuxeo.template}/nuxeo.defaults is read for defining new default values
- and eventually including other templates which are recursively parsed.
- * The file templates/nuxeo.defaults is read for default values not already defined.
- * The file nuxeo.conf is read for custom values (overwriting default values).
-
-Configuration files are then generated by this way:
- * For each comma separated value of nuxeo.templates and nuxeo.template.includes
- (let say sample.template), files in templates/${sample.template}/ are copied
- using the previously calculated values for replacing parameters.
- * Every included template will potentially overwrite its precedents.
-
-1.3) Customization
-
-"custom" template allows to add customization such as using multiple databases,
-configuring services, ...
-
- * Add your own template files in "templates/custom" directory.
- You can use either existing or new parameters in these new template files.
- * Edit nuxeo.conf, set your parameters' values and set nuxeo.templates=custom
- (you can refer to custom templates directory with a relative path or to your
- own custom templates directory with an absolute path).
- * Edit custom/nuxeo.defaults and set nuxeo.template.includes parameter to define
- the list of existing templates to include (comma separated values); your custom
- template will be used at last.
- Note since NXP-5139, nuxeo.defaults files from included templates are read.
-
-In case you need multiple customizations, create multiple directories and reference
-them in nuxeo.conf of each server.
-
-2) Available templates
-
-2.1) default
-
-Default Nuxeo configuration.
-Designed for development or test purpose.
-Repository backend: H2
-Services backend: Derby
-
-2.2) postgresql
-
-Recommended configuration for production, based on PostgreSQL.
-See http://doc.nuxeo.com/x/fwQz
-
-Repository backend: PostgreSQL XA
-Services backend: PostgreSQL XA
-
-Copy JDBC3 driver http://jdbc.postgresql.org/download.html#current
-into $TOMCAT/lib/
-
-2.3) oracle
-
-See http://doc.nuxeo.com/x/ywE7
-
-Repository backend: Oracle XA
-Services backend: Oracle
-
-Copy JDBC driver http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
-into $TOMCAT/lib/
-
-2.4) mssql
-
-See http://doc.nuxeo.com/x/EgI7
-
-Repository backend: Ms SQL Server XA
-Services backend: Ms SQL Server XA
-
-Copy JDBC driver http://repo2.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar
-into $TOMCAT/lib/
-
-2.5) custom
-
-Sample custom template. It's quite empty, feel free to play with it in order to
-create your own template.
-
-2.6) https
-
-Not recommended: Nuxeo recommends to use a HTTP server in front of Tomcat instead of
-configuring Tomcat to directly listen to port 443.
-
-That template is configuring the server to listen to port 443 (HTTPS) on its public
-address(es) but still use port 80 (HTTP) for its local calls (loopback url).
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
deleted file mode 100644
index 6956521..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/client/scripts/deleteOrphanBinaries.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (C) Copyright 2015 Nuxeo SA (http://nuxeo.com/) and contributors.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License
- * (LGPL) version 2.1 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-2.1.html
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Contributors:
- * Julien Carsique
- */
-
-import org.nuxeo.ecm.core.blob.binary.BinaryManagerStatus;
-import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatus;
-import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatusMBean;
-
-SQLRepositoryStatusMBean status = new SQLRepositoryStatus();
-if (!status.isBinariesGCInProgress()) {
- BinaryManagerStatus binaryManagerStatus = status.gcBinaries(true);
- println("Orphaned binaries garbage collecting result: " + binaryManagerStatus);
-} else {
- println("Orphaned binaries garbage collecting is already in progress.");
-}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
deleted file mode 100644
index 8e96e2e..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
+++ /dev/null
@@ -1,88 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Context antiResourceLocking="false" privileged="true"
- path="${org.nuxeo.ecm.contextPath}" docBase="../nxserver/nuxeo.war">
-
- 
- <Manager pathname="" />
-
- 
-<#if "${nuxeo.server.sdk}" == "false">
- <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
- loaderClass="org.nuxeo.runtime.tomcat.NuxeoWebappClassLoader" />
-<#else>
- <Valve className="org.nuxeo.runtime.tomcat.dev.DevValve" />
- <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
- loaderClass="org.nuxeo.runtime.tomcat.dev.NuxeoDevWebappClassLoader" />
-</#if>
-
- <Listener className="org.nuxeo.runtime.tomcat.ContextSecurityGrabber" />
-<#noparse>
- <Listener className="org.nuxeo.runtime.tomcat.NuxeoLauncher" home="${catalina.base}/nxserver" />
-</#noparse>
-
- 
-
-<#if nuxeo.db.embeddedDatasources == "false">
- <ResourceLink name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-<#if "${nuxeo.quartz.enable}" == "true">
- <ResourceLink name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <ResourceLink name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-</#if>
-</#if>
-
- <Resource name="TransactionManager" auth="Container"
- type="javax.transaction.TransactionManager" factory="org.nuxeo.runtime.jtajca.NuxeoTransactionManagerFactory"
- transactionTimeoutSeconds="${nuxeo.db.transactiontimeout}" />
- <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory" />
-
- <Resource auth="Container" name="Mail" type="javax.mail.Session" factory="org.nuxeo.ecm.platform.ec.notification.email.EmailResourceFactory"
- mail.from="${mail.from}"
-<#if "${mail.debug}" == "true">
- mail.debug="${mail.debug}"
-</#if>
- mail.store.protocol="${mail.store.protocol}"
- mail.${mail.store.protocol}.host="${mail.store.host}"
-<#if "${mail.store.port}" != "-1">
- mail.${mail.store.protocol}.port="${mail.store.port}"
-</#if>
- mail.${mail.store.protocol}.user="${mail.store.user}"
- mail.${mail.store.protocol}.password="${mail.store.password}"
- mail.transport.protocol="${mail.transport.protocol}"
- mail.${mail.transport.protocol}.host="${mail.transport.host}"
-<#if "${mail.transport.port}" != "-1">
- mail.${mail.transport.protocol}.port="${mail.transport.port}"
-</#if>
-<#if "${mail.transport.auth}" == "true">
- mail.${mail.transport.protocol}.user="${mail.transport.user}"
- mail.${mail.transport.protocol}.password="${mail.transport.password}"
- mail.${mail.transport.protocol}.auth="${mail.transport.auth}"
-</#if>
-<#if "${mail.transport.usetls}" == "true">
- mail.${mail.transport.protocol}.starttls.enable="${mail.transport.usetls}"
-</#if>
- />
-
-</Context>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
deleted file mode 100644
index 7d5a4d1..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/conf/server.xml.nxftl
+++ /dev/null
@@ -1,191 +0,0 @@
-<#escape x as x?xml>
-<#assign isTomcat7 = tomcat.version?split(".")[0]?number == 7>
-<#assign isWizard = (nuxeo.wizard?? && nuxeo.wizard.done?? && nuxeo.wizard.done == "false")>
-<?xml version='1.0' encoding='utf-8'?>
-
-
-<Server address="${nuxeo.server.tomcat_admin.host}" port="${nuxeo.server.tomcat_admin.port}" shutdown="SHUTDOWN">
-
-
- 
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- 
- <Listener className="org.apache.catalina.core.JasperListener" />
- 
-<#if !isTomcat7>
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-</#if>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
- 
- <GlobalNamingResources>
- 
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
-
- <#if !isWizard && nuxeo.db.embeddedDatasources == "false">
- 
- <Resource name="${nuxeo.db.commonds}" auth="Container" type="javax.sql.DataSource"
- maxActive="${nuxeo.db["max-pool-size"]}" maxIdle="30" maxWait="10000" driverClassName="${nuxeo.db.driver}"
- url="${nuxeo.db.jdbc.url}" validationQuery="${nuxeo.db.validationQuery}"
- username="${nuxeo.db.user}" password="${nuxeo.db.password}"
- accessToUnderlyingConnectionAllowed="true" />
- </#if>
-
- </GlobalNamingResources>
-
- 
- <Service name="Catalina">
-
- 
- 
-
-
- 
- <Connector port="${nuxeo.server.http.port}" protocol="HTTP/1.1" URIEncoding="UTF-8"
-<#if nuxeo.server.https.port == "0">
- address="${nuxeo.bind.address}"
-<#else>
- address="127.0.0.1"
- redirectPort="${nuxeo.server.https.port}"
-</#if>
-<#if nuxeo.server.signature??>
- server="${nuxeo.server.signature}"
-</#if>
- compression="on"
- compressionMinSize="512"
- compressableMimeType="text/css,application/javascript,text/xml,text/html"
- connectionTimeout="20000" />
- 
- 
-<#if nuxeo.server.https.port != "0">
- 
- <Connector port="${nuxeo.server.https.port}" protocol="HTTP/1.1" SSLEnabled="true"
- address="${nuxeo.bind.address}"
-<#if nuxeo.server.signature??>
- server="${nuxeo.server.signature}"
-</#if>
- compression="on"
- compressionMinSize="512"
- compressableMimeType="text/css,application/javascript,text/xml,text/html"
- maxThreads="150" scheme="https" secure="true"
- keystoreFile="${nuxeo.server.https.keystoreFile}"
- keystorePass="${nuxeo.server.https.keystorePass}"
- clientAuth="false" sslProtocol="TLS" />
-</#if>
-
- 
- <Connector port="${nuxeo.server.ajp.port}" protocol="AJP/1.3"
- address="${nuxeo.bind.address}"
- redirectPort="${nuxeo.server.https.port}" />
-
-
- 
-
- 
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="${nuxeo.server.jvmRoute}">
-
- 
- 
-
- 
- 
-
- 
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- 
- <Host name="localhost" appBase="webapps"
- unpackWARs="true"
- autoDeploy="${isWizard?string('true', 'false')}" >
-
-<#if !isWizard>
- 
- <Listener className="org.nuxeo.runtime.tomcat.NuxeoDeployer" home="nxserver" />
-</#if>
-
- 
- 
-
- 
- 
-
- </Host>
- </Engine>
- </Service>
-</Server>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
deleted file mode 100644
index aa5c457..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nuxeo.defaults
+++ /dev/null
@@ -1,107 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-common-base.target=.
-
-nuxeo.server.sdk=false
-nuxeo.server.http.port=8080
-nuxeo.server.ajp.port=8009
-nuxeo.server.https.port=0
-nuxeo.server.tomcat_admin.host=localhost
-nuxeo.server.tomcat_admin.port=8005
-nuxeo.server.jvmRoute=nuxeo
-NuxeoContainer.autoactivation=false
-
-# GlobalNamingResources datasource (not visible from webapp)
-nuxeo.db.embeddedDatasources=true
-nuxeo.db.xaMode=false
-nuxeo.db.commonds=jdbc/nuxeo
-
-nuxeo.db.min-pool-size=5
-nuxeo.db.max-pool-size=100
-nuxeo.db.blocking-timeout-millis=1000
-nuxeo.db.idle-timeout-minutes=5
-nuxeo.db.validationQuery=
-nuxeo.db.sql-exception-sorter=org.nuxeo.runtime.datasource.DatasourceExceptionSorter
-nuxeo.db.user_separator_key=,
-
-nuxeo.vcs.min-pool-size=0
-nuxeo.vcs.max-pool-size=20
-nuxeo.vcs.blocking-timeout-millis=100
-nuxeo.vcs.idle-timeout-minutes=10
-nuxeo.vcs.fulltext.disabled=false
-nuxeo.vcs.fulltext.search.disabled=false
-nuxeo.vcs.noddl=false
-nuxeo.vcs.ddlmode=execute
-nuxeo.vcs.idtype=varchar
-nuxeo.vcs.fulltext.analyzer.language=english
-nuxeo.vcs.optimizations.acl.enabled=true
-nuxeo.vcs.optimizations.path.enabled=true
-
-# Mail server
-mail.store.protocol=pop3
-mail.store.host=localhost
-mail.store.port=110
-mail.store.user=anonymous
-mail.store.password=secret
-# Mail transport
-mail.transport.protocol=smtp
-mail.transport.host=localhost
-mail.transport.port=25
-mail.transport.user=anonymous
-mail.transport.password=secret
-mail.transport.usetls=false
-mail.transport.auth=false
-# User who will receive mail
-mail.user=nobody
-# Enable debugging output from the javamail classes
-mail.debug=false
-mail.from=***@nuxeo.com
-
-nuxeo.core.binarymanager=org.nuxeo.ecm.core.blob.binary.DefaultBinaryManager
-nuxeo.core.binarymanager_key=
-nuxeo.quartz.enable=false
-###
-# Elasticsearch
-elasticsearch.enabled=true
-# Name of the Elasticsearch index for the default document repository
-elasticsearch.indexName=nuxeo
-# Comma separated list of Elasticsearch nodes, if empty use a local in JVM node
-elasticsearch.addressList=
-# Name of the Elasticsearch cluster to join
-elasticsearch.clusterName=nuxeoCluster
-# Number of replicas (not for local node)
-elasticsearch.indexNumberOfReplicas=1
-# Number of shards (not for local node)
-elasticsearch.indexNumberOfShards=5
-# Name of the local node
-elasticsearch.nodeName=nuxeoNode
-# Does the local node accept HTTP request on port 9200
-elasticsearch.httpEnabled=false
-# Network binding. Policy is to accept request from local machine only.
-elasticsearch.networkHost=127.0.0.1
-# Load document model from Elasticsearch result (experimental)
-# if false load from document from VCS
-elasticsearch.fetchDocFromEs=false
-# Comma separated list of CorePageProvider names to supersede by Elasticsearch
-elasticsearch.override.pageproviders=default_search,default_document_suggestion,DEFAULT_DOCUMENT_SUGGESTION,advanced_document_content
-# Reindexing option, number of documents to process per worker @since 6.0-HF02
-elasticsearch.reindex.bucketReadSize=500
-# Reindexing option, number of documents to submit to Elasticsearch per bulk command @since 6.0-HF02
-elasticsearch.reindex.bucketWriteSize=50
-# Maximum size of the indexing thread pool @since 6.0-HF02
-elasticsearch.indexing.maxThreads=4
-# Time to keep the completed indexing worker states @since 6.0-HF02
-elasticsearch.indexing.clearCompletedAfterSeconds=90
-# Display Elasticsearch cluster and nodes information in the admin center @since 6.0-HF06, always true for embedded mode
-elasticsearch.adminCenter.displayClusterInfo=false
-# Reindex the repository content on startup if the index is empty
-elastcisearch.reindex.onStartup=false
-# Use Elasticsearch as a backend for audit logs
-audit.elasticsearch.enabled=false
-# Name of the Elasticsearch index for audit logs
-audit.elasticsearch.indexName=${elasticsearch.indexName}-audit
-# Name of the Elasticsearch index for the uid sequencer
-seqgen.elasticsearch.indexName=${elasticsearch.indexName}-uidgen
-# Migrate audit logs from SQL storage to Elasticsearch indexing, requires audit.elasticsearch.enabled=true
-audit.elasticsearch.migration=false
-# Batch size for audit logs migration, only useful with audit.elasticsearch.migration=true
-audit.elasticsearch.migration.batchSize=1000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
deleted file mode 100644
index 4bccf7c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/datasources-config.xml.nxftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.runtime.datasource.server.contrib">
-
-<#if nuxeo.db.embeddedDatasources == "true">
- <extension target="org.nuxeo.runtime.datasource" point="datasources">
-<#if nuxeo.db.xaMode == "false">
- <datasource name="${nuxeo.db.commonds}" driverClassName="${nuxeo.db.driver}"
- url="${nuxeo.db.jdbc.url}" username="${nuxeo.db.user}" password="${nuxeo.db.password}"
- maxPoolSize="${nuxeo.db["max-pool-size"]}"
- minPoolSize="${nuxeo.db["min-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
- idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
- sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
- validationQuery="${nuxeo.db.validationQuery}"
- accessToUnderlyingConnectionAllowed="true" />
-<#else>
- <datasource name="${nuxeo.db.commonds}" xaDataSource="${nuxeo.db.xadatasource}"
- maxPoolSize="${nuxeo.db["max-pool-size"]}"
- minPoolSize="${nuxeo.db["min-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
- idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
- sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
- validationQuery="${nuxeo.db.validationQuery}"
- accessToUnderlyingConnectionAllowed="true" >
-<#include "xadatasource-params.ftl" parse=true />
- </datasource>
-</#if>
- <link name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/repository_default" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-<#if "${nuxeo.quartz.enable}" == "true">
- <link name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
- <link name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
-</#if>
- </extension>
-</#if>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
deleted file mode 100644
index 11e45a7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/default-repository-config.xml.nxftl
+++ /dev/null
@@ -1,118 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="default-repository-config">
- <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
- <blobprovider name="default">
- <class>${nuxeo.core.binarymanager}</class>
- <property name="path">${repository.binary.store}</property>
- <property name="key">${nuxeo.core.binarymanager_key}</property>
- </blobprovider>
- </extension>
-<#if "${nuxeo.mongodb.server}" == "">
- <extension target="org.nuxeo.ecm.core.storage.sql.RepositoryService"
- point="repository">
- <repository name="default" label="label.default.repository">
- <pool minPoolSize="${nuxeo.vcs["min-pool-size"]}" maxPoolSize="${nuxeo.vcs["max-pool-size"]}"
- blockingTimeoutMillis="${nuxeo.vcs["blocking-timeout-millis"]}" idleTimeoutMinutes="${nuxeo.vcs["idle-timeout-minutes"]}" />
- <clustering id="${repository.clustering.id}" enabled="${repository.clustering.enabled}" delay="${repository.clustering.delay}" />
-<#if "${repository.clustering.invalidation}" == "redis">
- <clusterInvalidatorClass>org.nuxeo.ecm.core.redis.contribs.RedisClusterInvalidator</clusterInvalidatorClass>
-</#if>
- <noDDL>${nuxeo.vcs.noddl}</noDDL>
- <ddlMode>${nuxeo.vcs.ddlmode}</ddlMode>
- <aclOptimizations enabled="${nuxeo.vcs.optimizations.acl.enabled}"/>
- <pathOptimizations enabled="${nuxeo.vcs.optimizations.path.enabled}"/>
- <idType>${nuxeo.vcs.idtype}</idType>
- <indexing>
-<#if "${nuxeo.db.type}" == "postgresql">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
- analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-<#elseif "${nuxeo.db.type}" == "oracle">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
- 
-<#elseif "${nuxeo.db.type}" == "mssql">
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
- analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
- <index name="default">
- 
- </index>
- 
- </fulltext>
-<#elseif "${nuxeo.db.type}" == "mysql">
- 
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-<#else>
- 
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" analyzer="org.apache.lucene.analysis.standard.StandardAnalyzer">
- <index name="default">
- 
- </index>
- <index name="title">
- <field>dc:title</field>
- </index>
- <index name="description">
- <field>dc:description</field>
- </index>
- </fulltext>
-</#if>
- </indexing>
-<#if "${nuxeo.db.type}" != "mysql">
- <usersSeparator key="${nuxeo.db.user_separator_key}" />
-</#if>
-<#if "${nuxeo.db.type}" == "mysql">
- <schema>
- <field type="largetext">var_ParallelDocumentReview:review_result</field>
- </schema>
-</#if>
- </repository>
- </extension>
-<#else>
- <extension target="org.nuxeo.ecm.core.storage.mongodb.MongoDBRepositoryService"
- point="repository">
- <repository name="default" label="MongoDB Repository">
- <server>${nuxeo.mongodb.server}</server>
- <dbname>${nuxeo.mongodb.dbname}</dbname>
- <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" />
- </repository>
- </extension>
-</#if>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
deleted file mode 100644
index 9371179..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
+++ /dev/null
@@ -1,116 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.index.audit.contrib">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchIndex">
-
- <elasticSearchIndex name="${audit.elasticsearch.indexName}" type="entry" >
- <settings>{
-<#if "${elasticsearch.addressList}" != "">
- "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
- "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
-</#if>
- "analysis" : {
- "filter" : {
- "truncate_filter" : {
- "length" : 256,
- "type" : "truncate"
- },
- "word_delimiter_filter" : {
- "type" : "word_delimiter",
- "preserve_original" : true
- },
- "en_stem_filter" : {
- "name" : "minimal_english",
- "type" : "stemmer"
- },
- "en_stop_filter" : {
- "stopwords" : [
- "_english_"
- ],
- "type" : "stop"
- }
- },
- "tokenizer" : {
- "path_tokenizer" : {
- "delimiter" : "/",
- "type" : "path_hierarchy"
- }
- },
- "analyzer" : {
- "en_analyzer" : {
- "alias" : "fulltext",
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "en_stop_filter",
- "en_stem_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "path_analyzer" : {
- "type" : "custom",
- "tokenizer" : "path_tokenizer"
- },
- "default" : {
- "type" : "custom",
- "filter" : [ "truncate_filter" ],
- "tokenizer" : "keyword"
- }
- }
- }
-}
- </settings>
- <mapping>
- {
- "_all" : {
- "analyzer" : "fulltext"
- },
- "properties" : {
- "comment" : {
- "type" : "multi_field",
- "fields" : {
- "comment" : {
- "type" : "string"
- },
- "fulltext" : {
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "eventDate": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "logDate": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "docPath": {
- "type" : "multi_field",
- "fields" : {
- "children" : {
- "search_analyzer" : "keyword",
- "index_analyzer" : "path_analyzer",
- "type" : "string"
- },
- "docPath" : {
- "index" : "not_analyzed",
- "type" : "string"
- }
- }
- }
- }
- }
- </mapping>
- </elasticSearchIndex>
-
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
deleted file mode 100644
index 2fe1e69..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
+++ /dev/null
@@ -1,17 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<#assign ppNames="${elasticsearch.override.pageproviders}"?split(",") />
-<component name="org.nuxeo.ecm.platform.query.api.PageProviderservice.replacers.defaultConfig">
-
- <extension target="org.nuxeo.ecm.platform.query.api.PageProviderService" point="replacers">
-
- <replacer withClass="org.nuxeo.elasticsearch.provider.ElasticSearchNxqlPageProvider"
- enabled="${r"${elasticsearch.enabled:=true}"}">
-<#list ppNames as ppName>
- <provider>${ppName?trim}</provider>
-</#list>
- </replacer>
-
- </extension>
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
deleted file mode 100644
index 0967ae2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-config.xml.nxftl
+++ /dev/null
@@ -1,255 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.defaultConfig">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
-<#if "${elasticsearch.addressList}" == "">
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchLocal">
- <elasticSearchLocal
- clusterName="${elasticsearch.clusterName}"
- nodeName="${elasticsearch.nodeName}"
- pathData="${nuxeo.data.dir}/elasticsearch"
- pathLogs="${nuxeo.log.dir}/elasticsearch"
- httpEnabled="${elasticsearch.httpEnabled}"
- networkHost="${elasticsearch.networkHost}" />
- </extension>
-<#else>
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchRemote">
- <elasticSearchRemote
- clusterName="${elasticsearch.clusterName}"
- addressList="${elasticsearch.addressList}"
- clientTransportSniff="false"
- clientTransportIgnoreClusterName="false"
- clientTransportPingTimeout="5s"
- clientTransportNodesSamplerInterval="5s" />
- </extension>
-</#if>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
- point="elasticSearchIndex">
- <elasticSearchIndex name="${elasticsearch.indexName}" type="doc" repository="default">
- <fetchFromSource>
- <include>ecm:*</include>
- <include>dc:*</include>
- <exclude>ecm:binarytext</exclude>
- </fetchFromSource>
-
- <settings>
-{
-<#if "${elasticsearch.addressList}" != "">
- "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
- "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
-</#if>
- "analysis" : {
- "filter" : {
- "truncate_filter" : {
- "length" : 256,
- "type" : "truncate"
- },
- "word_delimiter_filter" : {
- "type" : "word_delimiter",
- "preserve_original" : true
- },
- "asciifolding_filter" : {
- "type" : "asciifolding",
- "preserve_original" : true
- },
- "en_stem_filter" : {
- "name" : "minimal_english",
- "type" : "stemmer"
- },
- "en_stop_filter" : {
- "stopwords" : [
- "_english_"
- ],
- "type" : "stop"
- },
- "fr_elision_filter" : {
- "articles" : [
- "c",
- "l",
- "m",
- "t",
- "qu",
- "n",
- "s",
- "j"
- ],
- "type" : "elision"
- },
- "fr_stem_filter" : {
- "name" : "minimal_french",
- "type" : "stemmer"
- },
- "fr_stop_filter" : {
- "stopwords" : [
- "_french_"
- ],
- "type" : "stop"
- }
- },
- "tokenizer" : {
- "path_tokenizer" : {
- "delimiter" : "/",
- "type" : "path_hierarchy"
- }
- },
- "analyzer" : {
- "en_analyzer" : {
- "alias" : "fulltext",
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "en_stop_filter",
- "en_stem_filter",
- "asciifolding_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "fr_analyzer" : {
- "char_filter": [ "html_strip"],
- "filter" : [
- "word_delimiter_filter",
- "lowercase",
- "fr_stop_filter",
- "fr_stem_filter",
- "asciifolding_filter",
- "fr_elision_filter"
- ],
- "type" : "custom",
- "tokenizer" : "standard"
- },
- "path_analyzer" : {
- "type" : "custom",
- "tokenizer" : "path_tokenizer"
- },
- "lowercase_analyzer" : {
- "type" : "custom",
- "filter" : [ "truncate_filter", "lowercase", "asciifolding" ],
- "tokenizer" : "keyword"
- },
- "default" : {
- "type" : "custom",
- "filter" : [ "truncate_filter" ],
- "tokenizer" : "keyword"
- }
- }
- }
-}
- </settings>
- <mapping>
-{
- "_size" : {
- "enabled" : true
- },
- "_all" : {
- "analyzer" : "fulltext"
- },
- "dynamic_templates": [ {
- "no_thumbnail_template": {
- "path_match": "thumb:thumbnail.*",
- "mapping": {
- "index": "no",
- "include_in_all": false
- }
- }
- }, {
- "no_picture_template": {
- "path_match": "picture:views.*",
- "mapping": {
- "index": "no",
- "include_in_all": false
- }
- }
- } ],
- "properties" : {
- "dc:title" : {
- "type" : "multi_field",
- "fields" : {
- "dc:title" : {
- "type" : "string"
- },
- "fulltext" : {
- "boost": 2,
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "dc:description" : {
- "type" : "multi_field",
- "fields" : {
- "dc:description" : {
- "index" : "no",
- "include_in_all" : true,
- "type" : "string"
- },
- "fulltext" : {
- "boost": 1.5,
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "note:note" : {
- "type" : "multi_field",
- "fields" : {
- "note:note" : {
- "index" : "no",
- "include_in_all" : true,
- "type" : "string"
- },
- "fulltext" : {
- "type": "string",
- "analyzer" : "fulltext"
- }
- }
- },
- "ecm:binarytext" : {
- "type" : "string",
- "index" : "no",
- "include_in_all" : true
- },
- "ecm:path" : {
- "type" : "multi_field",
- "fields" : {
- "children" : {
- "search_analyzer" : "keyword",
- "index_analyzer" : "path_analyzer",
- "type" : "string"
- },
- "ecm:path" : {
- "index" : "not_analyzed",
- "type" : "string"
- }
- }
- },
- "ecm:pos": {
- "type": "integer"
- },
- "dc:created": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "dc:modified": {
- "format": "dateOptionalTime",
- "type": "date"
- },
- "common:icon": {
- "type": "string",
- "index" : "no",
- "include_in_all" : false
- }
- }
-}
- </mapping>
-
- </elasticSearchIndex>
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
deleted file mode 100644
index 156d74f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
+++ /dev/null
@@ -1,31 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.elasticsearch.index.sequence.contrib">
- <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
-
- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
-
- <elasticSearchIndex name="${seqgen.elasticsearch.indexName}" type="seqId">
-
- <settings>
- {
- "number_of_shards" : 1,
- "auto_expand_replicas" : "0-all"
- }
- </settings>
-
- <mapping>
- {
- "_source" : {"enabled": false},
- "_all" : {"enabled": false},
- "_type" : {"index": "no"},
- "enabled" : false
- }
- </mapping>
-
- </elasticSearchIndex>
-
- </extension>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
deleted file mode 100644
index a259904..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/redis-config.xml.nxftl
+++ /dev/null
@@ -1,53 +0,0 @@
-<#escape x as x?xml>
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.redis.config">
- <require>org.nuxeo.ecm.core.work.config</require>
-
-<#if "${nuxeo.redis.enabled}" == "true">
- <extension target="org.nuxeo.ecm.core.redis"
- point="configuration">
-<#if "${nuxeo.redis.ha.enabled}" == "true">
- <sentinel>
- <master>${nuxeo.redis.ha.master}</master>
- <failoverTimeout>${nuxeo.redis.ha.timeout}</failoverTimeout>
-<#assign names="${nuxeo.redis.ha.hosts}"?split(",") />
-<#list names as name>
- <host name="${name}" port="${nuxeo.redis.ha.port}"/>
-</#list>
- <password>${nuxeo.redis.password}</password>
- <database>${nuxeo.redis.database}</database>
- <timeout>${nuxeo.redis.timeout}</timeout>
- <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
- <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
- <prefix>${nuxeo.redis.prefix}</prefix>
- </sentinel>
-<#else>
- <server>
- <host>${nuxeo.redis.host}</host>
- <port>${nuxeo.redis.port}</port>
- <password>${nuxeo.redis.password}</password>
- <database>${nuxeo.redis.database}</database>
- <timeout>${nuxeo.redis.timeout}</timeout>
- <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
- <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
- <prefix>${nuxeo.redis.prefix}</prefix>
- </server>
-</#if>
- </extension>
-
-
-<#if "${nuxeo.lock.manager}" == "redis">
-  <extension target="org.nuxeo.ecm.core.storage.lock.LockManagerService" point="lockmanager">
-    <lockmanager name="default" class="org.nuxeo.ecm.core.redis.contribs.RedisLockManager" />
-  </extension>
-</#if>
-
-<#if "${nuxeo.work.queuing}" == "redis">
- <extension target="org.nuxeo.ecm.core.work.service" point="implementation">
- <queuing class="org.nuxeo.ecm.core.redis.contribs.RedisWorkQueuing"/>
- </extension>
-</#if>
-</#if>
-
-</component>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
deleted file mode 100644
index 6f8e4b2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/webengine.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.nuxeo.ecm.webengine.skinPathPrefix=${org.nuxeo.ecm.contextPath}/site/skin
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
deleted file mode 100644
index f8b8c71..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/nxserver/config/xadatasource-params.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-<#escape x as x?xml>
-<#if "${nuxeo.db.type}" == "postgresql">
- <property name="ServerName">${nuxeo.db.host}</property>
- <property name="PortNumber">${nuxeo.db.port}</property>
- <property name="DatabaseName">${nuxeo.db.name}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#elseif "${nuxeo.db.type}" == "oracle">
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#elseif "${nuxeo.db.type}" == "mssql">
- <property name="ServerName">${nuxeo.db.host}</property>
- <property name="PortNumber">${nuxeo.db.port}</property>
- <property name="DatabaseName">${nuxeo.db.name}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
- <property name="UseCursors">true</property>
-<#elseif "${nuxeo.db.type}" == "mysql">
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-<#else>
- <property name="URL">${nuxeo.db.jdbc.url}</property>
- <property name="User">${nuxeo.db.user}</property>
- <property name="Password">${nuxeo.db.password}</property>
-</#if>
-</#escape>
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
deleted file mode 100644
index c4c50fa..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common-base/webapps/ROOT/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<META HTTP-EQUIV="refresh" CONTENT="0;URL=${org.nuxeo.ecm.contextPath}">
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
deleted file mode 100644
index d57f246..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/nuxeo-preprocessor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<container>
-
- <template name="application" src="META-INF/templates/application.xml"
- installPath="META-INF/application.xml" required="true" />
-
- <template name="web" src="META-INF/templates/web.xml" installPath="nuxeo.war/WEB-INF/web.xml"
- required="true" />
-
- <template name="faces-config" src="META-INF/templates/faces-config.xml"
- installPath="nuxeo.war/WEB-INF/faces-config.xml" required="true" />
-
- <template name="pages" src="META-INF/templates/pages.xml"
- installPath="nuxeo.war/WEB-INF/pages.xml" required="true" />
-
- <template name="components" src="META-INF/templates/components.xml"
- installPath="nuxeo.war/WEB-INF/components.xml" required="true" />
-
- <template name="jaxws" src="META-INF/templates/sun-jaxws.xml"
- installPath="nuxeo.war/WEB-INF/sun-jaxws.xml" required="false" />
-
- <directory>bundles</directory>
- <directory>plugins</directory>
-
- <install>
- <property name="war" value="/nuxeo.war" />
- <property name="datasources" value="datasources" />
-
- 
- <delete path="/META-INF/application.xml" />
- </install>
-</container>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
deleted file mode 100644
index d4caeca..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/application.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
-
- <display-name>Nuxeo EP</display-name>
-
- %{MODULE}%
-
- <module>
- <web>
- <web-uri>nuxeo.war</web-uri>
- <context-root>${org.nuxeo.ecm.contextPath}</context-root>
- </web>
- </module>
-
-</application>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
deleted file mode 100644
index 44f28e2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/components.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:mail="http://jboss.com/products/seam/mail">
-
- <component name="org.jboss.seam.core.init">
- <property name="debug">false</property>
- <property name="myFacesLifecycleBug">false</property>
- <property name="jndiPattern">nuxeo/#{ejbName}/local</property>
- </component>
-
- <component name="org.jboss.seam.core.manager">
- %{SEAM_CORE_MANAGER}%
- </component>
-
- 
- <mail:mailSession sessionJndiName="java:/Mail" />
-
-</components>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
deleted file mode 100644
index 8445332..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/faces-config.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
-
- <factory>
-
- %{FACTORY}%
-
- </factory>
-
- %{NAVIGATION-RULE}%
-
- <navigation-rule>
-
- %{NAVIGATION}%
-
- </navigation-rule>
-
- %{MANAGED-BEAN}%
-
- 
- <application>
-
- %{APPLICATION}%
-
- %{APPLICATION_LOCALE}%
-
- </application>
-
- <lifecycle>
-
- %{PHASE-LISTENER}%
-
- </lifecycle>
-
- 
-
- %{COMPONENT}%
-
- <render-kit>
-
- %{RENDERER}%
-
- </render-kit>
-
- %{CONVERTER}%
-
- %{VALIDATOR}%
-
-</faces-config>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
deleted file mode 100644
index 0cb9d06..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
- <deployment>
- <exclude-subsystems>
- <subsystem name="jpa"/>
- <subsystem name="ejb3"/>
- <subsystem name="webservices" />
- <subsystem name="jsf" />
- <subsystem name="jaxrs" />
- <subsystem name="weld" />
- <subsystem name="pojo" />
- <subsystem name="remoting" />
- <subsystem name="sar" />
- <subsystem name="io.understow.jsp"/>
- </exclude-subsystems>
-
- <exclusions>
- <module name="org.hibernate" />
- <module name="org.hibernate.validator" />
- </exclusions>
-
- <dependencies>
- <module name="org.apache.commons.lang" />
- <module name="org.apache.commons.logging" />
- <module name="org.apache.log4j" />
- <module name="org.jboss.logging" />
- <module name="org.jboss.logging.jul-to-slf4j-stub" />
- <module name="org.jboss.logmanager" />
- <module name="org.slf4j" />
- <module name="org.slf4j.impl" />
- <module name="javax.servlet.api"/>
- <module name="javax.jws.api"/>
- <module name="javax.xml.soap.api"/>
- <module name="io.undertow.jsp"/>
- <module name="org.apache.xerces"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
deleted file mode 100644
index 5dd4f6c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/jboss-web.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_3_0.dtd">
-
-<jboss-web>
-
- <context-root>${org.nuxeo.ecm.contextPath}</context-root>
-
-</jboss-web>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
deleted file mode 100644
index da585a4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/pages.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-
- %{PAGES}%
-
-</pages>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
deleted file mode 100644
index 3ca0a97..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/META-INF/templates/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- %{LISTENER}%
-
- %{EXCEPTION-FILTER}%
-
- %{CORS-FILTER}%
-
- %{AUTH-FILTER}%
-
- %{STD-AUTH-FILTER}%
-
- 
- %{FIRST-FILTER}%
-
- %{FILTER}%
-
- %{FILTER-MAPPING}%
-
- %{CONTEXT-PARAM}%
-
- %{CONTEXT-PARAM-RICHFACES}%
-
- %{LOGIN-CONFIG}%
-
- %{SERVLET}%
-
- %{SERVLET-MAPPING}%
-
- %{ERROR-PAGE}%
-
- %{SECURITY-CONSTRAINT}%
-
- %{LAST-SERVLET}%
-
- <security-role>
- <description>The role required to access restricted content</description>
- <role-name>admin</role-name>
- </security-role>
-
- <security-role>
- <description>The role required to access restricted content</description>
- <role-name>regular</role-name>
- </security-role>
-
- <session-config>
- <session-timeout>${session.timeout}</session-timeout>
- </session-config>
-
-</web-app>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
deleted file mode 100644
index 08bbdd4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/bundles/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains the Nuxeo modules
-These modules are required to run the nuxeo framework
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
deleted file mode 100644
index a647ddf..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/auth-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<component
- name="org.nuxeo.coreserver.auth">
-
- 
- <require>org.nuxeo.ecm.platform.ui.web.auth.defaultConfig</require>
- <require>org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService
- </require>
-
- <extension
- target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
- point="specificChains">
-
- <specificAuthenticationChain
- name="Site">
- <urlPatterns>
- <url>(.*)/site.*</url>
- </urlPatterns>
-
- <replacementChain>
- <plugin>BASIC_AUTH2</plugin>
- </replacementChain>
- </specificAuthenticationChain>
- </extension>
-
- <extension
- target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
- point="authenticators">
-
- <authenticationPlugin
- name="BASIC_AUTH2"
- enabled="true"
- class="org.nuxeo.ecm.platform.ui.web.auth.plugins.BasicAuthenticator">
- <needStartingURLSaving>false</needStartingURLSaving>
- <stateful>false</stateful>
- <parameters>
- <parameter
- name="RealmName">Nuxeo CoreServer</parameter>
- <parameter
- name="AutoPrompt">true</parameter>
- </parameters>
- </authenticationPlugin>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
deleted file mode 100644
index 1921626..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/blacklist.nxftl
+++ /dev/null
@@ -1,10 +0,0 @@
-<#escape x as x?xml>
-org.nuxeo.runtime.trackers.files.threadstracking.config
-<#if elasticsearch.enabled != "true" || audit.elasticsearch.enabled != "true">
-org.nuxeo.elasticsearch.audit.contrib
-org.nuxeo.elasticsearch.index.audit.contrib
-org.nuxeo.ecm.platform.audit.PageProviderservice.es.contrib
-org.nuxeo.ecm.platform.audit.search.contrib
-org.nuxeo.admin.audit.es.contentView.contrib
-</#if>
-</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
deleted file mode 100644
index 7f9654d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/cache-config.xml.nxftl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.cache.config">
-
- <#if "${nuxeo.redis.enabled}" == "true" && "${nuxeo.cache.type}" == "redis">
- <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisCache" />
- <#else>
- <#assign className = "org.nuxeo.ecm.core.cache.InMemoryCacheImpl" />
- </#if>
-
- <extension target="org.nuxeo.ecm.core.cache.CacheService"
- point="caches">
- <cache name="default-cache" class="${className}">
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-user-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-user-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-group-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-group-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-user-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-user-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-group-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="ldap-group-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-digestauth-entry-cache" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
- <cache name="sql-digestauth-entry-cache-without-references" class="${className}">
- <option name="maxSize">${nuxeo.cache.maxsize}</option>
- <ttl>${nuxeo.cache.ttl}</ttl>
- <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
- </cache>
-
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
deleted file mode 100644
index 2ddd1b2..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-ldap-users-directory-bundle.xml.nxftl
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.directory.ldap.storage.users">
-
-<#if "${nuxeo.directory.type}" == "default">
- 
-<#else>
- <implementation class="org.nuxeo.ecm.directory.ldap.LDAPDirectoryDescriptor" />
- <implementation class="org.nuxeo.ecm.directory.ldap.LDAPServerDescriptor" />
- <require>org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory</require>
-
- 
- <require>org.nuxeo.ecm.directory.sql.storage</require>
- <require>org.nuxeo.ecm.platform.usermanager.UserManagerImpl</require>
-
- <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
- point="servers">
-
- 
- <server name="default">
-
- <ldapUrl>${nuxeo.ldap.url}</ldapUrl>
- 
-
- 
- <bindDn>${nuxeo.ldap.binddn}</bindDn>
- <bindPassword>${nuxeo.ldap.bindpassword}</bindPassword>
- 
- <retries>${nuxeo.ldap.retries}</retries>
- </server>
-
- </extension>
-
- <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
- point="directories">
-
- <directory name="ldapUserDirectory">
- <server>default</server>
- <schema>user</schema>
- <idField>username</idField>
- <passwordField>password</passwordField>
-
- <searchBaseDn>${nuxeo.ldap.user.searchBaseDn}</searchBaseDn>
- <searchClass>${nuxeo.ldap.user.searchClass}</searchClass>
- 
-<#if "${nuxeo.ldap.user.searchFilter}" != "">
- <searchFilter>${nuxeo.ldap.user.searchFilter}</searchFilter>
-</#if>
-
- 
- <searchScope>${nuxeo.ldap.user.searchScope}</searchScope>
-
- 
- <substringMatchType>${nuxeo.ldap.user.searchBehavior}</substringMatchType>
-
- <readOnly>${nuxeo.ldap.user.readonly}</readOnly>
-
- 
- <cacheEntryName>ldap-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>ldap-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- 
- <missingIdFieldCase>lower</missingIdFieldCase>
-
- 
- <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
-
- 
- <queryTimeLimit>0</queryTimeLimit>
-
- <creationBaseDn>ou=people,dc=example,dc=com</creationBaseDn>
- <creationClass>top</creationClass>
- <creationClass>person</creationClass>
- <creationClass>organizationalPerson</creationClass>
- <creationClass>inetOrgPerson</creationClass>
-
- <rdnAttribute>${nuxeo.ldap.user.mapping.rdn}</rdnAttribute>
- <fieldMapping name="username">${nuxeo.ldap.user.mapping.username}</fieldMapping>
- <fieldMapping name="password">${nuxeo.ldap.user.mapping.password}</fieldMapping>
- <fieldMapping name="firstName">${nuxeo.ldap.user.mapping.firstname}</fieldMapping>
- <fieldMapping name="lastName">${nuxeo.ldap.user.mapping.lastname}</fieldMapping>
- <fieldMapping name="company">${nuxeo.ldap.user.mapping.company}</fieldMapping>
- <fieldMapping name="email">${nuxeo.ldap.user.mapping.email}</fieldMapping>
-
- <references>
-<#if "${nuxeo.user.group.storage}" == "default">
- <inverseReference field="groups" directory="ldapGroupDirectory"
- dualReferenceField="members" />
-</#if>
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <inverseReference field="groups" directory="sqlGroupDirectory"
- dualReferenceField="members" />
-</#if>
-<#if "${nuxeo.user.group.storage}" == "ldapUserMultiGroup" || "${nuxeo.user.group.storage}" == "multiUserGroup">
- <inverseReference field="groups" directory="multiGroupDirectory"
- dualReferenceField="members" />
-</#if>
- </references>
-
- </directory>
-
-<#if "${nuxeo.user.group.storage}" != "userLdapOnly" && "${nuxeo.user.group.storage}" != "multiUserSqlGroup">
- <directory name="ldapGroupDirectory">
-
- 
- <server>default</server>
-
- <schema>group</schema>
- <idField>groupname</idField>
-
- <searchBaseDn>${nuxeo.ldap.group.searchBaseDn}</searchBaseDn>
- <searchFilter>
- ${nuxeo.ldap.group.searchFilter}
- </searchFilter>
- <searchScope>${nuxeo.ldap.group.searchScope}</searchScope>
-
- <readOnly>${nuxeo.ldap.group.readonly}</readOnly>
-
- 
- <cacheEntryName>ldap-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>ldap-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <creationBaseDn>ou=groups,dc=example,dc=com</creationBaseDn>
- <creationClass>top</creationClass>
- <creationClass>groupOfUniqueNames</creationClass>
-
- 
- <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
-
- 
- <queryTimeLimit>${nuxeo.ldap.query.timeLimit}</queryTimeLimit>
-
- <rdnAttribute>${nuxeo.ldap.group.mapping.rdn}</rdnAttribute>
- <fieldMapping name="groupname">${nuxeo.ldap.group.mapping.name}</fieldMapping>
- 
- <fieldMapping name="grouplabel">${nuxeo.ldap.group.mapping.label}</fieldMapping>
-
- <references>
- 
- <ldapReference field="members" directory="ldapUserDirectory"
- forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
- dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
-
- <ldapReference field="subGroups" directory="ldapGroupDirectory"
- forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
- dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
-
-<#if "${nuxeo.user.group.storage}" == "default">
- <inverseReference field="parentGroups" directory="ldapGroupDirectory"
-<#else>
- <inverseReference field="parentGroups" directory="multiGroupDirectory"
-</#if>
- dualReferenceField="subGroups" />
-
- 
- <ldapTreeReference field="directChildren" directory="unitDirectory"
- scope="onelevel" />
- <ldapTreeReference field="children" directory="unitDirectory"
- scope="subtree" />
-
- </references>
-
- </directory>
-</#if>
- </extension>
-
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.directory.type}" == "multi">
- <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
- <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
-
-<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <directory name="sqlUserDirectory">
-
- <schema>user</schema>
-
- <dataSource>jdbc/nxsqldirectory</dataSource>
-
- <table>users</table>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
- <autoincrementIdField>false</autoincrementIdField>
- <computeMultiTenantId>false</computeMultiTenantId>
- <dataFile>users.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <querySizeLimit>50</querySizeLimit>
-
- <cacheEntryName>sql-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <inverseReference field="groups" directory="sqlGroupDirectory"
- dualReferenceField="members" />
- </references>
-
- </directory>
-</#if>
-<#if "${nuxeo.directory.type}" == "multi" || "${nuxeo.user.group.storage}" == "userLdapOnly">
- <directory name="sqlGroupDirectory">
-
- <schema>group</schema>
- <dataSource>jdbc/nxsqldirectory</dataSource>
- <table>groups</table>
- <idField>groupname</idField>
- <dataFile>groups.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <autoincrementIdField>false</autoincrementIdField>
-
- <cacheEntryName>sql-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
-<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <tableReference field="members" directory="ldapUserDirectory"
-<#else>
- <tableReference field="members" directory="multiUserDirectory"
-</#if>
- table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
- dataFile="user2group.csv" />
-<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <tableReference field="subGroups" directory="multiGroupDirectory"
-<#else>
- <tableReference field="subGroups" directory="sqlGroupDirectory"
-</#if>
- table="group2group" sourceColumn="parentGroupId"
- targetColumn="childGroupId" schema="group2group" />
- <inverseReference field="parentGroups" directory="sqlGroupDirectory"
- dualReferenceField="subGroups" />
- </references>
-
- </directory>
-</#if>
- </extension>
-</#if>
-
-<#if "${nuxeo.directory.type}" == "multi">
- <extension
- target="org.nuxeo.ecm.directory.multi.MultiDirectoryFactory"
- point="directories">
-
- <directory name="multiUserDirectory">
- <schema>user</schema>
- <idField>username</idField>
- <passwordField>password</passwordField>
-
- <source name="userSQLsource" creation="true">
- <subDirectory name="sqlUserDirectory" />
- </source>
-
- <source name="userLDAPsource">
- <subDirectory name="ldapUserDirectory" />
- </source>
- </directory>
-
- <directory name="multiGroupDirectory">
- <schema>group</schema>
- <idField>groupname</idField>
-
- <source name="groupSQLsource" creation="true">
- <subDirectory name="sqlGroupDirectory" />
- </source>
-
- <source name="groupLDAPsource">
- <subDirectory name="ldapGroupDirectory" />
- </source>
- </directory>
-
- </extension>
-</#if>
-
- <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
-
- <userManager>
- <userCacheName>default-cache</userCacheName>
-<#if "${nuxeo.ldap.defaultAdministratorId}" != "">
- <defaultAdministratorId>${nuxeo.ldap.defaultAdministratorId}</defaultAdministratorId>
-</#if>
-<#if "${nuxeo.ldap.defaultMembersGroup}" != "">
- <defaultGroup>${nuxeo.ldap.defaultMembersGroup}</defaultGroup>
-</#if>
- <users>
-<#if "${nuxeo.directory.type}" == "ldap" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
- <directory>ldapUserDirectory</directory>
-<#else>
- <directory>multiUserDirectory</directory>
-</#if>
-<#if "${nuxeo.user.emergency.enable}" == "true">
- <virtualUser id="${nuxeo.user.emergency.username}" searchable="false">
- <password>${nuxeo.user.emergency.password}</password>
- <property name="firstName">${nuxeo.user.emergency.firstname}</property>
- <property name="lastName">${nuxeo.user.emergency.lastname}</property>
- <group>administrators</group>
- </virtualUser>
-</#if>
-<#if "${nuxeo.user.anonymous.enable}" == "true">
- <anonymousUser id="Guest">
- <property name="firstName">Guest</property>
- <property name="lastName">User</property>
- </anonymousUser>
-</#if>
- </users>
- <groups>
-<#if "${nuxeo.user.group.storage}" == "default">
- <directory>ldapGroupDirectory</directory>
-<#elseif "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
- <directory>sqlGroupDirectory</directory>
-<#else>
- <directory>multiGroupDirectory</directory>
-</#if>
- </groups>
- </userManager>
-
- </extension>
-</#if>
-
-</component>
-
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
deleted file mode 100644
index da08313..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/default-sql-directories-bundle.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.directory.sql.storage">
-
- <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
-
- <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
- <require>org.nuxeo.ecm.platform.digestauth.config</require>
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
-
- <directory name="userDirectory">
-
- <schema>user</schema>
-
- <dataSource>jdbc/nxsqldirectory</dataSource>
-
- <table>users</table>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
- <autoincrementIdField>false</autoincrementIdField>
- <computeMultiTenantId>false</computeMultiTenantId>
- <dataFile>users.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <querySizeLimit>50</querySizeLimit>
-
- 
- <cacheEntryName>sql-user-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <inverseReference field="groups" directory="groupDirectory"
- dualReferenceField="members" />
- </references>
-
- </directory>
-
- <directory name="groupDirectory">
-
- <schema>group</schema>
- <dataSource>jdbc/nxsqldirectory</dataSource>
- <table>groups</table>
- <idField>groupname</idField>
- <dataFile>groups.csv</dataFile>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- <autoincrementIdField>false</autoincrementIdField>
-
- 
- <cacheEntryName>sql-group-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
-
- <references>
- <tableReference field="members" directory="userDirectory"
- table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
- dataFile="user2group.csv" />
- 
- <tableReference field="subGroups" directory="groupDirectory"
- table="group2group" sourceColumn="parentGroupId"
- targetColumn="childGroupId" schema="group2group" />
- <inverseReference field="parentGroups" directory="groupDirectory"
- dualReferenceField="subGroups" />
- </references>
-
- </directory>
-
- <directory name="digestauth">
- <cacheEntryName>sql-digestauth-entry-cache</cacheEntryName>
- <cacheEntryWithoutReferencesName>sql-digestauth-entry-cache-without-references</cacheEntryWithoutReferencesName>
- <schema>digestauth</schema>
- <table>digestauth</table>
- <autoincrementIdField>false</autoincrementIdField>
- <dataSource>java:/nxsqldirectory</dataSource>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- </directory>
-
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
deleted file mode 100644
index 6a68e21..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/distribution.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-## DO NOT EDIT - This file must be filled at packaging time, here are required properties:
-#org.nuxeo.distribution.name=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.server=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.version=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.date=ASSEMBLY_MUST_FILL_IT
-#org.nuxeo.distribution.package=PACKAGING_MUST_FILL_IT
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
deleted file mode 100644
index 8726ebd..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/jms.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-jms.useTransactedConnection=True
-jms.isDeliveryPersistent=False
-jms.isDisableMessageID=True
-jms.isDisableMessageTimestamp=True
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
deleted file mode 100644
index d111c11..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
- <documentation>
- Login modules used on Tomcat
- @author Bogdan Stefanescu (***@nuxeo.com)
- </documentation>
-
-
- <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
-
- <domain name="nuxeo-system-login">
- <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
- <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="multi-threaded">true</option>
- </login-module>
- </domain>
-
- <domain name="nuxeo-client-login">
- <login-module code="org.nuxeo.ecm.platform.login.NuxeoLoginModule"
- flag="required">
- <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
- <option name="useUserIdentificationInfoCB">true</option>
- </login-module>
- <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="restore-login-identity">true</option>
- <option name="multi-threaded">true</option>
- </login-module>
- </domain>
-
-
- <domain name="nuxeo-webengine">
- <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
- flag = "required">
- <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
- <option name="useUserIdentificationInfoCB">true</option>
- </login-module>
- 
- </domain>
-
- </extension>
-
-
-</component>
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
deleted file mode 100644
index 3f99931..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/login-digest-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.digestauth.config">
-
- <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
- point="directories">
- <directory name="digestauth">
- <schema>digestauth</schema>
- <table>digestauth</table>
- <autoincrementIdField>false</autoincrementIdField>
- <dataSource>java:/nxsqldirectory</dataSource>
- <idField>username</idField>
- <passwordField>password</passwordField>
- <createTablePolicy>on_missing_columns</createTablePolicy>
- </directory>
- </extension>
-
- <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
- <userManager>
- <digestAuthDirectory>digestauth</digestAuthDirectory>
- <digestAuthRealm>NUXEO</digestAuthRealm>
- <userCacheName>default-cache</userCacheName>
- </userManager>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
deleted file mode 100644
index cc74965..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/management-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.runtime.management.ServerLocatorContrib">
-
- 
-
- 
- <extension target="org.nuxeo.runtime.management.ServerLocator"
- point="locators">
- <locator domain="jboss" default="true" />
- </extension>
-
- 
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
deleted file mode 100644
index f70ad04..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/mbeans/core-events-service.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- 
- <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NuxeoMessages">
- <attribute name="JNDIName">topic/NuxeoMessages</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- 
- <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NXPMessages">
- <attribute name="JNDIName">topic/NXPMessages</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
-</server>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
deleted file mode 100644
index d72936f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/notification-config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.ear.config.notification">
-
- <extension
- target="org.nuxeo.ecm.platform.ec.notification.service.NotificationService"
- point="generalSettings">
- <settings>
- <serverPrefix>${nuxeo.url}/</serverPrefix>
- <eMailSubjectPrefix>${nuxeo.notification.eMailSubjectPrefix} </eMailSubjectPrefix>
- <mailSessionJndiName>${jndi.base}/Mail</mailSessionJndiName>
- </settings>
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
deleted file mode 100644
index 670b79d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-tomcat.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# avoid initializing nuxeo relations at startup (for faster startup)
-org.nuxeo.ecm.platform.relations.initOnStartup=false
-
-jndi.java.mail=${jndi.base}/Mail
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
deleted file mode 100644
index f8f924d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo-webapp-core.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Properties for exporting search results to CSV
-org.nuxeo.ecm.webapp.search.csv.separator=,
-org.nuxeo.ecm.webapp.search.csv.quotechar="
-org.nuxeo.ecm.webapp.search.csv.endofline=\n
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
deleted file mode 100644
index 3a55311..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nuxeo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# application instance config
-org.nuxeo.ecm.instance.host=localhost
-
-# runtime remoting config
-org.nuxeo.runtime.server.locator=socket://${nuxeo.bind.address}:62474/?datatype=nuxeo
-
-# streaming config
-org.nuxeo.runtime.streaming.isServer=false
-org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
-
-# runtime management config
-org.nuxeo.runtime.management.exist=false
-org.nuxeo.runtime.management.serverRmiPort=2100
-
-# needed for the JNDI auto configuration of clients
-# you need to change this if using JNDI through HTTP
-nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
-nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# for email attachment, to decode the encoded(utf) filenames.
-mail.mime.decodefilename=true
-
-# LiveEdit configuration detection (client/server/both)
-org.nuxeo.ecm.platform.liveedit.config=client
-
-# Uncomment to activate Nuxeo Runtime REST API for Management
-# accessible via http://server:port/nuxeo/site/server/html on JBoss
-#org.nuxeo.runtime.rest.management=true
-
-# size limit to use the specific download servlet for big files (use SI or IEC prefix)
-#org.nuxeo.big.file.size.limit=5Mi
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
deleted file mode 100644
index d38430f..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/nxmail-scheduler-config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.mail.scheduler.config">
-
- <extension
- target="org.nuxeo.ecm.platform.scheduler.core.service.SchedulerRegistryService"
- point="schedule">
-
- <schedule id="mailReceivedSchedule">
- <eventId>MailReceivedEvent</eventId>
- <eventCategory>default</eventCategory>
- 
- <cronExpression>0 0/30 * * * ?</cronExpression>
- </schedule>
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
deleted file mode 100644
index 57ab876..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/ooo-manager-config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.convert.ooomanager.config.default">
- <require>org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent</require>
-
- <extension
- target="org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent"
- point="oooManagerConfig">
-
- <OOoManager>
-
- 
- 
- <portNumbers>
- <portNumber>2003</portNumber>
- </portNumbers>
-
- 
-
- </OOoManager>
- </extension>
-</component>
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
deleted file mode 100644
index 06b5440..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/quartz.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = NON_CLUSTERED
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
deleted file mode 100644
index 5eace81..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/sql.properties.nxftl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Jena database type and transaction mode
-<#if "${nuxeo.db.type}" == "postgresql">
-org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL
-<#elseif "${nuxeo.db.type}" == "oracle">
-org.nuxeo.ecm.sql.jena.databaseType=Oracle
-<#elseif "${nuxeo.db.type}" == "mssql">
-org.nuxeo.ecm.sql.jena.databaseType=MsSQL
-<#elseif "${nuxeo.db.type}" == "mysql">
-org.nuxeo.ecm.sql.jena.databaseType=MySQL
-<#else>
-# We tell Jena we're using Derby even if the database is actually h2. This works.
-org.nuxeo.ecm.sql.jena.databaseType=Derby
-</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
deleted file mode 100644
index 7aadb20..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/config/transient-store-config.xml.nxftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<component name="org.nuxeo.ecm.core.transient.store.config">
-
- <#if "${nuxeo.redis.enabled}" == "true">
- <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisTransientStore" />
- <#else>
- <#assign className = "org.nuxeo.ecm.core.transientstore.SimpleTransientStore" />
- </#if>
-
- <extension target="org.nuxeo.ecm.core.transientstore.TransientStorageComponent"
- point="store">
-
- <store name="default" class="${className}">
- <targetMaxSizeMB>-1</targetMaxSizeMB>
- <absoluteMaxSizeMB>-1</absoluteMaxSizeMB>
- <firstLevelTTL>240</firstLevelTTL>
- <secondLevelTTL>10</secondLevelTTL>
- <minimalRetention>10</minimalRetention>
- </store>
-
- </extension>
-
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
deleted file mode 100644
index 7a82b36..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/launcher.properties.nxftl
+++ /dev/null
@@ -1,4 +0,0 @@
-org.nuxeo.app.preprocessing=false
-<#if "${nuxeo.server.sdk}" == "true">
-org.nuxeo.app.installReloadTimer=true
-</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
deleted file mode 100644
index be3823d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/lib/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains static libraries used by nuxeo components
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
deleted file mode 100644
index 109d04b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.defaults
+++ /dev/null
@@ -1,56 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common-base
-
-org.nuxeo.ecm.instance.description=Nuxeo
-
-org.nuxeo.runtime.server.enabled=false
-facelets.REFRESH_PERIOD=-1
-org.nuxeo.ecm.platform.liveedit.autoversioning=none
-
-zip.entry.encoding=
-
-# default|ldap|multi
-nuxeo.directory.type=default
-# (default|userLdapOnly) || (multiUserGroup|multiUserSqlGroup|ldapUserMultiGroup)
-nuxeo.user.group.storage=default
-nuxeo.ldap.url=
-nuxeo.ldap.binddn=
-nuxeo.ldap.bindpassword=
-nuxeo.ldap.retries=5
-nuxeo.ldap.query.sizeLimit=200
-nuxeo.ldap.query.timeLimit=0
-nuxeo.ldap.user.searchBaseDn=
-nuxeo.ldap.user.searchClass=person
-nuxeo.ldap.user.searchFilter=
-nuxeo.ldap.user.searchScope=onelevel
-nuxeo.ldap.user.searchBehavior=subany
-nuxeo.ldap.user.readonly=true
-nuxeo.ldap.user.mapping.rdn=
-nuxeo.ldap.user.mapping.username=
-nuxeo.ldap.user.mapping.password=
-nuxeo.ldap.user.mapping.firstname=
-nuxeo.ldap.user.mapping.lastname=
-nuxeo.ldap.user.mapping.email=
-nuxeo.ldap.user.mapping.company=
-nuxeo.ldap.group.searchBaseDn=
-nuxeo.ldap.group.searchFilter=(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))
-nuxeo.ldap.group.searchScope=subtree
-nuxeo.ldap.group.readonly=true
-nuxeo.ldap.group.mapping.rdn=
-nuxeo.ldap.group.mapping.name=
-nuxeo.ldap.group.mapping.label=
-nuxeo.ldap.group.mapping.members.staticAttributeId=uniqueMember
-nuxeo.ldap.group.mapping.members.dynamicAttributeId=memberURL
-nuxeo.ldap.defaultAdministratorId=
-nuxeo.ldap.defaultMembersGroup=members
-nuxeo.user.anonymous.enable=true
-nuxeo.user.emergency.enable=true
-nuxeo.user.emergency.username=MyAdministrator
-nuxeo.user.emergency.password=secret
-nuxeo.user.emergency.firstname=
-nuxeo.user.emergency.lastname=
-
-nuxeo.cache.type=redis
-nuxeo.cache.ttl=20
-nuxeo.cache.maxsize=100
-nuxeo.cache.concurrencylevel=500
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png
deleted file mode 100644
index 5cc89ab..0000000
Binary files a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/favicon.png and /dev/null differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png
deleted file mode 100644
index 873245f..0000000
Binary files a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/img/nuxeo.png and /dev/null differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
deleted file mode 100644
index b23a77a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/nuxeo.war/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
- <head>
- <title>Nuxeo CoreServer</title>
- <link href="img/favicon.png" type="image/png" rel="icon">
- <style type="text/css">
-
-
-</style>
- </head>
- <body>
- <div class="header"><img src="img/nuxeo.png"></div>
- <div class="welcome">
- <p class="welcomeText">
- Welcome to your Nuxeo server.
- </p>
- </div>
- <div class="footer">Copyright © 2001-2016 Nuxeo SA (http://nuxeo.com/) and others.</div>
- </body>
-</html>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
deleted file mode 100644
index 1ea4aac..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/common/plugins/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains the external modules on top of the nuxeo platform
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
deleted file mode 100644
index f812e03..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/bundles/CUSTOM.txt
+++ /dev/null
@@ -1 +0,0 @@
-Put here the custom bundles to deploy when activating the custom template.
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
deleted file mode 100644
index 3f563a8..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/custom/nuxeo.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-## Edit this file to customize your configuration ##
-## See http://doc.nuxeo.com/x/LANc
-custom.target=nxserver
-
-# Set list of templates to include, comma separated values.
-#nuxeo.template.includes=common
-
-# Customize default values associated with this template
-#org.nuxeo.ecm.instance.description=Nuxeo ECM customized
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
deleted file mode 100644
index 642da06..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/db2/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-db2.target=.
-
-nuxeo.db.type=db2
-nuxeo.db.host=localhost
-nuxeo.db.port=3700
-nuxeo.db.name=nuxeo
-nuxeo.db.user=user
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:db2://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
-nuxeo.db.driver=com.ibm.db2.jcc.DB2Driver
-nuxeo.db.xadatasource=com.ibm.db2.jcc.DB2XADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
deleted file mode 100644
index a5a6e8b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/default/nuxeo.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-default.target=.
-
-nuxeo.db.type=default
-nuxeo.db.name=nuxeo
-nuxeo.db.user=sa
-nuxeo.db.password=
-nuxeo.db.jdbc.url=jdbc:h2:$${nuxeo.data.dir}/h2/${nuxeo.db.name};DB_CLOSE_ON_EXIT=false
-nuxeo.db.driver=org.h2.Driver
-nuxeo.db.xadatasource=org.h2.jdbcx.JdbcDataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
deleted file mode 100644
index 2635cfc..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nuxeo.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=mongodb
-gridfsbinaries.target=.
-
-nuxeo.mongodb.gridfs.bucket=default.fs
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
deleted file mode 100644
index 01d2d77..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/gridfsbinaries/nxserver/config/gridfs-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="org.nuxeo.gridfs.config">
- <require>default-repository-config</require>
-
- <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
- <blobprovider name="default">
- <class>org.nuxeo.ecm.core.storage.mongodb.GridFSBinaryManager</class>
- <property name="server">${nuxeo.mongodb.server}</property>
- <property name="dbname">${nuxeo.mongodb.dbname}</property>
- <property name="bucket">${nuxeo.mongodb.gridfs.bucket}</property>
- </blobprovider>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
deleted file mode 100644
index 11e0b7c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/https/nuxeo.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-https.target=conf
-https.deprecated=true
-https.deprecation=HTTPS will be automatically activated if you set nuxeo.server.https.port to non-zero
-
-nuxeo.server.https.port=443
-nuxeo.server.https.keystoreFile=/path/to/keystore
-nuxeo.server.https.keystorePass=password
-
-nuxeo.url=https://localhost/nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
deleted file mode 100644
index b4e79a7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mongodb/nuxeo.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-mongodb.target=.
-
-nuxeo.dbnosql.type=mongodb
-nuxeo.mongodb.server=localhost:27017
-#nuxeo.mongodb.server=mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
-nuxeo.mongodb.dbname=nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index 9287904..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=mssql
-mssql-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 4e1f2d7..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = QRTZ_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
deleted file mode 100644
index c23f762..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mssql/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-mssql.target=.
-
-nuxeo.db.type=mssql
-nuxeo.db.host=localhost
-nuxeo.db.port=1433
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:jtds:sqlserver://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name};useCursors=true
-nuxeo.db.driver=net.sourceforge.jtds.jdbc.Driver
-nuxeo.db.xadatasource=net.sourceforge.jtds.jdbcx.JtdsDataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
deleted file mode 100644
index 99320f4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/mysql/nuxeo.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-mysql.target=.
-
-nuxeo.db.type=mysql
-nuxeo.db.host=localhost
-nuxeo.db.port=3306
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.min-pool-size=5
-nuxeo.db.jdbc.url=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true
-nuxeo.db.driver=com.mysql.jdbc.Driver
-nuxeo.db.xadatasource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
deleted file mode 100644
index eec177a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/nuxeo.defaults
+++ /dev/null
@@ -1,89 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-
-# Default configuration values for templates
-# Specific default values are defined in templates/{template_name}/nuxeo.defaults
-nuxeo.data.dir=nxserver/data
-nuxeo.server.dir=nxserver
-
-jndi.base=java:comp/env
-
-# Default template to use if not defined in nuxeo.conf
-nuxeo.templates=default
-
-# Default IP address binding
-nuxeo.bind.address=0.0.0.0
-
-# publicly visible URL
-nuxeo.url=http://localhost:8080/nuxeo
-
-# Application context path
-org.nuxeo.ecm.contextPath=/nuxeo
-
-org.nuxeo.ecm.product.name=Nuxeo Platform
-org.nuxeo.ecm.product.version=FT 8.3-SNAPSHOT
-
-# Various other default values
-#nuxeo.db.host=
-#nuxeo.db.port=
-#nuxeo.db.name=
-#nuxeo.db.user=
-#nuxeo.db.password=
-nuxeo.db.min-pool-size=5
-nuxeo.db.max-pool-size=100
-nuxeo.db.blocking-timeout-millis=10000
-# Database transaction timeout in seconds
-nuxeo.db.transactiontimeout=300
-
-# Redis
-nuxeo.redis.enabled=false
-nuxeo.redis.prefix=nuxeo:
-nuxeo.redis.host=localhost
-nuxeo.redis.port=6379
-nuxeo.redis.password=
-nuxeo.redis.database=0
-nuxeo.redis.timeout=2000
-nuxeo.redis.maxTotal=16
-nuxeo.redis.maxIdle=8
-nuxeo.redis.ha.enabled=false
-nuxeo.redis.ha.master=mymaster
-nuxeo.redis.ha.hosts=localhost
-nuxeo.redis.ha.timeout=300
-nuxeo.redis.ha.port=26379
-nuxeo.work.queuing=redis
-nuxeo.lock.manager=redis
-
-# MongoDB
-nuxeo.mongodb.server=
-
-nuxeo.notification.eMailSubjectPrefix=[Nuxeo]
-nuxeo.notification.eMailSigner=The Nuxeo team
-
-# The protocol used to connect to OpenOffice
-# Can be either SOCKET or PIPE, default is SOCKET
-jod.connection.protocol=SOCKET
-jod.max.tasks.per.process=
-jod.task.execution.timeout=
-jod.task.queue.timeout=
-jod.office.home=
-jod.jpipe.lib.path=
-jod.template.profile.dir=
-
-opensocial.gadgets.embeddedServer=true
-opensocial.gadgets.host=localhost
-opensocial.gadgets.port=8080
-opensocial.gadgets.path=/site/gadgets
-opensocial.trusted.hosts=
-
-# Clustering
-repository.clustering.enabled=false
-repository.clustering.id=
-repository.clustering.delay=1000
-repository.clustering.invalidation=default
-# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries
-repository.binary.store=
-
-nuxeo.plaintext_parsing_extensions=xml,properties,nx,html,js
-nuxeo.freemarker_parsing_extensions=nxftl
-
-session.timeout=60
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index c37be53..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=oracle
-oracle-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 42d1952..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = qrtz_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
deleted file mode 100644
index 4f00af4..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-oracle.target=.
-
-nuxeo.db.user_separator_key=|
-nuxeo.db.type=oracle
-nuxeo.db.host=localhost
-nuxeo.db.port=1521
-nuxeo.db.name=NUXEO
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:oracle:thin:${nuxeo.db.user}/${nuxeo.db.password}@${nuxeo.db.host}:${nuxeo.db.port}:${nuxeo.db.name}
-nuxeo.db.driver=oracle.jdbc.OracleDriver
-nuxeo.db.xadatasource=oracle.jdbc.xa.client.OracleXADataSource
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
deleted file mode 100644
index 733cc1d..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/oracle/nxserver/hibernate.properties
+++ /dev/null
@@ -1 +0,0 @@
-hibernate.default_schema=${nuxeo.db.user}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
deleted file mode 100644
index cf1a82b..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nuxeo.defaults
+++ /dev/null
@@ -1,33 +0,0 @@
-perf.target=.
-
-# Use a bigger pool size for db/vcs
-nuxeo.db.max-pool-size=52
-nuxeo.vcs.max-pool-size=50
-
-# Use a descent cache size for directories
-nuxeo.cache.maxsize=510
-nuxeo.cache.ttl=20
-nuxeo.cache.concurrencylevel=50
-
-# Use Elasticsearch for all page provider
-elasticsearch.override.pageproviders=default_search,document_content,section_content,document_content,tree_children,default_document_suggestion,simple_search,advanced_search,nxql_search,DEFAULT_DOCUMENT_SUGGESTION,REST_API_SEARCH_ADAPTER
-
-# Disable db fulltext indexing
-nuxeo.vcs.fulltext.search.disabled=true
-
-# Disable db stored procedure
-nuxeo.vcs.optimizations.acl.enabled=false
-nuxeo.vcs.optimizations.path.enabled=false
-
-# When in cluster mode use Redis invalidation
-repository.clustering.invalidation=redis
-
-# Do not use Redis for directory cache
-nuxeo.cache.type=memory
-
-# Tune Elasticsearch indexing
-elasticsearch.indexing.maxThreads=6
-elasticsearch.reindex.bucketReadSize=1000
-elasticsearch.reindex.bucketWriteSize=200
-#elasticsearch.indexing.clearCompletedAfterSeconds=30
-elasticsearch.adminCenter.displayClusterInfo=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
deleted file mode 100644
index f8e40f0..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/audit-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<component name="perf-audit-config">
- <require>org.nuxeo.ecm.platform.audit.service.NXAuditEventsService</require>
- <extension target="org.nuxeo.ecm.platform.audit.service.NXAuditEventsService" point="event">
- <event enabled="false" name="loginSuccess" />
- <event enabled="false" name="logout"/>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
deleted file mode 100644
index 01c0f95..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/perf/nxserver/config/no-thumbnail-config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<component name="perf-nothumb-config">
- <require>org.nuxeo.ecm.platform.thumbnail.listener</require>
- <extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
- <listener name="updateThumbListener" enabled="false"/>
- <listener name="checkBlobUpdate" enabled="false"/>
- </extension>
-</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
deleted file mode 100644
index 7a1e512..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nuxeo.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=postgresql
-postgresql-quartz-cluster.target=.
-nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
deleted file mode 100644
index 27c7635..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql-quartz-cluster/nxserver/config/quartz.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a standard Quartz configuration file
-# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
-# This file is read by name (config/quartz.properties) by SchedulerRegistryService
-
-org.quartz.scheduler.instanceName = Quartz
-org.quartz.scheduler.threadName = Quartz_Scheduler
-org.quartz.scheduler.instanceId = AUTO
-org.quartz.scheduler.makeSchedulerThreadDaemon = true
-org.quartz.scheduler.skipUpdateCheck = true
-org.quartz.scheduler.xaTransacted = true
-
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 1
-org.quartz.threadPool.threadPriority = 4
-org.quartz.threadPool.makeThreadsDaemons = true
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-org.quartz.jobStore.dataSource = nxquartz
-org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
-org.quartz.jobStore.acquireTriggersWithinLock = true
-org.quartz.jobStore.tablePrefix = qrtz_
-org.quartz.jobStore.isClustered = true
-
-org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
-org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
-org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
-org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
deleted file mode 100644
index 71e367a..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/postgresql/nuxeo.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-nuxeo.template.includes=common
-postgresql.target=.
-
-nuxeo.db.type=postgresql
-nuxeo.db.host=localhost
-nuxeo.db.port=5432
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.jdbc.url=jdbc:postgresql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
-nuxeo.db.driver=org.postgresql.Driver
-nuxeo.db.xadatasource=org.postgresql.xa.PGXADataSource
-
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
deleted file mode 100644
index 388a319..0000000
--- a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nuxeo.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
-sdk.target=.
-nuxeo.template.includes=default
-
-nuxeo.server.sdk=true
-facelets.REFRESH_PERIOD=2
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-coreserver/sdk/nxserver/config/seam-debug.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
new file mode 100644
index 0000000..c9b10e6
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/README.txt
@@ -0,0 +1,123 @@
+-----
+About
+-----
+
+The templates in this directory are used to generate configuration and datasource
+files at server startup when it is not already configured.
+
+1) Usage
+
+1.1) General instructions
+
+Edit nuxeo.conf and set the name of the template(s) to use (default template is "default").
+
+Set the properties you want to customize, see nuxeo.defaults files for available parameters.
+For example, recommended changes are:
+ nuxeo.templates=default
+ nuxeo.bind.address=0.0.0.0
+And, for example, if you use a database template:
+ nuxeo.db.host=localhost
+ nuxeo.db.name=nuxeo
+ nuxeo.db.user=user
+ nuxeo.db.password=password
+
+Default values are used for undefined properties in nuxeo.conf
+Take care that the following sample is defining an empty property:
+ nuxeo.sample.value=
+
+*DO NOT EDIT* nuxeo.defaults files except, if needed, the one in custom template.
+
+1.2) Technical overview
+
+A server is considered as already configured when it has a config directory.
+When the config directory doesn't exist, templates will be used to generate all
+configuration files (config and datasources).
+
+The template files contain parameters defined such as ${sample.parameter}
+Values for parameters replacement are calculated by this way:
+ * If nuxeo.conf does not define nuxeo.templates, then nuxeo.templates equals "default"
+ (deprecated parameter nuxeo.template is still read for backward compliance).
+ * The ${nuxeo.templates} value is used for determining the chosen template(s).
+ * For each value "nuxeo.template" of ${nuxeo.templates} (comma separated values,
+ relative to "templates/" directory or absolute path), the corresponding file
+ ${nuxeo.template}/nuxeo.defaults is read for defining new default values
+ and eventually including other templates which are recursively parsed.
+ * The file templates/nuxeo.defaults is read for default values not already defined.
+ * The file nuxeo.conf is read for custom values (overwriting default values).
+
+Configuration files are then generated by this way:
+ * For each comma separated value of nuxeo.templates and nuxeo.template.includes
+ (let say sample.template), files in templates/${sample.template}/ are copied
+ using the previously calculated values for replacing parameters.
+ * Every included template will potentially overwrite its precedents.
+
+1.3) Customization
+
+"custom" template allows to add customization such as using multiple databases,
+configuring services, ...
+
+ * Add your own template files in "templates/custom" directory.
+ You can use either existing or new parameters in these new template files.
+ * Edit nuxeo.conf, set your parameters' values and set nuxeo.templates=custom
+ (you can refer to custom templates directory with a relative path or to your
+ own custom templates directory with an absolute path).
+ * Edit custom/nuxeo.defaults and set nuxeo.template.includes parameter to define
+ the list of existing templates to include (comma separated values); your custom
+ template will be used at last.
+ Note since NXP-5139, nuxeo.defaults files from included templates are read.
+
+In case you need multiple customizations, create multiple directories and reference
+them in nuxeo.conf of each server.
+
+2) Available templates
+
+2.1) default
+
+Default Nuxeo configuration.
+Designed for development or test purpose.
+Repository backend: H2
+Services backend: Derby
+
+2.2) postgresql
+
+Recommended configuration for production, based on PostgreSQL.
+See http://doc.nuxeo.com/x/fwQz
+
+Repository backend: PostgreSQL XA
+Services backend: PostgreSQL XA
+
+Copy JDBC3 driver http://jdbc.postgresql.org/download.html#current
+into $TOMCAT/lib/
+
+2.3) oracle
+
+See http://doc.nuxeo.com/x/ywE7
+
+Repository backend: Oracle XA
+Services backend: Oracle
+
+Copy JDBC driver http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
+into $TOMCAT/lib/
+
+2.4) mssql
+
+See http://doc.nuxeo.com/x/EgI7
+
+Repository backend: Ms SQL Server XA
+Services backend: Ms SQL Server XA
+
+Copy JDBC driver http://repo2.maven.org/maven2/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar
+into $TOMCAT/lib/
+
+2.5) custom
+
+Sample custom template. It's quite empty, feel free to play with it in order to
+create your own template.
+
+2.6) https
+
+Not recommended: Nuxeo recommends to use a HTTP server in front of Tomcat instead of
+configuring Tomcat to directly listen to port 443.
+
+That template is configuring the server to listen to port 443 (HTTPS) on its public
+address(es) but still use port 80 (HTTP) for its local calls (loopback url).
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
new file mode 100644
index 0000000..6956521
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/client/scripts/deleteOrphanBinaries.groovy
@@ -0,0 +1,28 @@
+/*
+ * (C) Copyright 2015 Nuxeo SA (http://nuxeo.com/) and contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser General Public License
+ * (LGPL) version 2.1 which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Contributors:
+ * Julien Carsique
+ */
+
+import org.nuxeo.ecm.core.blob.binary.BinaryManagerStatus;
+import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatus;
+import org.nuxeo.ecm.core.storage.sql.management.SQLRepositoryStatusMBean;
+
+SQLRepositoryStatusMBean status = new SQLRepositoryStatus();
+if (!status.isBinariesGCInProgress()) {
+ BinaryManagerStatus binaryManagerStatus = status.gcBinaries(true);
+ println("Orphaned binaries garbage collecting result: " + binaryManagerStatus);
+} else {
+ println("Orphaned binaries garbage collecting is already in progress.");
+}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
new file mode 100644
index 0000000..8e96e2e
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/Catalina/localhost/nuxeo.xml.nxftl
@@ -0,0 +1,88 @@
+<#escape x as x?xml>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context antiResourceLocking="false" privileged="true"
+ path="${org.nuxeo.ecm.contextPath}" docBase="../nxserver/nuxeo.war">
+
+ 
+ <Manager pathname="" />
+
+ 
+<#if "${nuxeo.server.sdk}" == "false">
+ <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
+ loaderClass="org.nuxeo.runtime.tomcat.NuxeoWebappClassLoader" />
+<#else>
+ <Valve className="org.nuxeo.runtime.tomcat.dev.DevValve" />
+ <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
+ loaderClass="org.nuxeo.runtime.tomcat.dev.NuxeoDevWebappClassLoader" />
+</#if>
+
+ <Listener className="org.nuxeo.runtime.tomcat.ContextSecurityGrabber" />
+<#noparse>
+ <Listener className="org.nuxeo.runtime.tomcat.NuxeoLauncher" home="${catalina.base}/nxserver" />
+</#noparse>
+
+ 
+
+<#if nuxeo.db.embeddedDatasources == "false">
+ <ResourceLink name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+<#if "${nuxeo.quartz.enable}" == "true">
+ <ResourceLink name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <ResourceLink name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+</#if>
+</#if>
+
+ <Resource name="TransactionManager" auth="Container"
+ type="javax.transaction.TransactionManager" factory="org.nuxeo.runtime.jtajca.NuxeoTransactionManagerFactory"
+ transactionTimeoutSeconds="${nuxeo.db.transactiontimeout}" />
+ <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory" />
+
+ <Resource auth="Container" name="Mail" type="javax.mail.Session" factory="org.nuxeo.ecm.platform.ec.notification.email.EmailResourceFactory"
+ mail.from="${mail.from}"
+<#if "${mail.debug}" == "true">
+ mail.debug="${mail.debug}"
+</#if>
+ mail.store.protocol="${mail.store.protocol}"
+ mail.${mail.store.protocol}.host="${mail.store.host}"
+<#if "${mail.store.port}" != "-1">
+ mail.${mail.store.protocol}.port="${mail.store.port}"
+</#if>
+ mail.${mail.store.protocol}.user="${mail.store.user}"
+ mail.${mail.store.protocol}.password="${mail.store.password}"
+ mail.transport.protocol="${mail.transport.protocol}"
+ mail.${mail.transport.protocol}.host="${mail.transport.host}"
+<#if "${mail.transport.port}" != "-1">
+ mail.${mail.transport.protocol}.port="${mail.transport.port}"
+</#if>
+<#if "${mail.transport.auth}" == "true">
+ mail.${mail.transport.protocol}.user="${mail.transport.user}"
+ mail.${mail.transport.protocol}.password="${mail.transport.password}"
+ mail.${mail.transport.protocol}.auth="${mail.transport.auth}"
+</#if>
+<#if "${mail.transport.usetls}" == "true">
+ mail.${mail.transport.protocol}.starttls.enable="${mail.transport.usetls}"
+</#if>
+ />
+
+</Context>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
new file mode 100644
index 0000000..7d5a4d1
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/conf/server.xml.nxftl
@@ -0,0 +1,191 @@
+<#escape x as x?xml>
+<#assign isTomcat7 = tomcat.version?split(".")[0]?number == 7>
+<#assign isWizard = (nuxeo.wizard?? && nuxeo.wizard.done?? && nuxeo.wizard.done == "false")>
+<?xml version='1.0' encoding='utf-8'?>
+
+
+<Server address="${nuxeo.server.tomcat_admin.host}" port="${nuxeo.server.tomcat_admin.port}" shutdown="SHUTDOWN">
+
+
+ 
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ 
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ 
+<#if !isTomcat7>
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+</#if>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ 
+ <GlobalNamingResources>
+ 
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+
+ <#if !isWizard && nuxeo.db.embeddedDatasources == "false">
+ 
+ <Resource name="${nuxeo.db.commonds}" auth="Container" type="javax.sql.DataSource"
+ maxActive="${nuxeo.db["max-pool-size"]}" maxIdle="30" maxWait="10000" driverClassName="${nuxeo.db.driver}"
+ url="${nuxeo.db.jdbc.url}" validationQuery="${nuxeo.db.validationQuery}"
+ username="${nuxeo.db.user}" password="${nuxeo.db.password}"
+ accessToUnderlyingConnectionAllowed="true" />
+ </#if>
+
+ </GlobalNamingResources>
+
+ 
+ <Service name="Catalina">
+
+ 
+ 
+
+
+ 
+ <Connector port="${nuxeo.server.http.port}" protocol="HTTP/1.1" URIEncoding="UTF-8"
+<#if nuxeo.server.https.port == "0">
+ address="${nuxeo.bind.address}"
+<#else>
+ address="127.0.0.1"
+ redirectPort="${nuxeo.server.https.port}"
+</#if>
+<#if nuxeo.server.signature??>
+ server="${nuxeo.server.signature}"
+</#if>
+ compression="on"
+ compressionMinSize="512"
+ compressableMimeType="text/css,application/javascript,text/xml,text/html"
+ connectionTimeout="20000" />
+ 
+ 
+<#if nuxeo.server.https.port != "0">
+ 
+ <Connector port="${nuxeo.server.https.port}" protocol="HTTP/1.1" SSLEnabled="true"
+ address="${nuxeo.bind.address}"
+<#if nuxeo.server.signature??>
+ server="${nuxeo.server.signature}"
+</#if>
+ compression="on"
+ compressionMinSize="512"
+ compressableMimeType="text/css,application/javascript,text/xml,text/html"
+ maxThreads="150" scheme="https" secure="true"
+ keystoreFile="${nuxeo.server.https.keystoreFile}"
+ keystorePass="${nuxeo.server.https.keystorePass}"
+ clientAuth="false" sslProtocol="TLS" />
+</#if>
+
+ 
+ <Connector port="${nuxeo.server.ajp.port}" protocol="AJP/1.3"
+ address="${nuxeo.bind.address}"
+ redirectPort="${nuxeo.server.https.port}" />
+
+
+ 
+
+ 
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="${nuxeo.server.jvmRoute}">
+
+ 
+ 
+
+ 
+ 
+
+ 
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ 
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true"
+ autoDeploy="${isWizard?string('true', 'false')}" >
+
+<#if !isWizard>
+ 
+ <Listener className="org.nuxeo.runtime.tomcat.NuxeoDeployer" home="nxserver" />
+</#if>
+
+ 
+ 
+
+ 
+ 
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
new file mode 100644
index 0000000..aa5c457
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nuxeo.defaults
@@ -0,0 +1,107 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+common-base.target=.
+
+nuxeo.server.sdk=false
+nuxeo.server.http.port=8080
+nuxeo.server.ajp.port=8009
+nuxeo.server.https.port=0
+nuxeo.server.tomcat_admin.host=localhost
+nuxeo.server.tomcat_admin.port=8005
+nuxeo.server.jvmRoute=nuxeo
+NuxeoContainer.autoactivation=false
+
+# GlobalNamingResources datasource (not visible from webapp)
+nuxeo.db.embeddedDatasources=true
+nuxeo.db.xaMode=false
+nuxeo.db.commonds=jdbc/nuxeo
+
+nuxeo.db.min-pool-size=5
+nuxeo.db.max-pool-size=100
+nuxeo.db.blocking-timeout-millis=1000
+nuxeo.db.idle-timeout-minutes=5
+nuxeo.db.validationQuery=
+nuxeo.db.sql-exception-sorter=org.nuxeo.runtime.datasource.DatasourceExceptionSorter
+nuxeo.db.user_separator_key=,
+
+nuxeo.vcs.min-pool-size=0
+nuxeo.vcs.max-pool-size=20
+nuxeo.vcs.blocking-timeout-millis=100
+nuxeo.vcs.idle-timeout-minutes=10
+nuxeo.vcs.fulltext.disabled=false
+nuxeo.vcs.fulltext.search.disabled=false
+nuxeo.vcs.noddl=false
+nuxeo.vcs.ddlmode=execute
+nuxeo.vcs.idtype=varchar
+nuxeo.vcs.fulltext.analyzer.language=english
+nuxeo.vcs.optimizations.acl.enabled=true
+nuxeo.vcs.optimizations.path.enabled=true
+
+# Mail server
+mail.store.protocol=pop3
+mail.store.host=localhost
+mail.store.port=110
+mail.store.user=anonymous
+mail.store.password=secret
+# Mail transport
+mail.transport.protocol=smtp
+mail.transport.host=localhost
+mail.transport.port=25
+mail.transport.user=anonymous
+mail.transport.password=secret
+mail.transport.usetls=false
+mail.transport.auth=false
+# User who will receive mail
+mail.user=nobody
+# Enable debugging output from the javamail classes
+mail.debug=false
+mail.from=***@nuxeo.com
+
+nuxeo.core.binarymanager=org.nuxeo.ecm.core.blob.binary.DefaultBinaryManager
+nuxeo.core.binarymanager_key=
+nuxeo.quartz.enable=false
+###
+# Elasticsearch
+elasticsearch.enabled=true
+# Name of the Elasticsearch index for the default document repository
+elasticsearch.indexName=nuxeo
+# Comma separated list of Elasticsearch nodes, if empty use a local in JVM node
+elasticsearch.addressList=
+# Name of the Elasticsearch cluster to join
+elasticsearch.clusterName=nuxeoCluster
+# Number of replicas (not for local node)
+elasticsearch.indexNumberOfReplicas=1
+# Number of shards (not for local node)
+elasticsearch.indexNumberOfShards=5
+# Name of the local node
+elasticsearch.nodeName=nuxeoNode
+# Does the local node accept HTTP request on port 9200
+elasticsearch.httpEnabled=false
+# Network binding. Policy is to accept request from local machine only.
+elasticsearch.networkHost=127.0.0.1
+# Load document model from Elasticsearch result (experimental)
+# if false load from document from VCS
+elasticsearch.fetchDocFromEs=false
+# Comma separated list of CorePageProvider names to supersede by Elasticsearch
+elasticsearch.override.pageproviders=default_search,default_document_suggestion,DEFAULT_DOCUMENT_SUGGESTION,advanced_document_content
+# Reindexing option, number of documents to process per worker @since 6.0-HF02
+elasticsearch.reindex.bucketReadSize=500
+# Reindexing option, number of documents to submit to Elasticsearch per bulk command @since 6.0-HF02
+elasticsearch.reindex.bucketWriteSize=50
+# Maximum size of the indexing thread pool @since 6.0-HF02
+elasticsearch.indexing.maxThreads=4
+# Time to keep the completed indexing worker states @since 6.0-HF02
+elasticsearch.indexing.clearCompletedAfterSeconds=90
+# Display Elasticsearch cluster and nodes information in the admin center @since 6.0-HF06, always true for embedded mode
+elasticsearch.adminCenter.displayClusterInfo=false
+# Reindex the repository content on startup if the index is empty
+elastcisearch.reindex.onStartup=false
+# Use Elasticsearch as a backend for audit logs
+audit.elasticsearch.enabled=false
+# Name of the Elasticsearch index for audit logs
+audit.elasticsearch.indexName=${elasticsearch.indexName}-audit
+# Name of the Elasticsearch index for the uid sequencer
+seqgen.elasticsearch.indexName=${elasticsearch.indexName}-uidgen
+# Migrate audit logs from SQL storage to Elasticsearch indexing, requires audit.elasticsearch.enabled=true
+audit.elasticsearch.migration=false
+# Batch size for audit logs migration, only useful with audit.elasticsearch.migration=true
+audit.elasticsearch.migration.batchSize=1000
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
new file mode 100644
index 0000000..4bccf7c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/datasources-config.xml.nxftl
@@ -0,0 +1,46 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.runtime.datasource.server.contrib">
+
+<#if nuxeo.db.embeddedDatasources == "true">
+ <extension target="org.nuxeo.runtime.datasource" point="datasources">
+<#if nuxeo.db.xaMode == "false">
+ <datasource name="${nuxeo.db.commonds}" driverClassName="${nuxeo.db.driver}"
+ url="${nuxeo.db.jdbc.url}" username="${nuxeo.db.user}" password="${nuxeo.db.password}"
+ maxPoolSize="${nuxeo.db["max-pool-size"]}"
+ minPoolSize="${nuxeo.db["min-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
+ idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
+ sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
+ validationQuery="${nuxeo.db.validationQuery}"
+ accessToUnderlyingConnectionAllowed="true" />
+<#else>
+ <datasource name="${nuxeo.db.commonds}" xaDataSource="${nuxeo.db.xadatasource}"
+ maxPoolSize="${nuxeo.db["max-pool-size"]}"
+ minPoolSize="${nuxeo.db["min-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.db["blocking-timeout-millis"]}"
+ idleTimeoutMinutes="${nuxeo.db["idle-timeout-minutes"]}"
+ sqlExceptionSorter="${nuxeo.db["sql-exception-sorter"]}"
+ validationQuery="${nuxeo.db.validationQuery}"
+ accessToUnderlyingConnectionAllowed="true" >
+<#include "xadatasource-params.ftl" parse=true />
+ </datasource>
+</#if>
+ <link name="jdbc/NuxeoDS" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxsqldirectory" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxrelations-default-jena" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/comment-relations" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxaudit-logs" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxjbpm" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/placeful_service_ds" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxwebwidgets" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxuidsequencer" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/repository_default" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+<#if "${nuxeo.quartz.enable}" == "true">
+ <link name="jdbc/nxquartz" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+ <link name="jdbc/nxquartz_no_tx" global="${nuxeo.db.commonds}" type="javax.sql.DataSource" />
+</#if>
+ </extension>
+</#if>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
new file mode 100644
index 0000000..11e45a7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/default-repository-config.xml.nxftl
@@ -0,0 +1,118 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="default-repository-config">
+ <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
+ <blobprovider name="default">
+ <class>${nuxeo.core.binarymanager}</class>
+ <property name="path">${repository.binary.store}</property>
+ <property name="key">${nuxeo.core.binarymanager_key}</property>
+ </blobprovider>
+ </extension>
+<#if "${nuxeo.mongodb.server}" == "">
+ <extension target="org.nuxeo.ecm.core.storage.sql.RepositoryService"
+ point="repository">
+ <repository name="default" label="label.default.repository">
+ <pool minPoolSize="${nuxeo.vcs["min-pool-size"]}" maxPoolSize="${nuxeo.vcs["max-pool-size"]}"
+ blockingTimeoutMillis="${nuxeo.vcs["blocking-timeout-millis"]}" idleTimeoutMinutes="${nuxeo.vcs["idle-timeout-minutes"]}" />
+ <clustering id="${repository.clustering.id}" enabled="${repository.clustering.enabled}" delay="${repository.clustering.delay}" />
+<#if "${repository.clustering.invalidation}" == "redis">
+ <clusterInvalidatorClass>org.nuxeo.ecm.core.redis.contribs.RedisClusterInvalidator</clusterInvalidatorClass>
+</#if>
+ <noDDL>${nuxeo.vcs.noddl}</noDDL>
+ <ddlMode>${nuxeo.vcs.ddlmode}</ddlMode>
+ <aclOptimizations enabled="${nuxeo.vcs.optimizations.acl.enabled}"/>
+ <pathOptimizations enabled="${nuxeo.vcs.optimizations.path.enabled}"/>
+ <idType>${nuxeo.vcs.idtype}</idType>
+ <indexing>
+<#if "${nuxeo.db.type}" == "postgresql">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
+ analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+<#elseif "${nuxeo.db.type}" == "oracle">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+ 
+<#elseif "${nuxeo.db.type}" == "mssql">
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}"
+ analyzer="${nuxeo.vcs.fulltext.analyzer.language}">
+ <index name="default">
+ 
+ </index>
+ 
+ </fulltext>
+<#elseif "${nuxeo.db.type}" == "mysql">
+ 
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+<#else>
+ 
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" analyzer="org.apache.lucene.analysis.standard.StandardAnalyzer">
+ <index name="default">
+ 
+ </index>
+ <index name="title">
+ <field>dc:title</field>
+ </index>
+ <index name="description">
+ <field>dc:description</field>
+ </index>
+ </fulltext>
+</#if>
+ </indexing>
+<#if "${nuxeo.db.type}" != "mysql">
+ <usersSeparator key="${nuxeo.db.user_separator_key}" />
+</#if>
+<#if "${nuxeo.db.type}" == "mysql">
+ <schema>
+ <field type="largetext">var_ParallelDocumentReview:review_result</field>
+ </schema>
+</#if>
+ </repository>
+ </extension>
+<#else>
+ <extension target="org.nuxeo.ecm.core.storage.mongodb.MongoDBRepositoryService"
+ point="repository">
+ <repository name="default" label="MongoDB Repository">
+ <server>${nuxeo.mongodb.server}</server>
+ <dbname>${nuxeo.mongodb.dbname}</dbname>
+ <fulltext disabled="${nuxeo.vcs.fulltext.disabled}" searchDisabled="${nuxeo.vcs.fulltext.search.disabled}" />
+ </repository>
+ </extension>
+</#if>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
new file mode 100644
index 0000000..9371179
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-audit-index-config.xml.nxftl
@@ -0,0 +1,116 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.index.audit.contrib">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchIndex">
+
+ <elasticSearchIndex name="${audit.elasticsearch.indexName}" type="entry" >
+ <settings>{
+<#if "${elasticsearch.addressList}" != "">
+ "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
+ "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
+</#if>
+ "analysis" : {
+ "filter" : {
+ "truncate_filter" : {
+ "length" : 256,
+ "type" : "truncate"
+ },
+ "word_delimiter_filter" : {
+ "type" : "word_delimiter",
+ "preserve_original" : true
+ },
+ "en_stem_filter" : {
+ "name" : "minimal_english",
+ "type" : "stemmer"
+ },
+ "en_stop_filter" : {
+ "stopwords" : [
+ "_english_"
+ ],
+ "type" : "stop"
+ }
+ },
+ "tokenizer" : {
+ "path_tokenizer" : {
+ "delimiter" : "/",
+ "type" : "path_hierarchy"
+ }
+ },
+ "analyzer" : {
+ "en_analyzer" : {
+ "alias" : "fulltext",
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "en_stop_filter",
+ "en_stem_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "path_analyzer" : {
+ "type" : "custom",
+ "tokenizer" : "path_tokenizer"
+ },
+ "default" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter" ],
+ "tokenizer" : "keyword"
+ }
+ }
+ }
+}
+ </settings>
+ <mapping>
+ {
+ "_all" : {
+ "analyzer" : "fulltext"
+ },
+ "properties" : {
+ "comment" : {
+ "type" : "multi_field",
+ "fields" : {
+ "comment" : {
+ "type" : "string"
+ },
+ "fulltext" : {
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "eventDate": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "logDate": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "docPath": {
+ "type" : "multi_field",
+ "fields" : {
+ "children" : {
+ "search_analyzer" : "keyword",
+ "index_analyzer" : "path_analyzer",
+ "type" : "string"
+ },
+ "docPath" : {
+ "index" : "not_analyzed",
+ "type" : "string"
+ }
+ }
+ }
+ }
+ }
+ </mapping>
+ </elasticSearchIndex>
+
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
new file mode 100644
index 0000000..2fe1e69
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-classreplacer-config.xml.nxftl
@@ -0,0 +1,17 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<#assign ppNames="${elasticsearch.override.pageproviders}"?split(",") />
+<component name="org.nuxeo.ecm.platform.query.api.PageProviderservice.replacers.defaultConfig">
+
+ <extension target="org.nuxeo.ecm.platform.query.api.PageProviderService" point="replacers">
+
+ <replacer withClass="org.nuxeo.elasticsearch.provider.ElasticSearchNxqlPageProvider"
+ enabled="${r"${elasticsearch.enabled:=true}"}">
+<#list ppNames as ppName>
+ <provider>${ppName?trim}</provider>
+</#list>
+ </replacer>
+
+ </extension>
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
new file mode 100644
index 0000000..0967ae2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-config.xml.nxftl
@@ -0,0 +1,255 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.defaultConfig">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+<#if "${elasticsearch.addressList}" == "">
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchLocal">
+ <elasticSearchLocal
+ clusterName="${elasticsearch.clusterName}"
+ nodeName="${elasticsearch.nodeName}"
+ pathData="${nuxeo.data.dir}/elasticsearch"
+ pathLogs="${nuxeo.log.dir}/elasticsearch"
+ httpEnabled="${elasticsearch.httpEnabled}"
+ networkHost="${elasticsearch.networkHost}" />
+ </extension>
+<#else>
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchRemote">
+ <elasticSearchRemote
+ clusterName="${elasticsearch.clusterName}"
+ addressList="${elasticsearch.addressList}"
+ clientTransportSniff="false"
+ clientTransportIgnoreClusterName="false"
+ clientTransportPingTimeout="5s"
+ clientTransportNodesSamplerInterval="5s" />
+ </extension>
+</#if>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+ point="elasticSearchIndex">
+ <elasticSearchIndex name="${elasticsearch.indexName}" type="doc" repository="default">
+ <fetchFromSource>
+ <include>ecm:*</include>
+ <include>dc:*</include>
+ <exclude>ecm:binarytext</exclude>
+ </fetchFromSource>
+
+ <settings>
+{
+<#if "${elasticsearch.addressList}" != "">
+ "number_of_shards" : "${elasticsearch.indexNumberOfShards}",
+ "number_of_replicas" : "${elasticsearch.indexNumberOfReplicas}",
+</#if>
+ "analysis" : {
+ "filter" : {
+ "truncate_filter" : {
+ "length" : 256,
+ "type" : "truncate"
+ },
+ "word_delimiter_filter" : {
+ "type" : "word_delimiter",
+ "preserve_original" : true
+ },
+ "asciifolding_filter" : {
+ "type" : "asciifolding",
+ "preserve_original" : true
+ },
+ "en_stem_filter" : {
+ "name" : "minimal_english",
+ "type" : "stemmer"
+ },
+ "en_stop_filter" : {
+ "stopwords" : [
+ "_english_"
+ ],
+ "type" : "stop"
+ },
+ "fr_elision_filter" : {
+ "articles" : [
+ "c",
+ "l",
+ "m",
+ "t",
+ "qu",
+ "n",
+ "s",
+ "j"
+ ],
+ "type" : "elision"
+ },
+ "fr_stem_filter" : {
+ "name" : "minimal_french",
+ "type" : "stemmer"
+ },
+ "fr_stop_filter" : {
+ "stopwords" : [
+ "_french_"
+ ],
+ "type" : "stop"
+ }
+ },
+ "tokenizer" : {
+ "path_tokenizer" : {
+ "delimiter" : "/",
+ "type" : "path_hierarchy"
+ }
+ },
+ "analyzer" : {
+ "en_analyzer" : {
+ "alias" : "fulltext",
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "en_stop_filter",
+ "en_stem_filter",
+ "asciifolding_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "fr_analyzer" : {
+ "char_filter": [ "html_strip"],
+ "filter" : [
+ "word_delimiter_filter",
+ "lowercase",
+ "fr_stop_filter",
+ "fr_stem_filter",
+ "asciifolding_filter",
+ "fr_elision_filter"
+ ],
+ "type" : "custom",
+ "tokenizer" : "standard"
+ },
+ "path_analyzer" : {
+ "type" : "custom",
+ "tokenizer" : "path_tokenizer"
+ },
+ "lowercase_analyzer" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter", "lowercase", "asciifolding" ],
+ "tokenizer" : "keyword"
+ },
+ "default" : {
+ "type" : "custom",
+ "filter" : [ "truncate_filter" ],
+ "tokenizer" : "keyword"
+ }
+ }
+ }
+}
+ </settings>
+ <mapping>
+{
+ "_size" : {
+ "enabled" : true
+ },
+ "_all" : {
+ "analyzer" : "fulltext"
+ },
+ "dynamic_templates": [ {
+ "no_thumbnail_template": {
+ "path_match": "thumb:thumbnail.*",
+ "mapping": {
+ "index": "no",
+ "include_in_all": false
+ }
+ }
+ }, {
+ "no_picture_template": {
+ "path_match": "picture:views.*",
+ "mapping": {
+ "index": "no",
+ "include_in_all": false
+ }
+ }
+ } ],
+ "properties" : {
+ "dc:title" : {
+ "type" : "multi_field",
+ "fields" : {
+ "dc:title" : {
+ "type" : "string"
+ },
+ "fulltext" : {
+ "boost": 2,
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "dc:description" : {
+ "type" : "multi_field",
+ "fields" : {
+ "dc:description" : {
+ "index" : "no",
+ "include_in_all" : true,
+ "type" : "string"
+ },
+ "fulltext" : {
+ "boost": 1.5,
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "note:note" : {
+ "type" : "multi_field",
+ "fields" : {
+ "note:note" : {
+ "index" : "no",
+ "include_in_all" : true,
+ "type" : "string"
+ },
+ "fulltext" : {
+ "type": "string",
+ "analyzer" : "fulltext"
+ }
+ }
+ },
+ "ecm:binarytext" : {
+ "type" : "string",
+ "index" : "no",
+ "include_in_all" : true
+ },
+ "ecm:path" : {
+ "type" : "multi_field",
+ "fields" : {
+ "children" : {
+ "search_analyzer" : "keyword",
+ "index_analyzer" : "path_analyzer",
+ "type" : "string"
+ },
+ "ecm:path" : {
+ "index" : "not_analyzed",
+ "type" : "string"
+ }
+ }
+ },
+ "ecm:pos": {
+ "type": "integer"
+ },
+ "dc:created": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "dc:modified": {
+ "format": "dateOptionalTime",
+ "type": "date"
+ },
+ "common:icon": {
+ "type": "string",
+ "index" : "no",
+ "include_in_all" : false
+ }
+ }
+}
+ </mapping>
+
+ </elasticSearchIndex>
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
new file mode 100644
index 0000000..156d74f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/elasticsearch-sequence-index-config.xml.nxftl
@@ -0,0 +1,31 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.index.sequence.contrib">
+ <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+ <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
+
+ <elasticSearchIndex name="${seqgen.elasticsearch.indexName}" type="seqId">
+
+ <settings>
+ {
+ "number_of_shards" : 1,
+ "auto_expand_replicas" : "0-all"
+ }
+ </settings>
+
+ <mapping>
+ {
+ "_source" : {"enabled": false},
+ "_all" : {"enabled": false},
+ "_type" : {"index": "no"},
+ "enabled" : false
+ }
+ </mapping>
+
+ </elasticSearchIndex>
+
+ </extension>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
new file mode 100644
index 0000000..a259904
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/redis-config.xml.nxftl
@@ -0,0 +1,53 @@
+<#escape x as x?xml>
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.redis.config">
+ <require>org.nuxeo.ecm.core.work.config</require>
+
+<#if "${nuxeo.redis.enabled}" == "true">
+ <extension target="org.nuxeo.ecm.core.redis"
+ point="configuration">
+<#if "${nuxeo.redis.ha.enabled}" == "true">
+ <sentinel>
+ <master>${nuxeo.redis.ha.master}</master>
+ <failoverTimeout>${nuxeo.redis.ha.timeout}</failoverTimeout>
+<#assign names="${nuxeo.redis.ha.hosts}"?split(",") />
+<#list names as name>
+ <host name="${name}" port="${nuxeo.redis.ha.port}"/>
+</#list>
+ <password>${nuxeo.redis.password}</password>
+ <database>${nuxeo.redis.database}</database>
+ <timeout>${nuxeo.redis.timeout}</timeout>
+ <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
+ <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
+ <prefix>${nuxeo.redis.prefix}</prefix>
+ </sentinel>
+<#else>
+ <server>
+ <host>${nuxeo.redis.host}</host>
+ <port>${nuxeo.redis.port}</port>
+ <password>${nuxeo.redis.password}</password>
+ <database>${nuxeo.redis.database}</database>
+ <timeout>${nuxeo.redis.timeout}</timeout>
+ <maxTotal>${nuxeo.redis.maxTotal}</maxTotal>
+ <maxIdle>${nuxeo.redis.maxIdle}</maxIdle>
+ <prefix>${nuxeo.redis.prefix}</prefix>
+ </server>
+</#if>
+ </extension>
+
+
+<#if "${nuxeo.lock.manager}" == "redis">
+  <extension target="org.nuxeo.ecm.core.storage.lock.LockManagerService" point="lockmanager">
+    <lockmanager name="default" class="org.nuxeo.ecm.core.redis.contribs.RedisLockManager" />
+  </extension>
+</#if>
+
+<#if "${nuxeo.work.queuing}" == "redis">
+ <extension target="org.nuxeo.ecm.core.work.service" point="implementation">
+ <queuing class="org.nuxeo.ecm.core.redis.contribs.RedisWorkQueuing"/>
+ </extension>
+</#if>
+</#if>
+
+</component>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
new file mode 100644
index 0000000..6f8e4b2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/webengine.properties
@@ -0,0 +1 @@
+org.nuxeo.ecm.webengine.skinPathPrefix=${org.nuxeo.ecm.contextPath}/site/skin
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
new file mode 100644
index 0000000..f8b8c71
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/nxserver/config/xadatasource-params.ftl
@@ -0,0 +1,28 @@
+<#escape x as x?xml>
+<#if "${nuxeo.db.type}" == "postgresql">
+ <property name="ServerName">${nuxeo.db.host}</property>
+ <property name="PortNumber">${nuxeo.db.port}</property>
+ <property name="DatabaseName">${nuxeo.db.name}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#elseif "${nuxeo.db.type}" == "oracle">
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#elseif "${nuxeo.db.type}" == "mssql">
+ <property name="ServerName">${nuxeo.db.host}</property>
+ <property name="PortNumber">${nuxeo.db.port}</property>
+ <property name="DatabaseName">${nuxeo.db.name}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+ <property name="UseCursors">true</property>
+<#elseif "${nuxeo.db.type}" == "mysql">
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+<#else>
+ <property name="URL">${nuxeo.db.jdbc.url}</property>
+ <property name="User">${nuxeo.db.user}</property>
+ <property name="Password">${nuxeo.db.password}</property>
+</#if>
+</#escape>
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
new file mode 100644
index 0000000..c4c50fa
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common-base/webapps/ROOT/index.html
@@ -0,0 +1 @@
+<META HTTP-EQUIV="refresh" CONTENT="0;URL=${org.nuxeo.ecm.contextPath}">
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
new file mode 100644
index 0000000..d57f246
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/nuxeo-preprocessor.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<container>
+
+ <template name="application" src="META-INF/templates/application.xml"
+ installPath="META-INF/application.xml" required="true" />
+
+ <template name="web" src="META-INF/templates/web.xml" installPath="nuxeo.war/WEB-INF/web.xml"
+ required="true" />
+
+ <template name="faces-config" src="META-INF/templates/faces-config.xml"
+ installPath="nuxeo.war/WEB-INF/faces-config.xml" required="true" />
+
+ <template name="pages" src="META-INF/templates/pages.xml"
+ installPath="nuxeo.war/WEB-INF/pages.xml" required="true" />
+
+ <template name="components" src="META-INF/templates/components.xml"
+ installPath="nuxeo.war/WEB-INF/components.xml" required="true" />
+
+ <template name="jaxws" src="META-INF/templates/sun-jaxws.xml"
+ installPath="nuxeo.war/WEB-INF/sun-jaxws.xml" required="false" />
+
+ <directory>bundles</directory>
+ <directory>plugins</directory>
+
+ <install>
+ <property name="war" value="/nuxeo.war" />
+ <property name="datasources" value="datasources" />
+
+ 
+ <delete path="/META-INF/application.xml" />
+ </install>
+</container>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
new file mode 100644
index 0000000..d4caeca
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/application.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
+
+ <display-name>Nuxeo EP</display-name>
+
+ %{MODULE}%
+
+ <module>
+ <web>
+ <web-uri>nuxeo.war</web-uri>
+ <context-root>${org.nuxeo.ecm.contextPath}</context-root>
+ </web>
+ </module>
+
+</application>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
new file mode 100644
index 0000000..44f28e2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/components.xml
@@ -0,0 +1,17 @@
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:mail="http://jboss.com/products/seam/mail">
+
+ <component name="org.jboss.seam.core.init">
+ <property name="debug">false</property>
+ <property name="myFacesLifecycleBug">false</property>
+ <property name="jndiPattern">nuxeo/#{ejbName}/local</property>
+ </component>
+
+ <component name="org.jboss.seam.core.manager">
+ %{SEAM_CORE_MANAGER}%
+ </component>
+
+ 
+ <mail:mailSession sessionJndiName="java:/Mail" />
+
+</components>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
new file mode 100644
index 0000000..8445332
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/faces-config.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+ <factory>
+
+ %{FACTORY}%
+
+ </factory>
+
+ %{NAVIGATION-RULE}%
+
+ <navigation-rule>
+
+ %{NAVIGATION}%
+
+ </navigation-rule>
+
+ %{MANAGED-BEAN}%
+
+ 
+ <application>
+
+ %{APPLICATION}%
+
+ %{APPLICATION_LOCALE}%
+
+ </application>
+
+ <lifecycle>
+
+ %{PHASE-LISTENER}%
+
+ </lifecycle>
+
+ 
+
+ %{COMPONENT}%
+
+ <render-kit>
+
+ %{RENDERER}%
+
+ </render-kit>
+
+ %{CONVERTER}%
+
+ %{VALIDATOR}%
+
+</faces-config>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
new file mode 100644
index 0000000..0cb9d06
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-deployment-structure.xml
@@ -0,0 +1,37 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+ <deployment>
+ <exclude-subsystems>
+ <subsystem name="jpa"/>
+ <subsystem name="ejb3"/>
+ <subsystem name="webservices" />
+ <subsystem name="jsf" />
+ <subsystem name="jaxrs" />
+ <subsystem name="weld" />
+ <subsystem name="pojo" />
+ <subsystem name="remoting" />
+ <subsystem name="sar" />
+ <subsystem name="io.understow.jsp"/>
+ </exclude-subsystems>
+
+ <exclusions>
+ <module name="org.hibernate" />
+ <module name="org.hibernate.validator" />
+ </exclusions>
+
+ <dependencies>
+ <module name="org.apache.commons.lang" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.log4j" />
+ <module name="org.jboss.logging" />
+ <module name="org.jboss.logging.jul-to-slf4j-stub" />
+ <module name="org.jboss.logmanager" />
+ <module name="org.slf4j" />
+ <module name="org.slf4j.impl" />
+ <module name="javax.servlet.api"/>
+ <module name="javax.jws.api"/>
+ <module name="javax.xml.soap.api"/>
+ <module name="io.undertow.jsp"/>
+ <module name="org.apache.xerces"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
new file mode 100644
index 0000000..5dd4f6c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/jboss-web.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_0.dtd">
+
+<jboss-web>
+
+ <context-root>${org.nuxeo.ecm.contextPath}</context-root>
+
+</jboss-web>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
new file mode 100644
index 0000000..da585a4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/pages.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+
+ %{PAGES}%
+
+</pages>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
new file mode 100644
index 0000000..3ca0a97
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/META-INF/templates/web.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ %{LISTENER}%
+
+ %{EXCEPTION-FILTER}%
+
+ %{CORS-FILTER}%
+
+ %{AUTH-FILTER}%
+
+ %{STD-AUTH-FILTER}%
+
+ 
+ %{FIRST-FILTER}%
+
+ %{FILTER}%
+
+ %{FILTER-MAPPING}%
+
+ %{CONTEXT-PARAM}%
+
+ %{CONTEXT-PARAM-RICHFACES}%
+
+ %{LOGIN-CONFIG}%
+
+ %{SERVLET}%
+
+ %{SERVLET-MAPPING}%
+
+ %{ERROR-PAGE}%
+
+ %{SECURITY-CONSTRAINT}%
+
+ %{LAST-SERVLET}%
+
+ <security-role>
+ <description>The role required to access restricted content</description>
+ <role-name>admin</role-name>
+ </security-role>
+
+ <security-role>
+ <description>The role required to access restricted content</description>
+ <role-name>regular</role-name>
+ </security-role>
+
+ <session-config>
+ <session-timeout>${session.timeout}</session-timeout>
+ </session-config>
+
+</web-app>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
new file mode 100644
index 0000000..08bbdd4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/bundles/README.txt
@@ -0,0 +1,2 @@
+This folder contains the Nuxeo modules
+These modules are required to run the nuxeo framework
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
new file mode 100644
index 0000000..332a58d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/auth-config.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<component
+ name="org.nuxeo.server.auth">
+
+ 
+ <require>org.nuxeo.ecm.platform.ui.web.auth.defaultConfig</require>
+ <require>org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService
+ </require>
+
+ <extension
+ target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
+ point="specificChains">
+
+ <specificAuthenticationChain
+ name="Site">
+ <urlPatterns>
+ <url>(.*)/site.*</url>
+ </urlPatterns>
+
+ <replacementChain>
+ <plugin>BASIC_AUTH2</plugin>
+ </replacementChain>
+ </specificAuthenticationChain>
+ </extension>
+
+ <extension
+ target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
+ point="authenticators">
+
+ <authenticationPlugin
+ name="BASIC_AUTH2"
+ enabled="true"
+ class="org.nuxeo.ecm.platform.ui.web.auth.plugins.BasicAuthenticator">
+ <needStartingURLSaving>false</needStartingURLSaving>
+ <stateful>false</stateful>
+ <parameters>
+ <parameter
+ name="RealmName">Nuxeo Server</parameter>
+ <parameter
+ name="AutoPrompt">true</parameter>
+ </parameters>
+ </authenticationPlugin>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
new file mode 100644
index 0000000..1921626
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/blacklist.nxftl
@@ -0,0 +1,10 @@
+<#escape x as x?xml>
+org.nuxeo.runtime.trackers.files.threadstracking.config
+<#if elasticsearch.enabled != "true" || audit.elasticsearch.enabled != "true">
+org.nuxeo.elasticsearch.audit.contrib
+org.nuxeo.elasticsearch.index.audit.contrib
+org.nuxeo.ecm.platform.audit.PageProviderservice.es.contrib
+org.nuxeo.ecm.platform.audit.search.contrib
+org.nuxeo.admin.audit.es.contentView.contrib
+</#if>
+</#escape>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
new file mode 100644
index 0000000..7f9654d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/cache-config.xml.nxftl
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.cache.config">
+
+ <#if "${nuxeo.redis.enabled}" == "true" && "${nuxeo.cache.type}" == "redis">
+ <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisCache" />
+ <#else>
+ <#assign className = "org.nuxeo.ecm.core.cache.InMemoryCacheImpl" />
+ </#if>
+
+ <extension target="org.nuxeo.ecm.core.cache.CacheService"
+ point="caches">
+ <cache name="default-cache" class="${className}">
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-user-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-user-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-group-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-group-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-user-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-user-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-group-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="ldap-group-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-digestauth-entry-cache" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+ <cache name="sql-digestauth-entry-cache-without-references" class="${className}">
+ <option name="maxSize">${nuxeo.cache.maxsize}</option>
+ <ttl>${nuxeo.cache.ttl}</ttl>
+ <option name="concurrencyLevel">${nuxeo.cache.concurrencylevel}</option>
+ </cache>
+
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
new file mode 100644
index 0000000..2ddd1b2
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-ldap-users-directory-bundle.xml.nxftl
@@ -0,0 +1,369 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.directory.ldap.storage.users">
+
+<#if "${nuxeo.directory.type}" == "default">
+ 
+<#else>
+ <implementation class="org.nuxeo.ecm.directory.ldap.LDAPDirectoryDescriptor" />
+ <implementation class="org.nuxeo.ecm.directory.ldap.LDAPServerDescriptor" />
+ <require>org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory</require>
+
+ 
+ <require>org.nuxeo.ecm.directory.sql.storage</require>
+ <require>org.nuxeo.ecm.platform.usermanager.UserManagerImpl</require>
+
+ <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
+ point="servers">
+
+ 
+ <server name="default">
+
+ <ldapUrl>${nuxeo.ldap.url}</ldapUrl>
+ 
+
+ 
+ <bindDn>${nuxeo.ldap.binddn}</bindDn>
+ <bindPassword>${nuxeo.ldap.bindpassword}</bindPassword>
+ 
+ <retries>${nuxeo.ldap.retries}</retries>
+ </server>
+
+ </extension>
+
+ <extension target="org.nuxeo.ecm.directory.ldap.LDAPDirectoryFactory"
+ point="directories">
+
+ <directory name="ldapUserDirectory">
+ <server>default</server>
+ <schema>user</schema>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+
+ <searchBaseDn>${nuxeo.ldap.user.searchBaseDn}</searchBaseDn>
+ <searchClass>${nuxeo.ldap.user.searchClass}</searchClass>
+ 
+<#if "${nuxeo.ldap.user.searchFilter}" != "">
+ <searchFilter>${nuxeo.ldap.user.searchFilter}</searchFilter>
+</#if>
+
+ 
+ <searchScope>${nuxeo.ldap.user.searchScope}</searchScope>
+
+ 
+ <substringMatchType>${nuxeo.ldap.user.searchBehavior}</substringMatchType>
+
+ <readOnly>${nuxeo.ldap.user.readonly}</readOnly>
+
+ 
+ <cacheEntryName>ldap-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>ldap-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ 
+ <missingIdFieldCase>lower</missingIdFieldCase>
+
+ 
+ <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
+
+ 
+ <queryTimeLimit>0</queryTimeLimit>
+
+ <creationBaseDn>ou=people,dc=example,dc=com</creationBaseDn>
+ <creationClass>top</creationClass>
+ <creationClass>person</creationClass>
+ <creationClass>organizationalPerson</creationClass>
+ <creationClass>inetOrgPerson</creationClass>
+
+ <rdnAttribute>${nuxeo.ldap.user.mapping.rdn}</rdnAttribute>
+ <fieldMapping name="username">${nuxeo.ldap.user.mapping.username}</fieldMapping>
+ <fieldMapping name="password">${nuxeo.ldap.user.mapping.password}</fieldMapping>
+ <fieldMapping name="firstName">${nuxeo.ldap.user.mapping.firstname}</fieldMapping>
+ <fieldMapping name="lastName">${nuxeo.ldap.user.mapping.lastname}</fieldMapping>
+ <fieldMapping name="company">${nuxeo.ldap.user.mapping.company}</fieldMapping>
+ <fieldMapping name="email">${nuxeo.ldap.user.mapping.email}</fieldMapping>
+
+ <references>
+<#if "${nuxeo.user.group.storage}" == "default">
+ <inverseReference field="groups" directory="ldapGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <inverseReference field="groups" directory="sqlGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+<#if "${nuxeo.user.group.storage}" == "ldapUserMultiGroup" || "${nuxeo.user.group.storage}" == "multiUserGroup">
+ <inverseReference field="groups" directory="multiGroupDirectory"
+ dualReferenceField="members" />
+</#if>
+ </references>
+
+ </directory>
+
+<#if "${nuxeo.user.group.storage}" != "userLdapOnly" && "${nuxeo.user.group.storage}" != "multiUserSqlGroup">
+ <directory name="ldapGroupDirectory">
+
+ 
+ <server>default</server>
+
+ <schema>group</schema>
+ <idField>groupname</idField>
+
+ <searchBaseDn>${nuxeo.ldap.group.searchBaseDn}</searchBaseDn>
+ <searchFilter>
+ ${nuxeo.ldap.group.searchFilter}
+ </searchFilter>
+ <searchScope>${nuxeo.ldap.group.searchScope}</searchScope>
+
+ <readOnly>${nuxeo.ldap.group.readonly}</readOnly>
+
+ 
+ <cacheEntryName>ldap-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>ldap-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <creationBaseDn>ou=groups,dc=example,dc=com</creationBaseDn>
+ <creationClass>top</creationClass>
+ <creationClass>groupOfUniqueNames</creationClass>
+
+ 
+ <querySizeLimit>${nuxeo.ldap.query.sizeLimit}</querySizeLimit>
+
+ 
+ <queryTimeLimit>${nuxeo.ldap.query.timeLimit}</queryTimeLimit>
+
+ <rdnAttribute>${nuxeo.ldap.group.mapping.rdn}</rdnAttribute>
+ <fieldMapping name="groupname">${nuxeo.ldap.group.mapping.name}</fieldMapping>
+ 
+ <fieldMapping name="grouplabel">${nuxeo.ldap.group.mapping.label}</fieldMapping>
+
+ <references>
+ 
+ <ldapReference field="members" directory="ldapUserDirectory"
+ forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
+ dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
+
+ <ldapReference field="subGroups" directory="ldapGroupDirectory"
+ forceDnConsistencyCheck="false" staticAttributeId="${nuxeo.ldap.group.mapping.members.staticAttributeId}"
+ dynamicAttributeId="${nuxeo.ldap.group.mapping.members.dynamicAttributeId}" />
+
+<#if "${nuxeo.user.group.storage}" == "default">
+ <inverseReference field="parentGroups" directory="ldapGroupDirectory"
+<#else>
+ <inverseReference field="parentGroups" directory="multiGroupDirectory"
+</#if>
+ dualReferenceField="subGroups" />
+
+ 
+ <ldapTreeReference field="directChildren" directory="unitDirectory"
+ scope="onelevel" />
+ <ldapTreeReference field="children" directory="unitDirectory"
+ scope="subtree" />
+
+ </references>
+
+ </directory>
+</#if>
+ </extension>
+
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.directory.type}" == "multi">
+ <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
+ <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+
+<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <directory name="sqlUserDirectory">
+
+ <schema>user</schema>
+
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+
+ <table>users</table>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
+ <autoincrementIdField>false</autoincrementIdField>
+ <computeMultiTenantId>false</computeMultiTenantId>
+ <dataFile>users.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <querySizeLimit>50</querySizeLimit>
+
+ <cacheEntryName>sql-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <inverseReference field="groups" directory="sqlGroupDirectory"
+ dualReferenceField="members" />
+ </references>
+
+ </directory>
+</#if>
+<#if "${nuxeo.directory.type}" == "multi" || "${nuxeo.user.group.storage}" == "userLdapOnly">
+ <directory name="sqlGroupDirectory">
+
+ <schema>group</schema>
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+ <table>groups</table>
+ <idField>groupname</idField>
+ <dataFile>groups.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <autoincrementIdField>false</autoincrementIdField>
+
+ <cacheEntryName>sql-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+<#if "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <tableReference field="members" directory="ldapUserDirectory"
+<#else>
+ <tableReference field="members" directory="multiUserDirectory"
+</#if>
+ table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
+ dataFile="user2group.csv" />
+<#if "${nuxeo.user.group.storage}" == "multiUserGroup" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <tableReference field="subGroups" directory="multiGroupDirectory"
+<#else>
+ <tableReference field="subGroups" directory="sqlGroupDirectory"
+</#if>
+ table="group2group" sourceColumn="parentGroupId"
+ targetColumn="childGroupId" schema="group2group" />
+ <inverseReference field="parentGroups" directory="sqlGroupDirectory"
+ dualReferenceField="subGroups" />
+ </references>
+
+ </directory>
+</#if>
+ </extension>
+</#if>
+
+<#if "${nuxeo.directory.type}" == "multi">
+ <extension
+ target="org.nuxeo.ecm.directory.multi.MultiDirectoryFactory"
+ point="directories">
+
+ <directory name="multiUserDirectory">
+ <schema>user</schema>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+
+ <source name="userSQLsource" creation="true">
+ <subDirectory name="sqlUserDirectory" />
+ </source>
+
+ <source name="userLDAPsource">
+ <subDirectory name="ldapUserDirectory" />
+ </source>
+ </directory>
+
+ <directory name="multiGroupDirectory">
+ <schema>group</schema>
+ <idField>groupname</idField>
+
+ <source name="groupSQLsource" creation="true">
+ <subDirectory name="sqlGroupDirectory" />
+ </source>
+
+ <source name="groupLDAPsource">
+ <subDirectory name="ldapGroupDirectory" />
+ </source>
+ </directory>
+
+ </extension>
+</#if>
+
+ <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
+
+ <userManager>
+ <userCacheName>default-cache</userCacheName>
+<#if "${nuxeo.ldap.defaultAdministratorId}" != "">
+ <defaultAdministratorId>${nuxeo.ldap.defaultAdministratorId}</defaultAdministratorId>
+</#if>
+<#if "${nuxeo.ldap.defaultMembersGroup}" != "">
+ <defaultGroup>${nuxeo.ldap.defaultMembersGroup}</defaultGroup>
+</#if>
+ <users>
+<#if "${nuxeo.directory.type}" == "ldap" || "${nuxeo.user.group.storage}" == "ldapUserMultiGroup">
+ <directory>ldapUserDirectory</directory>
+<#else>
+ <directory>multiUserDirectory</directory>
+</#if>
+<#if "${nuxeo.user.emergency.enable}" == "true">
+ <virtualUser id="${nuxeo.user.emergency.username}" searchable="false">
+ <password>${nuxeo.user.emergency.password}</password>
+ <property name="firstName">${nuxeo.user.emergency.firstname}</property>
+ <property name="lastName">${nuxeo.user.emergency.lastname}</property>
+ <group>administrators</group>
+ </virtualUser>
+</#if>
+<#if "${nuxeo.user.anonymous.enable}" == "true">
+ <anonymousUser id="Guest">
+ <property name="firstName">Guest</property>
+ <property name="lastName">User</property>
+ </anonymousUser>
+</#if>
+ </users>
+ <groups>
+<#if "${nuxeo.user.group.storage}" == "default">
+ <directory>ldapGroupDirectory</directory>
+<#elseif "${nuxeo.user.group.storage}" == "userLdapOnly" || "${nuxeo.user.group.storage}" == "multiUserSqlGroup">
+ <directory>sqlGroupDirectory</directory>
+<#else>
+ <directory>multiGroupDirectory</directory>
+</#if>
+ </groups>
+ </userManager>
+
+ </extension>
+</#if>
+
+</component>
+
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
new file mode 100644
index 0000000..da08313
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/default-sql-directories-bundle.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.directory.sql.storage">
+
+ <implementation class="org.nuxeo.ecm.directory.sql.SQLDirectoryDescriptor" />
+
+ <require>org.nuxeo.ecm.directory.sql.SQLDirectoryFactory</require>
+ <require>org.nuxeo.ecm.platform.digestauth.config</require>
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+
+ <directory name="userDirectory">
+
+ <schema>user</schema>
+
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+
+ <table>users</table>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <passwordHashAlgorithm>SSHA</passwordHashAlgorithm>
+ <autoincrementIdField>false</autoincrementIdField>
+ <computeMultiTenantId>false</computeMultiTenantId>
+ <dataFile>users.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <querySizeLimit>50</querySizeLimit>
+
+ 
+ <cacheEntryName>sql-user-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-user-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <inverseReference field="groups" directory="groupDirectory"
+ dualReferenceField="members" />
+ </references>
+
+ </directory>
+
+ <directory name="groupDirectory">
+
+ <schema>group</schema>
+ <dataSource>jdbc/nxsqldirectory</dataSource>
+ <table>groups</table>
+ <idField>groupname</idField>
+ <dataFile>groups.csv</dataFile>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ <autoincrementIdField>false</autoincrementIdField>
+
+ 
+ <cacheEntryName>sql-group-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-group-entry-cache-without-references</cacheEntryWithoutReferencesName>
+
+ <references>
+ <tableReference field="members" directory="userDirectory"
+ table="user2group" sourceColumn="groupId" targetColumn="userId" schema="user2group"
+ dataFile="user2group.csv" />
+ 
+ <tableReference field="subGroups" directory="groupDirectory"
+ table="group2group" sourceColumn="parentGroupId"
+ targetColumn="childGroupId" schema="group2group" />
+ <inverseReference field="parentGroups" directory="groupDirectory"
+ dualReferenceField="subGroups" />
+ </references>
+
+ </directory>
+
+ <directory name="digestauth">
+ <cacheEntryName>sql-digestauth-entry-cache</cacheEntryName>
+ <cacheEntryWithoutReferencesName>sql-digestauth-entry-cache-without-references</cacheEntryWithoutReferencesName>
+ <schema>digestauth</schema>
+ <table>digestauth</table>
+ <autoincrementIdField>false</autoincrementIdField>
+ <dataSource>java:/nxsqldirectory</dataSource>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ </directory>
+
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
new file mode 100644
index 0000000..6a68e21
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/distribution.properties
@@ -0,0 +1,6 @@
+## DO NOT EDIT - This file must be filled at packaging time, here are required properties:
+#org.nuxeo.distribution.name=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.server=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.version=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.date=ASSEMBLY_MUST_FILL_IT
+#org.nuxeo.distribution.package=PACKAGING_MUST_FILL_IT
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
new file mode 100644
index 0000000..8726ebd
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/jms.properties
@@ -0,0 +1,4 @@
+jms.useTransactedConnection=True
+jms.isDeliveryPersistent=False
+jms.isDisableMessageID=True
+jms.isDisableMessageTimestamp=True
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
new file mode 100644
index 0000000..d111c11
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
+ <documentation>
+ Login modules used on Tomcat
+ @author Bogdan Stefanescu (***@nuxeo.com)
+ </documentation>
+
+
+ <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
+
+ <domain name="nuxeo-system-login">
+ <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
+ <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
+ <option name="password-stacking">true</option>
+ <option name="multi-threaded">true</option>
+ </login-module>
+ </domain>
+
+ <domain name="nuxeo-client-login">
+ <login-module code="org.nuxeo.ecm.platform.login.NuxeoLoginModule"
+ flag="required">
+ <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
+ <option name="useUserIdentificationInfoCB">true</option>
+ </login-module>
+ <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
+ <option name="password-stacking">true</option>
+ <option name="restore-login-identity">true</option>
+ <option name="multi-threaded">true</option>
+ </login-module>
+ </domain>
+
+
+ <domain name="nuxeo-webengine">
+ <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
+ flag = "required">
+ <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
+ <option name="useUserIdentificationInfoCB">true</option>
+ </login-module>
+ 
+ </domain>
+
+ </extension>
+
+
+</component>
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
new file mode 100644
index 0000000..3f99931
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/login-digest-config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.digestauth.config">
+
+ <extension target="org.nuxeo.ecm.directory.sql.SQLDirectoryFactory"
+ point="directories">
+ <directory name="digestauth">
+ <schema>digestauth</schema>
+ <table>digestauth</table>
+ <autoincrementIdField>false</autoincrementIdField>
+ <dataSource>java:/nxsqldirectory</dataSource>
+ <idField>username</idField>
+ <passwordField>password</passwordField>
+ <createTablePolicy>on_missing_columns</createTablePolicy>
+ </directory>
+ </extension>
+
+ <extension target="org.nuxeo.ecm.platform.usermanager.UserService" point="userManager">
+ <userManager>
+ <digestAuthDirectory>digestauth</digestAuthDirectory>
+ <digestAuthRealm>NUXEO</digestAuthRealm>
+ <userCacheName>default-cache</userCacheName>
+ </userManager>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
new file mode 100644
index 0000000..cc74965
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/management-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.runtime.management.ServerLocatorContrib">
+
+ 
+
+ 
+ <extension target="org.nuxeo.runtime.management.ServerLocator"
+ point="locators">
+ <locator domain="jboss" default="true" />
+ </extension>
+
+ 
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
new file mode 100644
index 0000000..f70ad04
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/mbeans/core-events-service.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ 
+ <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NuxeoMessages">
+ <attribute name="JNDIName">topic/NuxeoMessages</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ 
+ <mbean code="org.jboss.mq.server.jmx.Topic" name="jboss.mq.destination:service=Topic,name=NXPMessages">
+ <attribute name="JNDIName">topic/NXPMessages</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+</server>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
new file mode 100644
index 0000000..d72936f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/notification-config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.ear.config.notification">
+
+ <extension
+ target="org.nuxeo.ecm.platform.ec.notification.service.NotificationService"
+ point="generalSettings">
+ <settings>
+ <serverPrefix>${nuxeo.url}/</serverPrefix>
+ <eMailSubjectPrefix>${nuxeo.notification.eMailSubjectPrefix} </eMailSubjectPrefix>
+ <mailSessionJndiName>${jndi.base}/Mail</mailSessionJndiName>
+ </settings>
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
new file mode 100644
index 0000000..670b79d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-tomcat.properties
@@ -0,0 +1,4 @@
+# avoid initializing nuxeo relations at startup (for faster startup)
+org.nuxeo.ecm.platform.relations.initOnStartup=false
+
+jndi.java.mail=${jndi.base}/Mail
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
new file mode 100644
index 0000000..f8f924d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo-webapp-core.properties
@@ -0,0 +1,4 @@
+# Properties for exporting search results to CSV
+org.nuxeo.ecm.webapp.search.csv.separator=,
+org.nuxeo.ecm.webapp.search.csv.quotechar="
+org.nuxeo.ecm.webapp.search.csv.endofline=\n
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
new file mode 100644
index 0000000..3a55311
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nuxeo.properties
@@ -0,0 +1,32 @@
+# application instance config
+org.nuxeo.ecm.instance.host=localhost
+
+# runtime remoting config
+org.nuxeo.runtime.server.locator=socket://${nuxeo.bind.address}:62474/?datatype=nuxeo
+
+# streaming config
+org.nuxeo.runtime.streaming.isServer=false
+org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
+
+# runtime management config
+org.nuxeo.runtime.management.exist=false
+org.nuxeo.runtime.management.serverRmiPort=2100
+
+# needed for the JNDI auto configuration of clients
+# you need to change this if using JNDI through HTTP
+nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
+nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+
+# for email attachment, to decode the encoded(utf) filenames.
+mail.mime.decodefilename=true
+
+# LiveEdit configuration detection (client/server/both)
+org.nuxeo.ecm.platform.liveedit.config=client
+
+# Uncomment to activate Nuxeo Runtime REST API for Management
+# accessible via http://server:port/nuxeo/site/server/html on JBoss
+#org.nuxeo.runtime.rest.management=true
+
+# size limit to use the specific download servlet for big files (use SI or IEC prefix)
+#org.nuxeo.big.file.size.limit=5Mi
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
new file mode 100644
index 0000000..d38430f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/nxmail-scheduler-config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.mail.scheduler.config">
+
+ <extension
+ target="org.nuxeo.ecm.platform.scheduler.core.service.SchedulerRegistryService"
+ point="schedule">
+
+ <schedule id="mailReceivedSchedule">
+ <eventId>MailReceivedEvent</eventId>
+ <eventCategory>default</eventCategory>
+ 
+ <cronExpression>0 0/30 * * * ?</cronExpression>
+ </schedule>
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
new file mode 100644
index 0000000..57ab876
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/ooo-manager-config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.convert.ooomanager.config.default">
+ <require>org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent</require>
+
+ <extension
+ target="org.nuxeo.ecm.platform.convert.ooomanager.OOoManagerComponent"
+ point="oooManagerConfig">
+
+ <OOoManager>
+
+ 
+ 
+ <portNumbers>
+ <portNumber>2003</portNumber>
+ </portNumbers>
+
+ 
+
+ </OOoManager>
+ </extension>
+</component>
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
new file mode 100644
index 0000000..06b5440
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/quartz.properties
@@ -0,0 +1,14 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = NON_CLUSTERED
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
new file mode 100644
index 0000000..5eace81
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/sql.properties.nxftl
@@ -0,0 +1,13 @@
+# Jena database type and transaction mode
+<#if "${nuxeo.db.type}" == "postgresql">
+org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL
+<#elseif "${nuxeo.db.type}" == "oracle">
+org.nuxeo.ecm.sql.jena.databaseType=Oracle
+<#elseif "${nuxeo.db.type}" == "mssql">
+org.nuxeo.ecm.sql.jena.databaseType=MsSQL
+<#elseif "${nuxeo.db.type}" == "mysql">
+org.nuxeo.ecm.sql.jena.databaseType=MySQL
+<#else>
+# We tell Jena we're using Derby even if the database is actually h2. This works.
+org.nuxeo.ecm.sql.jena.databaseType=Derby
+</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
new file mode 100644
index 0000000..7aadb20
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/config/transient-store-config.xml.nxftl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.transient.store.config">
+
+ <#if "${nuxeo.redis.enabled}" == "true">
+ <#assign className = "org.nuxeo.ecm.core.redis.contribs.RedisTransientStore" />
+ <#else>
+ <#assign className = "org.nuxeo.ecm.core.transientstore.SimpleTransientStore" />
+ </#if>
+
+ <extension target="org.nuxeo.ecm.core.transientstore.TransientStorageComponent"
+ point="store">
+
+ <store name="default" class="${className}">
+ <targetMaxSizeMB>-1</targetMaxSizeMB>
+ <absoluteMaxSizeMB>-1</absoluteMaxSizeMB>
+ <firstLevelTTL>240</firstLevelTTL>
+ <secondLevelTTL>10</secondLevelTTL>
+ <minimalRetention>10</minimalRetention>
+ </store>
+
+ </extension>
+
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
new file mode 100644
index 0000000..7a82b36
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/launcher.properties.nxftl
@@ -0,0 +1,4 @@
+org.nuxeo.app.preprocessing=false
+<#if "${nuxeo.server.sdk}" == "true">
+org.nuxeo.app.installReloadTimer=true
+</#if>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
new file mode 100644
index 0000000..be3823d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/lib/README.txt
@@ -0,0 +1 @@
+This folder contains static libraries used by nuxeo components
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
new file mode 100644
index 0000000..109d04b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.defaults
@@ -0,0 +1,56 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common-base
+
+org.nuxeo.ecm.instance.description=Nuxeo
+
+org.nuxeo.runtime.server.enabled=false
+facelets.REFRESH_PERIOD=-1
+org.nuxeo.ecm.platform.liveedit.autoversioning=none
+
+zip.entry.encoding=
+
+# default|ldap|multi
+nuxeo.directory.type=default
+# (default|userLdapOnly) || (multiUserGroup|multiUserSqlGroup|ldapUserMultiGroup)
+nuxeo.user.group.storage=default
+nuxeo.ldap.url=
+nuxeo.ldap.binddn=
+nuxeo.ldap.bindpassword=
+nuxeo.ldap.retries=5
+nuxeo.ldap.query.sizeLimit=200
+nuxeo.ldap.query.timeLimit=0
+nuxeo.ldap.user.searchBaseDn=
+nuxeo.ldap.user.searchClass=person
+nuxeo.ldap.user.searchFilter=
+nuxeo.ldap.user.searchScope=onelevel
+nuxeo.ldap.user.searchBehavior=subany
+nuxeo.ldap.user.readonly=true
+nuxeo.ldap.user.mapping.rdn=
+nuxeo.ldap.user.mapping.username=
+nuxeo.ldap.user.mapping.password=
+nuxeo.ldap.user.mapping.firstname=
+nuxeo.ldap.user.mapping.lastname=
+nuxeo.ldap.user.mapping.email=
+nuxeo.ldap.user.mapping.company=
+nuxeo.ldap.group.searchBaseDn=
+nuxeo.ldap.group.searchFilter=(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))
+nuxeo.ldap.group.searchScope=subtree
+nuxeo.ldap.group.readonly=true
+nuxeo.ldap.group.mapping.rdn=
+nuxeo.ldap.group.mapping.name=
+nuxeo.ldap.group.mapping.label=
+nuxeo.ldap.group.mapping.members.staticAttributeId=uniqueMember
+nuxeo.ldap.group.mapping.members.dynamicAttributeId=memberURL
+nuxeo.ldap.defaultAdministratorId=
+nuxeo.ldap.defaultMembersGroup=members
+nuxeo.user.anonymous.enable=true
+nuxeo.user.emergency.enable=true
+nuxeo.user.emergency.username=MyAdministrator
+nuxeo.user.emergency.password=secret
+nuxeo.user.emergency.firstname=
+nuxeo.user.emergency.lastname=
+
+nuxeo.cache.type=redis
+nuxeo.cache.ttl=20
+nuxeo.cache.maxsize=100
+nuxeo.cache.concurrencylevel=500
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png
new file mode 100644
index 0000000..5cc89ab
Binary files /dev/null and b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/favicon.png differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png
new file mode 100644
index 0000000..873245f
Binary files /dev/null and b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/img/nuxeo.png differ
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
new file mode 100644
index 0000000..530a02b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/nuxeo.war/index.html
@@ -0,0 +1,124 @@
+<html>
+ <head>
+ <title>Nuxeo Server</title>
+ <link href="img/favicon.png" type="image/png" rel="icon">
+ <style type="text/css">
+
+
+</style>
+ </head>
+ <body>
+ <div class="header"><img src="img/nuxeo.png"></div>
+ <div class="welcome">
+ <p class="welcomeText">
+ Welcome to your Nuxeo server.
+ </p>
+ </div>
+ <div class="footer">Copyright © 2001-2016 Nuxeo SA (http://nuxeo.com/) and others.</div>
+ </body>
+</html>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
new file mode 100644
index 0000000..1ea4aac
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/common/plugins/README.txt
@@ -0,0 +1 @@
+This folder contains the external modules on top of the nuxeo platform
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
new file mode 100644
index 0000000..f812e03
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/bundles/CUSTOM.txt
@@ -0,0 +1 @@
+Put here the custom bundles to deploy when activating the custom template.
\ No newline at end of file
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
new file mode 100644
index 0000000..3f563a8
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/custom/nuxeo.defaults
@@ -0,0 +1,10 @@
+## Edit this file to customize your configuration ##
+## See http://doc.nuxeo.com/x/LANc
+custom.target=nxserver
+
+# Set list of templates to include, comma separated values.
+#nuxeo.template.includes=common
+
+# Customize default values associated with this template
+#org.nuxeo.ecm.instance.description=Nuxeo ECM customized
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
new file mode 100644
index 0000000..642da06
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/db2/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+db2.target=.
+
+nuxeo.db.type=db2
+nuxeo.db.host=localhost
+nuxeo.db.port=3700
+nuxeo.db.name=nuxeo
+nuxeo.db.user=user
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:db2://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
+nuxeo.db.driver=com.ibm.db2.jcc.DB2Driver
+nuxeo.db.xadatasource=com.ibm.db2.jcc.DB2XADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
new file mode 100644
index 0000000..a5a6e8b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/default/nuxeo.defaults
@@ -0,0 +1,12 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+default.target=.
+
+nuxeo.db.type=default
+nuxeo.db.name=nuxeo
+nuxeo.db.user=sa
+nuxeo.db.password=
+nuxeo.db.jdbc.url=jdbc:h2:$${nuxeo.data.dir}/h2/${nuxeo.db.name};DB_CLOSE_ON_EXIT=false
+nuxeo.db.driver=org.h2.Driver
+nuxeo.db.xadatasource=org.h2.jdbcx.JdbcDataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
new file mode 100644
index 0000000..2635cfc
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nuxeo.defaults
@@ -0,0 +1,5 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=mongodb
+gridfsbinaries.target=.
+
+nuxeo.mongodb.gridfs.bucket=default.fs
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
new file mode 100644
index 0000000..01d2d77
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/gridfsbinaries/nxserver/config/gridfs-config.xml
@@ -0,0 +1,12 @@
+<component name="org.nuxeo.gridfs.config">
+ <require>default-repository-config</require>
+
+ <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
+ <blobprovider name="default">
+ <class>org.nuxeo.ecm.core.storage.mongodb.GridFSBinaryManager</class>
+ <property name="server">${nuxeo.mongodb.server}</property>
+ <property name="dbname">${nuxeo.mongodb.dbname}</property>
+ <property name="bucket">${nuxeo.mongodb.gridfs.bucket}</property>
+ </blobprovider>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
new file mode 100644
index 0000000..11e0b7c
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/https/nuxeo.defaults
@@ -0,0 +1,11 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+https.target=conf
+https.deprecated=true
+https.deprecation=HTTPS will be automatically activated if you set nuxeo.server.https.port to non-zero
+
+nuxeo.server.https.port=443
+nuxeo.server.https.keystoreFile=/path/to/keystore
+nuxeo.server.https.keystorePass=password
+
+nuxeo.url=https://localhost/nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
new file mode 100644
index 0000000..b4e79a7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mongodb/nuxeo.defaults
@@ -0,0 +1,7 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+mongodb.target=.
+
+nuxeo.dbnosql.type=mongodb
+nuxeo.mongodb.server=localhost:27017
+#nuxeo.mongodb.server=mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+nuxeo.mongodb.dbname=nuxeo
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..9287904
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=mssql
+mssql-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..4e1f2d7
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = QRTZ_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
new file mode 100644
index 0000000..c23f762
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mssql/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+mssql.target=.
+
+nuxeo.db.type=mssql
+nuxeo.db.host=localhost
+nuxeo.db.port=1433
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:jtds:sqlserver://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name};useCursors=true
+nuxeo.db.driver=net.sourceforge.jtds.jdbc.Driver
+nuxeo.db.xadatasource=net.sourceforge.jtds.jdbcx.JtdsDataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
new file mode 100644
index 0000000..99320f4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/mysql/nuxeo.defaults
@@ -0,0 +1,15 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+mysql.target=.
+
+nuxeo.db.type=mysql
+nuxeo.db.host=localhost
+nuxeo.db.port=3306
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.min-pool-size=5
+nuxeo.db.jdbc.url=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true
+nuxeo.db.driver=com.mysql.jdbc.Driver
+nuxeo.db.xadatasource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
new file mode 100644
index 0000000..eec177a
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/nuxeo.defaults
@@ -0,0 +1,89 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+
+# Default configuration values for templates
+# Specific default values are defined in templates/{template_name}/nuxeo.defaults
+nuxeo.data.dir=nxserver/data
+nuxeo.server.dir=nxserver
+
+jndi.base=java:comp/env
+
+# Default template to use if not defined in nuxeo.conf
+nuxeo.templates=default
+
+# Default IP address binding
+nuxeo.bind.address=0.0.0.0
+
+# publicly visible URL
+nuxeo.url=http://localhost:8080/nuxeo
+
+# Application context path
+org.nuxeo.ecm.contextPath=/nuxeo
+
+org.nuxeo.ecm.product.name=Nuxeo Platform
+org.nuxeo.ecm.product.version=FT 8.3-SNAPSHOT
+
+# Various other default values
+#nuxeo.db.host=
+#nuxeo.db.port=
+#nuxeo.db.name=
+#nuxeo.db.user=
+#nuxeo.db.password=
+nuxeo.db.min-pool-size=5
+nuxeo.db.max-pool-size=100
+nuxeo.db.blocking-timeout-millis=10000
+# Database transaction timeout in seconds
+nuxeo.db.transactiontimeout=300
+
+# Redis
+nuxeo.redis.enabled=false
+nuxeo.redis.prefix=nuxeo:
+nuxeo.redis.host=localhost
+nuxeo.redis.port=6379
+nuxeo.redis.password=
+nuxeo.redis.database=0
+nuxeo.redis.timeout=2000
+nuxeo.redis.maxTotal=16
+nuxeo.redis.maxIdle=8
+nuxeo.redis.ha.enabled=false
+nuxeo.redis.ha.master=mymaster
+nuxeo.redis.ha.hosts=localhost
+nuxeo.redis.ha.timeout=300
+nuxeo.redis.ha.port=26379
+nuxeo.work.queuing=redis
+nuxeo.lock.manager=redis
+
+# MongoDB
+nuxeo.mongodb.server=
+
+nuxeo.notification.eMailSubjectPrefix=[Nuxeo]
+nuxeo.notification.eMailSigner=The Nuxeo team
+
+# The protocol used to connect to OpenOffice
+# Can be either SOCKET or PIPE, default is SOCKET
+jod.connection.protocol=SOCKET
+jod.max.tasks.per.process=
+jod.task.execution.timeout=
+jod.task.queue.timeout=
+jod.office.home=
+jod.jpipe.lib.path=
+jod.template.profile.dir=
+
+opensocial.gadgets.embeddedServer=true
+opensocial.gadgets.host=localhost
+opensocial.gadgets.port=8080
+opensocial.gadgets.path=/site/gadgets
+opensocial.trusted.hosts=
+
+# Clustering
+repository.clustering.enabled=false
+repository.clustering.id=
+repository.clustering.delay=1000
+repository.clustering.invalidation=default
+# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries
+repository.binary.store=
+
+nuxeo.plaintext_parsing_extensions=xml,properties,nx,html,js
+nuxeo.freemarker_parsing_extensions=nxftl
+
+session.timeout=60
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..c37be53
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=oracle
+oracle-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..42d1952
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = qrtz_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
new file mode 100644
index 0000000..4f00af4
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+oracle.target=.
+
+nuxeo.db.user_separator_key=|
+nuxeo.db.type=oracle
+nuxeo.db.host=localhost
+nuxeo.db.port=1521
+nuxeo.db.name=NUXEO
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:oracle:thin:${nuxeo.db.user}/${nuxeo.db.password}@${nuxeo.db.host}:${nuxeo.db.port}:${nuxeo.db.name}
+nuxeo.db.driver=oracle.jdbc.OracleDriver
+nuxeo.db.xadatasource=oracle.jdbc.xa.client.OracleXADataSource
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
new file mode 100644
index 0000000..733cc1d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/oracle/nxserver/hibernate.properties
@@ -0,0 +1 @@
+hibernate.default_schema=${nuxeo.db.user}
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
new file mode 100644
index 0000000..cf1a82b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nuxeo.defaults
@@ -0,0 +1,33 @@
+perf.target=.
+
+# Use a bigger pool size for db/vcs
+nuxeo.db.max-pool-size=52
+nuxeo.vcs.max-pool-size=50
+
+# Use a descent cache size for directories
+nuxeo.cache.maxsize=510
+nuxeo.cache.ttl=20
+nuxeo.cache.concurrencylevel=50
+
+# Use Elasticsearch for all page provider
+elasticsearch.override.pageproviders=default_search,document_content,section_content,document_content,tree_children,default_document_suggestion,simple_search,advanced_search,nxql_search,DEFAULT_DOCUMENT_SUGGESTION,REST_API_SEARCH_ADAPTER
+
+# Disable db fulltext indexing
+nuxeo.vcs.fulltext.search.disabled=true
+
+# Disable db stored procedure
+nuxeo.vcs.optimizations.acl.enabled=false
+nuxeo.vcs.optimizations.path.enabled=false
+
+# When in cluster mode use Redis invalidation
+repository.clustering.invalidation=redis
+
+# Do not use Redis for directory cache
+nuxeo.cache.type=memory
+
+# Tune Elasticsearch indexing
+elasticsearch.indexing.maxThreads=6
+elasticsearch.reindex.bucketReadSize=1000
+elasticsearch.reindex.bucketWriteSize=200
+#elasticsearch.indexing.clearCompletedAfterSeconds=30
+elasticsearch.adminCenter.displayClusterInfo=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
new file mode 100644
index 0000000..f8e40f0
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/audit-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<component name="perf-audit-config">
+ <require>org.nuxeo.ecm.platform.audit.service.NXAuditEventsService</require>
+ <extension target="org.nuxeo.ecm.platform.audit.service.NXAuditEventsService" point="event">
+ <event enabled="false" name="loginSuccess" />
+ <event enabled="false" name="logout"/>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
new file mode 100644
index 0000000..01c0f95
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/perf/nxserver/config/no-thumbnail-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<component name="perf-nothumb-config">
+ <require>org.nuxeo.ecm.platform.thumbnail.listener</require>
+ <extension target="org.nuxeo.ecm.core.event.EventServiceComponent" point="listener">
+ <listener name="updateThumbListener" enabled="false"/>
+ <listener name="checkBlobUpdate" enabled="false"/>
+ </extension>
+</component>
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
new file mode 100644
index 0000000..7a1e512
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nuxeo.defaults
@@ -0,0 +1,4 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=postgresql
+postgresql-quartz-cluster.target=.
+nuxeo.quartz.enable=true
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
new file mode 100644
index 0000000..27c7635
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql-quartz-cluster/nxserver/config/quartz.properties
@@ -0,0 +1,28 @@
+# This is a standard Quartz configuration file
+# See http://quartz-scheduler.org/documentation/quartz-1.x/configuration/
+# This file is read by name (config/quartz.properties) by SchedulerRegistryService
+
+org.quartz.scheduler.instanceName = Quartz
+org.quartz.scheduler.threadName = Quartz_Scheduler
+org.quartz.scheduler.instanceId = AUTO
+org.quartz.scheduler.makeSchedulerThreadDaemon = true
+org.quartz.scheduler.skipUpdateCheck = true
+org.quartz.scheduler.xaTransacted = true
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 1
+org.quartz.threadPool.threadPriority = 4
+org.quartz.threadPool.makeThreadsDaemons = true
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
+org.quartz.jobStore.dataSource = nxquartz
+org.quartz.jobStore.nonManagedTXDataSource = nxquartz_no_tx
+org.quartz.jobStore.acquireTriggersWithinLock = true
+org.quartz.jobStore.tablePrefix = qrtz_
+org.quartz.jobStore.isClustered = true
+
+org.quartz.dataSource.nxquartz.jndiURL = ${jndi.base}/jdbc/nxquartz
+org.quartz.dataSource.nxquartz.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
+org.quartz.dataSource.nxquartz_no_tx.jndiURL = ${jndi.base}/jdbc/nxquartz_no_tx
+org.quartz.dataSource.nxquartz_no_tx.connectionProvider.class = org.nuxeo.ecm.core.scheduler.NuxeoQuartzConnectionProvider
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
new file mode 100644
index 0000000..71e367a
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/postgresql/nuxeo.defaults
@@ -0,0 +1,14 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+nuxeo.template.includes=common
+postgresql.target=.
+
+nuxeo.db.type=postgresql
+nuxeo.db.host=localhost
+nuxeo.db.port=5432
+nuxeo.db.name=nuxeo
+nuxeo.db.user=nuxeo
+nuxeo.db.password=password
+nuxeo.db.jdbc.url=jdbc:postgresql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}
+nuxeo.db.driver=org.postgresql.Driver
+nuxeo.db.xadatasource=org.postgresql.xa.PGXADataSource
+
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
new file mode 100644
index 0000000..388a319
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nuxeo.defaults
@@ -0,0 +1,6 @@
+## DO NOT EDIT THIS FILE, USE nuxeo.conf ##
+sdk.target=.
+nuxeo.template.includes=default
+
+nuxeo.server.sdk=true
+facelets.REFRESH_PERIOD=2
diff --git a/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties b/nuxeo-distribution/nuxeo-distribution-resources/src/main/resources/templates-server/sdk/nxserver/config/seam-debug.properties
new file mode 100644
index 0000000..e69de29
diff --git a/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok b/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
new file mode 100644
index 0000000..1b9703d
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/.classpath.ok
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/assemble"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin/main"/>
+</classpath>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/.project.ok b/nuxeo-distribution/nuxeo-distribution-server/.project.ok
new file mode 100644
index 0000000..671bf49
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/.project.ok
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>nuxeo-distribution-server</name>
+ <comment>Nuxeo Server NXR</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/pom.xml b/nuxeo-distribution/nuxeo-distribution-server/pom.xml
new file mode 100644
index 0000000..df4ce9f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/pom.xml
@@ -0,0 +1,364 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution</artifactId>
+ <version>8.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>nuxeo-distribution-server</artifactId>
+ <packaging>zip</packaging>
+ <name>Nuxeo Server NXR</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuxeo.common</groupId>
+ <artifactId>nuxeo-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-deploy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-metrics</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-schema</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-mimetype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-dmk-adaptor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-sql-management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.lib.core</groupId>
+ <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-dbs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-mongodb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-storage-mem</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-convert-plugins</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-convert</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-types-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-types-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-audit-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.localconf</groupId>
+ <artifactId>nuxeo-localconf-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-audit-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-commandline-executor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-types-contrib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-directory-multi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-dublincore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-filemanager-core-listener</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-login-digest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-default-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-core-listener</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-relations-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-usermanager-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-usermanager-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-versioning-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-versioning-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-content-template-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-io-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-io-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-admin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.webengine</groupId>
+ <artifactId>nuxeo-webengine-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-rendering</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-platform-lang-ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.automation</groupId>
+ <artifactId>nuxeo-automation-scripting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-ws</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-opencmis-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-opencmis-bindings</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-webdav</artifactId>
+ </dependency>
+
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-rest-api-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-rest-api-server</artifactId>
+ </dependency>
+
+ 
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuxeo.build</groupId>
+ <artifactId>ant-assembly-maven-plugin</artifactId>
+ <configuration>
+ <buildFile>${basedir}/src/main/assemble/assembly.xml</buildFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>os-notwindows</id>
+ <activation>
+ <os>
+ <family>!windows</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.tattletale</groupId>
+ <artifactId>tattletale-maven</artifactId>
+ <configuration>
+ <source>${project.build.directory}/nxr/lib:${project.build.directory}/nxr/bundles</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
new file mode 100644
index 0000000..ef45b46
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-server/src/main/assemble/assembly.xml
@@ -0,0 +1,44 @@
+<project name="nuxeo-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
+ <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
+ <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
+
+ <target name="build" description="Build Nuxeo Server NXR">
+ <echo level="info">Building Nuxeo Server NXR</echo>
+ <property name="outdir" value="${maven.project.build.directory}" />
+ <artifact:nuxeo-expand includeTestScope="true" />
+ <artifact:print output="${outdir}/artifacts-server.properties" mode="sdk" />
+ <artifact:print output="${outdir}/test-artifacts-server.properties" mode="sdk" scopes="test" />
+ <artifact:print output="${outdir}/dependency-tree.log" />
+
+ <property name="nxr" value="${outdir}/nxr" />
+ <delete failonerror="false" dir="${nxr}" />
+ <mkdir dir="${nxr}" />
+ <copy todir="${nxr}/bundles" overwrite="true">
+ <artifact:set excludeRoots="true">
+ <includes>
+ <artifact groupId="org.nuxeo*" scope="" type="!pom" />
+ </includes>
+ <excludes>
+ <artifact groupId="org.nuxeo.lib*" />
+ </excludes>
+ </artifact:set>
+ </copy>
+
+ <copy todir="${nxr}/lib" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="!org.nuxeo*" scope="" />
+ <artifact groupId="org.nuxeo.lib*" scope="" />
+ </includes>
+ </artifact:set>
+ </copy>
+ <nx:rmdups dir="${nxr}/lib" />
+
+ <copy file="${outdir}/artifacts-server.properties" todir="${nxr}" />
+ <copy file="${outdir}/test-artifacts-server.properties" todir="${nxr}" />
+
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" basedir="${nxr}" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}.zip" type="zip" />
+ </target>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
deleted file mode 100644
index d0f6571..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/.project.ok
+++ /dev/null
@@ -1,9 +0,0 @@
-<projectDescription>
- <name>nuxeo-distribution-tomcat-coreserver</name>
- <comment>Nuxeo Distribution Tomcat CoreServer</comment>
- <projects/>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
deleted file mode 100644
index b8c3b87..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution</artifactId>
- <version>8.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
- <packaging>pom</packaging>
- <name>Nuxeo CoreServer Tomcat Build</name>
- <description>Package Nuxeo CoreServer with Tomcat</description>
-
- <properties>
- 
- <tomcat.classifier>light</tomcat.classifier>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-jtajca</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.runtime</groupId>
- <artifactId>nuxeo-runtime-datasource</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.lib.runtime</groupId>
- <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.core</groupId>
- <artifactId>nuxeo-core-management-jtajca</artifactId>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-ws-sun-jaxws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- </dependency>
- 
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>doc</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>root</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>bin</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-resources</artifactId>
- <type>zip</type>
- <classifier>templates-coreserver</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-startup-wizard</artifactId>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.shell</groupId>
- <artifactId>nuxeo-shell</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo</groupId>
- <artifactId>nuxeo-ecm</artifactId>
- <type>zip</type>
- <classifier>tools</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
- <artifactId>nuxeo-platform-seam-debug</artifactId>
- <scope>provided</scope>
- </dependency>
- 
- <dependency>
- <groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-marketplace-dm</artifactId>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>all</id>
- 
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>nuxeo-coreserver</id>
- <properties>
- <product.name>coreserver</product.name>
- </properties>
- 
- </profile>
- <profile>
- <id>sdk</id>
- 
- </profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.tattletale</groupId>
- <artifactId>tattletale-maven</artifactId>
- <configuration>
- <source>${project.build.directory}/nuxeo-coreserver-${project.version}-tomcat/nxserver/lib
- </source>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.nuxeo.build</groupId>
- <artifactId>ant-assembly-maven-plugin</artifactId>
- <configuration>
- <buildFiles>
- <buildFile>${basedir}/src/main/assemble/assembly.xml
- </buildFile>
- </buildFiles>
- </configuration>
- <executions>
- <execution>
- <id>packaging</id>
- <goals>
- <goal>build</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
deleted file mode 100644
index 4db8f37..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/assemble/assembly.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<project name="tomcat-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
- <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
- <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
-
- <target name="init" unless="init.done">
- <tstamp />
- <condition property="build.sdk">
- <or>
- <isset property="maven.profile.release" />
- <isset property="maven.profile.sdk" />
- <isset property="maven.profile.nightly" />
- </or>
- </condition>
-
- <property name="outdir" value="${maven.project.build.directory}" />
- <antcall target="expand" />
- <property name="init.done" value="true" />
- </target>
-
- <target name="expand" unless="no.build">
- <artifact:nuxeo-expand />
- <artifact:print output="${outdir}/artifacts-tomcat.properties" mode="sdk" />
- <artifact:print output="${outdir}/dependency-tree.log" />
- </target>
-
- <target name="build" depends="init" unless="no.build">
- <echo level="info">Building Tomcat standard distributions...</echo>
- <property name="tomcat" value="${outdir}/tomcat.tmp" />
- <antcall target="prepare-tomcat" />
- <artifact:attach file="pom.xml" type="pom" />
- <antcall target="build-nuxeo-coreserver">
- <param name="classifier" value="nuxeo-coreserver" />
- </antcall>
- <delete dir="${tomcat}" failonerror="false" />
- </target>
-
- <target name="prepare-tomcat">
- <unzip dest="${outdir}">
- <artifact:resolveFile key="org.apache.tomcat:tomcat:${tomcat.version}:zip:${tomcat.classifier}" />
- </unzip>
- <move todir="${tomcat}">
- <fileset dir="${outdir}/apache-tomcat-${tomcat.version}" />
- </move>
- <copy tofile="${tomcat}/bin/tomcat-juli.jar">
- <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli" />
- </copy>
- <copy tofile="${tomcat}/lib/tomcat-juli-adapters.jar">
- <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli-adapters" />
- </copy>
-
- <unzip dest="${tomcat}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:doc" />
- </unzip>
- <copy todir="${tomcat}">
- <fileset dir="src/main/resources/common" />
- </copy>
- <unzip dest="${tomcat}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:root" />
- </unzip>
- <unzip dest="${tomcat}/bin">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:bin" />
- </unzip>
-
- <unzip dest="${tomcat}/templates" overwrite="true">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:templates-coreserver" />
- </unzip>
-
- <echo message="tomcat.version=${tomcat.version}" append="true" file="${tomcat}/templates/nuxeo.defaults" />
-
- <copy tofile="${tomcat}/templates/nuxeo-wizard.war">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-startup-wizard:${nuxeo.distribution.version}:war" />
- </copy>
-
- <copy todir="${tomcat}/client">
- <artifact:file key="org.nuxeo.shell:nuxeo-shell" />
- </copy>
- </target>
-
- <target name="copy-packages-xml">
- 
- <copy file="src/main/resources/packages.xml" tofile="${tomcat}/setupWizardDownloads/packages.xml">
- </copy>
- </target>
-
- <target name="sample-installAfterRestart-files">
- <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">init
-install nuxeo-sc
- </echo>
- <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">init
-install nuxeo-dam</echo>
- </target>
-
- <target name="build-nuxeo-coreserver"
- depends="sample-installAfterRestart-files,copy-packages-xml"
- description="Build Tomcat distribution with Nuxeo CoreServer">
- <echo level="info">Building Nuxeo CoreServer...</echo>
- <property name="distribution.dir" value="${outdir}/${classifier}-${maven.project.version}-tomcat" />
- <delete failonerror="false" dir="${distribution.dir}" />
- <copy todir="${distribution.dir}">
- <fileset dir="${tomcat}" />
- </copy>
- <antcall target="chmodx" />
-
- 
- <unzip dest="${distribution.dir}/nxserver">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-coreserver:${nuxeo.distribution.version}:zip" />
- </unzip>
-
- <antcall target="set-distribution-properties">
- <param name="org.nuxeo.distribution.name" value="coreserver" />
- </antcall>
-
- <echo file="${distribution.dir}/setupWizardDownloads/packages-default-selection.properties"
- message="preset=nuxeo-coreserver-preset" />
-
- <antcall target="reorganize-libs" />
- <antcall target="build-server" />
- <antcall target="build-sdk" />
- </target>
-
- <target name="build-server">
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
- basedir="${outdir}"
- includes="${classifier}-${maven.project.version}-tomcat/**" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
- classifier="${classifier}"
- type="zip" />
- </target>
-
- <target name="reorganize-libs">
- 
- <copy todir="${distribution.dir}/nxserver/bundles" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="org.nuxeo*" />
- </includes>
- <excludes>
- <artifact groupId="org.nuxeo.lib*" />
- </excludes>
- </artifact:set>
- </copy>
- <copy todir="${distribution.dir}/nxserver/lib" overwrite="true">
- <artifact:set>
- <includes>
- <artifact groupId="!org.nuxeo*" scope="!test" />
- <artifact groupId="org.nuxeo.lib*" scope="!test" />
- </includes>
- </artifact:set>
- </copy>
- 
- <delete>
- <fileset dir="${distribution.dir}/nxserver/lib">
- 
- 
- 
- <include name="jetty-naming*" />
- <include name="el-api*" />
- <include name="jsp-*" />
- <include name="juel-api-*" />
- <include name="tomcat-dbcp-*" />
- </fileset>
- 
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="commons-logging*" />
- </fileset>
- </delete>
- 
- <move todir="${distribution.dir}/lib">
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="nuxeo-runtime-*" />
- <include name="commons-lang-*" />
- <include name="commons-lang3-*" />
- <include name="freemarker-*" />
- <include name="mail-*" />
- <include name="xercesImpl-*" />
- <include name="xml-apis-*" />
- 
- <include name="slf4j*" />
- <include name="jcl-over-slf4j*" />
- <include name="log4j-*" />
- </fileset>
- </move>
- <nx:rmdups dir="${distribution.dir}/nxserver/lib" />
- <nx:rmdups dir="${distribution.dir}/lib" />
-
- 
- <move todir="${distribution.dir}/endorsed">
- <fileset dir="${distribution.dir}/nxserver/lib">
- <include name="jaxb-api-*" />
- <include name="jaxws-api-*" />
- </fileset>
- </move>
- </target>
-
- <target name="set-distribution-properties">
- <property name="distribution.properties.file"
- value="${distribution.dir}/templates/common/config/distribution.properties" />
- <echo append="false" file="${distribution.properties.file}">## DO NOT MANUALLY EDIT THIS FILE
-org.nuxeo.distribution.name=${org.nuxeo.distribution.name}
-org.nuxeo.distribution.server=tomcat
-org.nuxeo.distribution.version=${maven.project.version}
-org.nuxeo.distribution.date=${DSTAMP}${TSTAMP}
-org.nuxeo.distribution.package=zip</echo>
- </target>
-
- <target name="build-sdk" if="build.sdk">
- <copy file="${distribution.dir}/templates/common/config/distribution.properties" todir="${distribution.dir}/sdk" />
- <copy file="${outdir}/artifacts-tomcat.properties" todir="${distribution.dir}/sdk" />
- <move todir="${distribution.dir}/sdk">
- <fileset dir="${distribution.dir}/nxserver/">
- <filename name="*artifacts-*.properties" />
- </fileset>
- </move>
- <artifact:printMgt output="${distribution.dir}/sdk/artifacts-nuxeo.properties"
- key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
- scopes="compile,provided,runtime" />
- <artifact:printMgt output="${distribution.dir}/sdk/test-artifacts-nuxeo.properties"
- key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
- scopes="test,provided" />
-
- <copy todir="${distribution.dir}/sdk/sources">
- <artifact:resolveFiles source="${distribution.dir}/sdk/artifacts*.properties" classifier="sources" />
- <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" classifier="sources" />
- </copy>
- <copy todir="${distribution.dir}/sdk/tests">
- <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" />
- </copy>
-
- <unzip dest="${distribution.dir}/sdk/tools">
- <artifact:file key="org.nuxeo:nuxeo-ecm::zip:tools" />
- </unzip>
-
- <copy todir="${distribution.dir}/nxserver/bundles">
- <artifact:file key="org.nuxeo.ecm.platform:nuxeo-platform-seam-debug" />
- </copy>
-
- <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
- basedir="${outdir}"
- includes="${classifier}-${maven.project.version}-tomcat/**" />
- <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
- classifier="${classifier}-sdk"
- type="zip" />
- </target>
-
- <target name="chmodx">
- <chmod dir="${distribution.dir}" perm="ug+x" includes="*.command,bin/*.sh,bin/*ctl,bin/*.command" />
- </target>
-</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
deleted file mode 100755
index 1cbea53..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/bin/nxdeploy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-java -DupdateWar=y -jar ../lib/nuxeo-runtime-tomcat-adapter-5.4.3-SNAPSHOT.jar
-
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
deleted file mode 100644
index 3158810..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/lib/log4j.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false" threshold="null">
-
- 
- 
- 
-
- 
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/server.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%t] [%c] %m%n" />
- </layout>
- </appender>
-
- 
-
- 
- 
- 
-
- <appender name="ERROR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/nuxeo-error.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- 
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- 
- </layout>
- </appender>
-
- 
- 
- 
-
- <appender name="STDERR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/stderr.log" />
- <param name="Append" value="true" />
- 
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- 
- 
- 
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
- </layout>
- <filter class="org.apache.log4j.varia.LevelRangeFilter">
- <param name="levelMin" value="INFO" />
- </filter>
- </appender>
-
- 
- 
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
-
- <appender name="CLASSLOADER" class="org.apache.log4j.RollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
- <param name="File" value="${nuxeo.log.dir}/classloader.log" />
- <param name="Append" value="false" />
- <param name="MaxFileSize" value="500KB" />
- <param name="MaxBackupIndex" value="1" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- <appender name="TOMCAT" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${nuxeo.log.dir}/tomcat.log" />
- <param name="Append" value="false" />
- <param name="MaxFileSize" value="500KB" />
- <param name="MaxBackupIndex" value="1" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- 
- 
- 
-
- <category name="org.apache.catalina.loader" additivity="false">
- <appender-ref ref="CLASSLOADER"/>
- </category>
-
- <category name="org.apache.catalina.core.AprLifecycleListener" additivity="false">
- <priority value="INFO" />
- <appender-ref ref="TOMCAT"/>
- </category>
-
- <category name="org.jboss.seam">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.ejb3">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.seam.contexts.Contexts">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.seam.contexts.Lifecycle">
- <priority value="WARN" />
- </category>
- <category name="org.jboss.mx.loading">
- <priority value="INFO" />
- </category>
- <category name="org.jboss.system.server.Server">
- <priority value="INFO" />
- </category>
- 
- <category name="org.jboss.management" additivity="true">
- <priority value="INFO" />
- </category>
- 
- <category name="org.jboss.serial" additivity="true">
- <priority value="INFO" />
- </category>
-
- 
- <category name="org.apache" additivity="true">
- <priority value="INFO" />
- </category>
- <category name="org.apache.cxf">
- <priority value="WARN" />
- </category>
- <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource">
- <priority value="ERROR" />
- </category>
-
- <category name="org.ajax4jsf">
- <priority value="INFO" />
- </category>
- <category name="org.ajax4jsf.cache.LRUMapCacheFactory">
- <priority value="ERROR" />
- </category>
-
- <category name="org.hibernate">
- <priority value="WARN" />
- </category>
- <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.impl.SessionFactoryObjectFactory">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.cache.EhCacheProvider">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.hql.ast.tree.FromElementType">
- <priority value="ERROR" />
- </category>
- <category name="org.hibernate.ejb.Ejb3Configuration">
- <priority value="ERROR" />
- </category>
-
- <category name="org.jbpm">
- <priority value="INFO" />
- </category>
- <category name="org.jbpm.jpdl.xml.JpdlXmlReader">
- <priority value="ERROR" />
- </category>
-
-
- <category name="org.nuxeo">
- <priority value="WARN" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.ElasticSearchComponent">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.audit.ESAuditBackend">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.elasticsearch.audit.ESAuditMigrationWork">
- <priority value="INFO" />
- </category>
-
- <category name="org.nuxeo.ecm.platform.query.core.PageProviderClassReplacerRegistry">
- <priority value="INFO" />
- </category>
-
- 
- 
- 
- 
-
- 
- 
- <category name="org.nuxeo.runtime.reload">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService">
- <priority value="INFO" />
- </category>
- 
- 
- <category name="org.nuxeo.osgi.application.loader.FrameworkLoader">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.osgi.application.StandaloneApplication">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.osgi.application.FrameworkBootstrap">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.jboss.deployment.NuxeoDeployer">
- <priority value="INFO" />
- </category>
- <category name="org.nuxeo.runtime.tomcat.NuxeoDeployer">
- <priority value="INFO" />
- </category>
- 
- 
- <category name="org.nuxeo.ecm.automation.core">
- <priority value="INFO" />
- </category>
- 
- <category name="org.nuxeo.ecm.automation.scripting">
- <priority value="WARN" />
- </category>
-
- <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
- <priority value="INFO" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.application">
- <priority value="INFO" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
- <priority value="INFO" />
- </category>
-
- 
- <category name="jacorb" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="org.jgroups" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="org.quartz" additivity="true">
- <priority value="WARN" />
- </category>
-
- 
- <category name="com.sun.jersey.spi.container.servlet.WebComponent">
- <priority value="ERROR" />
- </category>
-
- <category name="org.apache.shindig.common.xml.XmlUtil">
- <priority value="WARN" />
- </category>
-
- <category name="org.apache.myfaces.shared_tomahawk">
- <priority value="WARN" />
- </category>
-
- <category name="org.artofsolving.jodconverter">
- <priority value="WARN" />
- </category>
-
- 
-
- 
-
- 
-
- 
-
- 
-
- 
- 
-
- 
- 
-
- 
- 
-
- 
- <category name="nuxeo-error-log">
- <priority value="TRACE" />
- <appender-ref ref="ERROR-FILE" />
- </category>
-
- 
- <category name="STDERR" additivity="false">
- <priority value="ERROR" />
- <appender-ref ref="STDERR-FILE" />
- </category>
-
- 
- 
- 
-
- <root>
- <level value="WARN" />
- <appender-ref ref="CONSOLE" />
- <appender-ref ref="FILE" />
- </root>
-
-</log4j:configuration>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
deleted file mode 100644
index e6f2662..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/common/nxserver/system.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-derby.system.home=${nuxeo.data.dir}/derby
-org.nuxeo.launcher.libdirs=lib
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
deleted file mode 100644
index 045ab3c..0000000
--- a/nuxeo-distribution/nuxeo-distribution-tomcat-coreserver/src/main/resources/packages.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<packages>
- <packageDefinitions baseUrl="http://cdn.nuxeo.com/nuxeo-8.3-SNAPSHOT/mp/">
- <package id="nuxeo-coreserver" label="Core Server" color="#635959" textcolor="#FFF"
- shortlabel="CORE" virtual="true" desc="Content Application Platform" />
- <package id="nuxeo-dam" label="Digital Asset Management (DAM)" color="#ffeb6d" textcolor="#333" shortlabel="DAM"
- desc="Digital Asset Management" />
- <package id="nuxeo-drive" label="Drive" color="#5AC456" textcolor="#FFF" shortlabel="DRIVE" desc="Drive" />
- <package id="nuxeo-diff" label="Nuxeo Diff (DIFF)" color="#5e9adf" textcolor="#FFF" shortlabel="DIFF"
- desc="Nuxeo Diff" />
- <package id="nuxeo-showcase-content" label="Showcase Content (DOCS)" color="#DB97FF" textcolor="#FFF"
- shortlabel="DOCS" desc="Showcase Content Sample" />
- <package id="nuxeo-spreadsheet" label="Spreadsheet (GRID)" color="#ff736e" textcolor="#FFF" shortlabel="GRID"
- desc="Spreadsheet" />
- <package id="nuxeo-web-mobile" label="Mobile (MOB)" color="#faac05" textcolor="#FFF" shortlabel="MOB"
- desc="Mobile" />
- <package id="nuxeo-template-rendering-samples" label="Template Rendering (TMPL)" color="#c3c7c9" textcolor="#FFF"
- shortlabel="TMPL" desc="Template Rendering" />
- <package id="nuxeo-liveconnect" label="Live Connect (LIVE)" color="#ff452a" textcolor="#FFF" shortlabel="LIVE"
- desc="Live Connect for Cloud Services" />
- <package id="nuxeo-review-workflows-dashboards" label="Review Workflows Dashboards (RWD)" color="#213F7D"
- textcolor="#FFF" shortlabel="RWD" desc="Data Visualization Dashboards for Review Workflows" />
- </packageDefinitions>
- <install>
- <packageOptions>
- <package ref="nuxeo-coreserver" exclusive="false">
- <package ref="nuxeo-dam" exclusive="false" />
- <package ref="nuxeo-drive" exclusive="false" />
- <package ref="nuxeo-diff" exclusive="false" />
- <package ref="nuxeo-showcase-content" exclusive="false" />
- <package ref="nuxeo-spreadsheet" exclusive="false" />
- <package ref="nuxeo-web-mobile" exclusive="false" />
- <package ref="nuxeo-template-rendering-samples" exclusive="false" />
- <package ref="nuxeo-liveconnect" exclusive="false" />
- <package ref="nuxeo-review-workflows-dashboards" exclusive="false" />
- </package>
- </packageOptions>
- </install>
- <presets>
- <preset id="nuxeo-coreserver-preset" label="Nuxeo CoreServer Preset">nuxeo-coreserver,nuxeo-dam,nuxeo-drive,nuxeo-web-mobile,nuxeo-showcase-content,nuxeo-template-rendering-samples</preset>
- </presets>
-</packages>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok b/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
new file mode 100644
index 0000000..4937a6f
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/.project.ok
@@ -0,0 +1,9 @@
+<projectDescription>
+ <name>nuxeo-distribution-tomcat-server</name>
+ <comment>Nuxeo Distribution Tomcat Server</comment>
+ <projects/>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
new file mode 100644
index 0000000..af94b84
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/pom.xml
@@ -0,0 +1,186 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution</artifactId>
+ <version>8.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
+ <packaging>pom</packaging>
+ <name>Nuxeo Server Tomcat Build</name>
+ <description>Package Nuxeo Server with Tomcat</description>
+
+ <properties>
+ 
+ <tomcat.classifier>light</tomcat.classifier>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-jtajca</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.runtime</groupId>
+ <artifactId>nuxeo-runtime-datasource</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.lib.runtime</groupId>
+ <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.core</groupId>
+ <artifactId>nuxeo-core-management-jtajca</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-ws-sun-jaxws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ </dependency>
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>doc</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>root</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-resources</artifactId>
+ <type>zip</type>
+ <classifier>templates-server</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-startup-wizard</artifactId>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-distribution-server</artifactId>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.shell</groupId>
+ <artifactId>nuxeo-shell</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo</groupId>
+ <artifactId>nuxeo-ecm</artifactId>
+ <type>zip</type>
+ <classifier>tools</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.nuxeo.ecm.platform</groupId>
+ <artifactId>nuxeo-platform-seam-debug</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ 
+ <dependency>
+ <groupId>org.nuxeo.ecm.distribution</groupId>
+ <artifactId>nuxeo-marketplace-dm</artifactId>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>all</id>
+ 
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>nuxeo-server</id>
+ <properties>
+ <product.name>server</product.name>
+ </properties>
+ 
+ </profile>
+ <profile>
+ <id>sdk</id>
+ 
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.tattletale</groupId>
+ <artifactId>tattletale-maven</artifactId>
+ <configuration>
+ <source>${project.build.directory}/nuxeo-server-${project.version}-tomcat/nxserver/lib
+ </source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.nuxeo.build</groupId>
+ <artifactId>ant-assembly-maven-plugin</artifactId>
+ <configuration>
+ <buildFiles>
+ <buildFile>${basedir}/src/main/assemble/assembly.xml
+ </buildFile>
+ </buildFiles>
+ </configuration>
+ <executions>
+ <execution>
+ <id>packaging</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
new file mode 100644
index 0000000..b629b8b
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/assemble/assembly.xml
@@ -0,0 +1,248 @@
+<project name="tomcat-assembly" default="build" xmlns:nx="urn:nuxeo-build" xmlns:artifact="urn:nuxeo-artifact">
+ <taskdef resource="org/nuxeo/build/antlib.xml" uri="urn:nuxeo-build" />
+ <taskdef resource="org/nuxeo/build/artifact/antlib.xml" uri="urn:nuxeo-artifact" />
+
+ <target name="init" unless="init.done">
+ <tstamp />
+ <condition property="build.sdk">
+ <or>
+ <isset property="maven.profile.release" />
+ <isset property="maven.profile.sdk" />
+ <isset property="maven.profile.nightly" />
+ </or>
+ </condition>
+
+ <property name="outdir" value="${maven.project.build.directory}" />
+ <antcall target="expand" />
+ <property name="init.done" value="true" />
+ </target>
+
+ <target name="expand" unless="no.build">
+ <artifact:nuxeo-expand />
+ <artifact:print output="${outdir}/artifacts-tomcat.properties" mode="sdk" />
+ <artifact:print output="${outdir}/dependency-tree.log" />
+ </target>
+
+ <target name="build" depends="init" unless="no.build">
+ <echo level="info">Building Tomcat standard distributions...</echo>
+ <property name="tomcat" value="${outdir}/tomcat.tmp" />
+ <antcall target="prepare-tomcat" />
+ <artifact:attach file="pom.xml" type="pom" />
+ <antcall target="build-nuxeo-server">
+ <param name="classifier" value="nuxeo-server" />
+ </antcall>
+ <delete dir="${tomcat}" failonerror="false" />
+ </target>
+
+ <target name="prepare-tomcat">
+ <unzip dest="${outdir}">
+ <artifact:resolveFile key="org.apache.tomcat:tomcat:${tomcat.version}:zip:${tomcat.classifier}" />
+ </unzip>
+ <move todir="${tomcat}">
+ <fileset dir="${outdir}/apache-tomcat-${tomcat.version}" />
+ </move>
+ <copy tofile="${tomcat}/bin/tomcat-juli.jar">
+ <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli" />
+ </copy>
+ <copy tofile="${tomcat}/lib/tomcat-juli-adapters.jar">
+ <artifact:resolveFile key="org.apache.tomcat.extras:tomcat-extras-juli-adapters" />
+ </copy>
+
+ <unzip dest="${tomcat}">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:doc" />
+ </unzip>
+ <copy todir="${tomcat}">
+ <fileset dir="src/main/resources/common" />
+ </copy>
+ <unzip dest="${tomcat}">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:root" />
+ </unzip>
+ <unzip dest="${tomcat}/bin">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:bin" />
+ </unzip>
+
+ <unzip dest="${tomcat}/templates" overwrite="true">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-resources:${nuxeo.distribution.version}:zip:templates-server" />
+ </unzip>
+
+ <echo message="tomcat.version=${tomcat.version}" append="true" file="${tomcat}/templates/nuxeo.defaults" />
+
+ <copy tofile="${tomcat}/templates/nuxeo-wizard.war">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-startup-wizard:${nuxeo.distribution.version}:war" />
+ </copy>
+
+ <copy todir="${tomcat}/client">
+ <artifact:file key="org.nuxeo.shell:nuxeo-shell" />
+ </copy>
+ </target>
+
+ <target name="copy-packages-xml">
+ 
+ <copy file="src/main/resources/packages.xml" tofile="${tomcat}/setupWizardDownloads/packages.xml">
+ </copy>
+ </target>
+
+ <target name="sample-installAfterRestart-files">
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-SC.log">init
+install nuxeo-sc
+ </echo>
+ <echo file="${tomcat}/nxserver/data/installAfterRestart-DAM.log">init
+install nuxeo-dam</echo>
+ </target>
+
+ <target name="build-nuxeo-server"
+ depends="sample-installAfterRestart-files,copy-packages-xml"
+ description="Build Tomcat distribution with Nuxeo Server">
+ <echo level="info">Building Nuxeo Server...</echo>
+ <property name="distribution.dir" value="${outdir}/${classifier}-${maven.project.version}-tomcat" />
+ <delete failonerror="false" dir="${distribution.dir}" />
+ <copy todir="${distribution.dir}">
+ <fileset dir="${tomcat}" />
+ </copy>
+ <antcall target="chmodx" />
+
+ 
+ <unzip dest="${distribution.dir}/nxserver">
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-server:${nuxeo.distribution.version}:zip" />
+ </unzip>
+
+ <antcall target="set-distribution-properties">
+ <param name="org.nuxeo.distribution.name" value="server" />
+ </antcall>
+
+ <echo file="${distribution.dir}/setupWizardDownloads/packages-default-selection.properties"
+ message="preset=nuxeo-server-preset" />
+
+ <antcall target="reorganize-libs" />
+ <antcall target="build-server" />
+ <antcall target="build-sdk" />
+ </target>
+
+ <target name="build-server">
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
+ basedir="${outdir}"
+ includes="${classifier}-${maven.project.version}-tomcat/**" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}.zip"
+ classifier="${classifier}"
+ type="zip" />
+ </target>
+
+ <target name="reorganize-libs">
+ 
+ <copy todir="${distribution.dir}/nxserver/bundles" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="org.nuxeo*" />
+ </includes>
+ <excludes>
+ <artifact groupId="org.nuxeo.lib*" />
+ </excludes>
+ </artifact:set>
+ </copy>
+ <copy todir="${distribution.dir}/nxserver/lib" overwrite="true">
+ <artifact:set>
+ <includes>
+ <artifact groupId="!org.nuxeo*" scope="!test" />
+ <artifact groupId="org.nuxeo.lib*" scope="!test" />
+ </includes>
+ </artifact:set>
+ </copy>
+ 
+ <delete>
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ 
+ 
+ 
+ <include name="jetty-naming*" />
+ <include name="el-api*" />
+ <include name="jsp-*" />
+ <include name="juel-api-*" />
+ <include name="tomcat-dbcp-*" />
+ </fileset>
+ 
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="commons-logging*" />
+ </fileset>
+ </delete>
+ 
+ <move todir="${distribution.dir}/lib">
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="nuxeo-runtime-*" />
+ <include name="commons-lang-*" />
+ <include name="commons-lang3-*" />
+ <include name="freemarker-*" />
+ <include name="mail-*" />
+ <include name="xercesImpl-*" />
+ <include name="xml-apis-*" />
+ 
+ <include name="slf4j*" />
+ <include name="jcl-over-slf4j*" />
+ <include name="log4j-*" />
+ </fileset>
+ </move>
+ <nx:rmdups dir="${distribution.dir}/nxserver/lib" />
+ <nx:rmdups dir="${distribution.dir}/lib" />
+
+ 
+ <move todir="${distribution.dir}/endorsed">
+ <fileset dir="${distribution.dir}/nxserver/lib">
+ <include name="jaxb-api-*" />
+ <include name="jaxws-api-*" />
+ </fileset>
+ </move>
+ </target>
+
+ <target name="set-distribution-properties">
+ <property name="distribution.properties.file"
+ value="${distribution.dir}/templates/common/config/distribution.properties" />
+ <echo append="false" file="${distribution.properties.file}">## DO NOT MANUALLY EDIT THIS FILE
+org.nuxeo.distribution.name=${org.nuxeo.distribution.name}
+org.nuxeo.distribution.server=tomcat
+org.nuxeo.distribution.version=${maven.project.version}
+org.nuxeo.distribution.date=${DSTAMP}${TSTAMP}
+org.nuxeo.distribution.package=zip</echo>
+ </target>
+
+ <target name="build-sdk" if="build.sdk">
+ <copy file="${distribution.dir}/templates/common/config/distribution.properties" todir="${distribution.dir}/sdk" />
+ <copy file="${outdir}/artifacts-tomcat.properties" todir="${distribution.dir}/sdk" />
+ <move todir="${distribution.dir}/sdk">
+ <fileset dir="${distribution.dir}/nxserver/">
+ <filename name="*artifacts-*.properties" />
+ </fileset>
+ </move>
+ <artifact:printMgt output="${distribution.dir}/sdk/artifacts-nuxeo.properties"
+ key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
+ scopes="compile,provided,runtime" />
+ <artifact:printMgt output="${distribution.dir}/sdk/test-artifacts-nuxeo.properties"
+ key="org.nuxeo:nuxeo-addons-parent:${nuxeo.addons.version}:pom"
+ scopes="test,provided" />
+
+ <copy todir="${distribution.dir}/sdk/sources">
+ <artifact:resolveFiles source="${distribution.dir}/sdk/artifacts*.properties" classifier="sources" />
+ <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" classifier="sources" />
+ </copy>
+ <copy todir="${distribution.dir}/sdk/tests">
+ <artifact:resolveFiles source="${distribution.dir}/sdk/test-artifacts*.properties" />
+ </copy>
+
+ <unzip dest="${distribution.dir}/sdk/tools">
+ <artifact:file key="org.nuxeo:nuxeo-ecm::zip:tools" />
+ </unzip>
+
+ <copy todir="${distribution.dir}/nxserver/bundles">
+ <artifact:file key="org.nuxeo.ecm.platform:nuxeo-platform-seam-debug" />
+ </copy>
+
+ <zip destfile="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
+ basedir="${outdir}"
+ includes="${classifier}-${maven.project.version}-tomcat/**" />
+ <artifact:attach file="${outdir}/${maven.project.artifactId}-${maven.project.version}-${classifier}-sdk.zip"
+ classifier="${classifier}-sdk"
+ type="zip" />
+ </target>
+
+ <target name="chmodx">
+ <chmod dir="${distribution.dir}" perm="ug+x" includes="*.command,bin/*.sh,bin/*ctl,bin/*.command" />
+ </target>
+</project>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
new file mode 100755
index 0000000..1cbea53
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/bin/nxdeploy.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+java -DupdateWar=y -jar ../lib/nuxeo-runtime-tomcat-adapter-5.4.3-SNAPSHOT.jar
+
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
new file mode 100644
index 0000000..3158810
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/lib/log4j.xml
@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+ debug="false" threshold="null">
+
+ 
+ 
+ 
+
+ 
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/server.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%t] [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+
+ 
+ 
+ 
+
+ <appender name="ERROR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/nuxeo-error.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ 
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
+ 
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <appender name="STDERR-FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/stderr.log" />
+ <param name="Append" value="true" />
+ 
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+ </layout>
+ <filter class="org.apache.log4j.varia.LevelRangeFilter">
+ <param name="levelMin" value="INFO" />
+ </filter>
+ </appender>
+
+ 
+ 
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ <appender name="CLASSLOADER" class="org.apache.log4j.RollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler" />
+ <param name="File" value="${nuxeo.log.dir}/classloader.log" />
+ <param name="Append" value="false" />
+ <param name="MaxFileSize" value="500KB" />
+ <param name="MaxBackupIndex" value="1" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ <appender name="TOMCAT" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${nuxeo.log.dir}/tomcat.log" />
+ <param name="Append" value="false" />
+ <param name="MaxFileSize" value="500KB" />
+ <param name="MaxBackupIndex" value="1" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
+ </layout>
+ </appender>
+
+ 
+ 
+ 
+
+ <category name="org.apache.catalina.loader" additivity="false">
+ <appender-ref ref="CLASSLOADER"/>
+ </category>
+
+ <category name="org.apache.catalina.core.AprLifecycleListener" additivity="false">
+ <priority value="INFO" />
+ <appender-ref ref="TOMCAT"/>
+ </category>
+
+ <category name="org.jboss.seam">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.ejb3">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.seam.contexts.Contexts">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.seam.contexts.Lifecycle">
+ <priority value="WARN" />
+ </category>
+ <category name="org.jboss.mx.loading">
+ <priority value="INFO" />
+ </category>
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.jboss.management" additivity="true">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.jboss.serial" additivity="true">
+ <priority value="INFO" />
+ </category>
+
+ 
+ <category name="org.apache" additivity="true">
+ <priority value="INFO" />
+ </category>
+ <category name="org.apache.cxf">
+ <priority value="WARN" />
+ </category>
+ <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.ajax4jsf">
+ <priority value="INFO" />
+ </category>
+ <category name="org.ajax4jsf.cache.LRUMapCacheFactory">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="WARN" />
+ </category>
+ <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.impl.SessionFactoryObjectFactory">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.cache.EhCacheProvider">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.hql.ast.tree.FromElementType">
+ <priority value="ERROR" />
+ </category>
+ <category name="org.hibernate.ejb.Ejb3Configuration">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.jbpm">
+ <priority value="INFO" />
+ </category>
+ <category name="org.jbpm.jpdl.xml.JpdlXmlReader">
+ <priority value="ERROR" />
+ </category>
+
+
+ <category name="org.nuxeo">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.ElasticSearchComponent">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.audit.ESAuditBackend">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.elasticsearch.audit.ESAuditMigrationWork">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.nuxeo.ecm.platform.query.core.PageProviderClassReplacerRegistry">
+ <priority value="INFO" />
+ </category>
+
+ 
+ 
+ 
+ 
+
+ 
+ 
+ <category name="org.nuxeo.runtime.reload">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService">
+ <priority value="INFO" />
+ </category>
+ 
+ 
+ <category name="org.nuxeo.osgi.application.loader.FrameworkLoader">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.osgi.application.StandaloneApplication">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.osgi.application.FrameworkBootstrap">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.jboss.deployment.NuxeoDeployer">
+ <priority value="INFO" />
+ </category>
+ <category name="org.nuxeo.runtime.tomcat.NuxeoDeployer">
+ <priority value="INFO" />
+ </category>
+ 
+ 
+ <category name="org.nuxeo.ecm.automation.core">
+ <priority value="INFO" />
+ </category>
+ 
+ <category name="org.nuxeo.ecm.automation.scripting">
+ <priority value="WARN" />
+ </category>
+
+ <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
+ <priority value="INFO" />
+ </category>
+ <category name="javax.enterprise.resource.webcontainer.jsf.application">
+ <priority value="INFO" />
+ </category>
+ <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
+ <priority value="INFO" />
+ </category>
+
+ 
+ <category name="jacorb" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="org.jgroups" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="org.quartz" additivity="true">
+ <priority value="WARN" />
+ </category>
+
+ 
+ <category name="com.sun.jersey.spi.container.servlet.WebComponent">
+ <priority value="ERROR" />
+ </category>
+
+ <category name="org.apache.shindig.common.xml.XmlUtil">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.apache.myfaces.shared_tomahawk">
+ <priority value="WARN" />
+ </category>
+
+ <category name="org.artofsolving.jodconverter">
+ <priority value="WARN" />
+ </category>
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+ 
+ <category name="nuxeo-error-log">
+ <priority value="TRACE" />
+ <appender-ref ref="ERROR-FILE" />
+ </category>
+
+ 
+ <category name="STDERR" additivity="false">
+ <priority value="ERROR" />
+ <appender-ref ref="STDERR-FILE" />
+ </category>
+
+ 
+ 
+ 
+
+ <root>
+ <level value="WARN" />
+ <appender-ref ref="CONSOLE" />
+ <appender-ref ref="FILE" />
+ </root>
+
+</log4j:configuration>
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
new file mode 100644
index 0000000..e6f2662
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/common/nxserver/system.properties
@@ -0,0 +1,2 @@
+derby.system.home=${nuxeo.data.dir}/derby
+org.nuxeo.launcher.libdirs=lib
diff --git a/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
new file mode 100644
index 0000000..5ab8386
--- /dev/null
+++ b/nuxeo-distribution/nuxeo-distribution-tomcat-server/src/main/resources/packages.xml
@@ -0,0 +1,41 @@
+<packages>
+ <packageDefinitions baseUrl="http://cdn.nuxeo.com/nuxeo-8.3-SNAPSHOT/mp/">
+ <package id="nuxeo-server" label="Server" color="#635959" textcolor="#FFF"
+ shortlabel="CORE" virtual="true" desc="Content Application Platform" />
+ <package id="nuxeo-dam" label="Digital Asset Management (DAM)" color="#ffeb6d" textcolor="#333" shortlabel="DAM"
+ desc="Digital Asset Management" />
+ <package id="nuxeo-drive" label="Drive" color="#5AC456" textcolor="#FFF" shortlabel="DRIVE" desc="Drive" />
+ <package id="nuxeo-diff" label="Nuxeo Diff (DIFF)" color="#5e9adf" textcolor="#FFF" shortlabel="DIFF"
+ desc="Nuxeo Diff" />
+ <package id="nuxeo-showcase-content" label="Showcase Content (DOCS)" color="#DB97FF" textcolor="#FFF"
+ shortlabel="DOCS" desc="Showcase Content Sample" />
+ <package id="nuxeo-spreadsheet" label="Spreadsheet (GRID)" color="#ff736e" textcolor="#FFF" shortlabel="GRID"
+ desc="Spreadsheet" />
+ <package id="nuxeo-web-mobile" label="Mobile (MOB)" color="#faac05" textcolor="#FFF" shortlabel="MOB"
+ desc="Mobile" />
+ <package id="nuxeo-template-rendering-samples" label="Template Rendering (TMPL)" color="#c3c7c9" textcolor="#FFF"
+ shortlabel="TMPL" desc="Template Rendering" />
+ <package id="nuxeo-liveconnect" label="Live Connect (LIVE)" color="#ff452a" textcolor="#FFF" shortlabel="LIVE"
+ desc="Live Connect for Cloud Services" />
+ <package id="nuxeo-review-workflows-dashboards" label="Review Workflows Dashboards (RWD)" color="#213F7D"
+ textcolor="#FFF" shortlabel="RWD" desc="Data Visualization Dashboards for Review Workflows" />
+ </packageDefinitions>
+ <install>
+ <packageOptions>
+ <package ref="nuxeo-server" exclusive="false">
+ <package ref="nuxeo-dam" exclusive="false" />
+ <package ref="nuxeo-drive" exclusive="false" />
+ <package ref="nuxeo-diff" exclusive="false" />
+ <package ref="nuxeo-showcase-content" exclusive="false" />
+ <package ref="nuxeo-spreadsheet" exclusive="false" />
+ <package ref="nuxeo-web-mobile" exclusive="false" />
+ <package ref="nuxeo-template-rendering-samples" exclusive="false" />
+ <package ref="nuxeo-liveconnect" exclusive="false" />
+ <package ref="nuxeo-review-workflows-dashboards" exclusive="false" />
+ </package>
+ </packageOptions>
+ </install>
+ <presets>
+ <preset id="nuxeo-server-preset" label="Nuxeo Server Preset">nuxeo-server,nuxeo-dam,nuxeo-drive,nuxeo-web-mobile,nuxeo-showcase-content,nuxeo-template-rendering-samples</preset>
+ </presets>
+</packages>
diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml b/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
index 45939e5..5c7c3be 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/pom.xml
@@ -16,7 +16,7 @@

<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
index a13f0cf..a6b28dc 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/assemble/assembly.xml
@@ -18,22 +18,22 @@
</filterset>
</copy>

- 
+ 
<copy todir="${outdir}">
- <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-coreserver::zip" />
+ <artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-server::zip" />
<artifact:file key="org.nuxeo.ecm.distribution:nuxeo-distribution-cap::zip" />
</copy>


<nx:zipdiff file1="${outdir}/nuxeo-distribution-cap-${maven.project.version}.zip"
- file2="${outdir}/nuxeo-distribution-coreserver-${maven.project.version}.zip"
+ file2="${outdir}/nuxeo-distribution-server-${maven.project.version}.zip"
includesfile="${outdir}/includes"
excludesfile="${outdir}/excludesfile"
- patternsetid="cap.versus.coreserver"
+ patternsetid="cap.versus.server"
ignoreContentPattern=".*\.jar$">
</nx:zipdiff>
<unzip src="${outdir}/nuxeo-distribution-cap-${maven.project.version}.zip" dest="${marketplace}/install">
- <patternset refid="cap.versus.coreserver" />
+ <patternset refid="cap.versus.server" />
</unzip>


diff --git a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
index 177b485..7472e25 100644
--- a/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
+++ b/nuxeo-distribution/nuxeo-marketplace-cap/src/main/resources/package.xml
@@ -1,7 +1,7 @@
<package type="addon" name="nuxeo-cap" version="@VERSION@">
<title>Nuxeo CAP</title>
<description>
- <p>This package adds the JSF UI to Nuxeo CoreServer.</p>
+ <p>This package adds the JSF UI to Nuxeo Server.</p>
</description>
<home-page>http://doc.nuxeo.com/</home-page>
<vendor>Nuxeo</vendor>
@@ -13,8 +13,8 @@
<production-state>production_ready</production-state>
<supported>true</supported>
<platforms>
- <platform>coreserver-@VERSION@</platform>
- <platform>coreserver-@VERSION@-HF*</platform>
+ <platform>server-@VERSION@</platform>
+ <platform>server-@VERSION@-HF*</platform>
</platforms>
<license>Apache 2.0</license>
<license-url>http://www.apache.org/licenses/LICENSE-2.0</license-url>
diff --git a/nuxeo-distribution/pom.xml b/nuxeo-distribution/pom.xml
index 06f985a..0ba0988 100644
--- a/nuxeo-distribution/pom.xml
+++ b/nuxeo-distribution/pom.xml
@@ -28,10 +28,10 @@
<module>nuxeo-launcher</module>
<module>nuxeo-distribution-resources</module>
<module>nuxeo-distribution-tests</module>
- <module>nuxeo-distribution-coreserver</module>
+ <module>nuxeo-distribution-server</module>
<module>nuxeo-distribution-cap</module>
<module>nuxeo-marketplace-dm</module>
- <module>nuxeo-distribution-tomcat-coreserver</module>
+ <module>nuxeo-distribution-tomcat-server</module>
<module>nuxeo-distribution-tomcat</module>

<module>nuxeo-distribution-tomcat-wizard-tests</module>
@@ -134,13 +134,13 @@
<dependencies>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>pom</type>
</dependency>
@@ -164,13 +164,13 @@
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>
- <artifactId>nuxeo-distribution-tomcat-coreserver</artifactId>
+ <artifactId>nuxeo-distribution-tomcat-server</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
<classifier>sdk</classifier>
@@ -222,7 +222,7 @@
<artifactId>nuxeo-distribution-resources</artifactId>
<version>${nuxeo.distribution.version}</version>
<type>zip</type>
- <classifier>templates-coreserver</classifier>
+ <classifier>templates-server</classifier>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.distribution</groupId>