From 44d8c2efe3d04a64f25d459cf5b8b661155cfda9 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 29 May 2018 12:12:56 +0300
Subject: [PATCH] REPO-3551: add suport for Tomcat8 as default configuration.

---
 .../web-server/conf-Tomcat7/Catalina/localhost/alfresco.xml   | 4 ----
 .../{conf-Tomcat8 => conf}/Catalina/localhost/alfresco.xml    | 0
 2 files changed, 4 deletions(-)
 delete mode 100644 distribution/src/main/resources/web-server/conf-Tomcat7/Catalina/localhost/alfresco.xml
 rename distribution/src/main/resources/web-server/{conf-Tomcat8 => conf}/Catalina/localhost/alfresco.xml (100%)

diff --git a/distribution/src/main/resources/web-server/conf-Tomcat7/Catalina/localhost/alfresco.xml b/distribution/src/main/resources/web-server/conf-Tomcat7/Catalina/localhost/alfresco.xml
deleted file mode 100644
index 5eb5d51d30..0000000000
--- a/distribution/src/main/resources/web-server/conf-Tomcat7/Catalina/localhost/alfresco.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Context crossContext="true">
-  <Loader className="org.apache.catalina.loader.VirtualWebappLoader" virtualClasspath="${catalina.base}/../modules/platform/*.jar" /> 
-</Context>
diff --git a/distribution/src/main/resources/web-server/conf-Tomcat8/Catalina/localhost/alfresco.xml b/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
similarity index 100%
rename from distribution/src/main/resources/web-server/conf-Tomcat8/Catalina/localhost/alfresco.xml
rename to distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml