From fbd81a9403617ac28c6b7877f1981c5fc97b6b9a7f073f2ec183f914ea0e7739 Mon Sep 17 00:00:00 2001
From: Matei Albu <malbu@suse.com>
Date: Tue, 12 Jul 2016 13:47:50 +0000
Subject: [PATCH] Accepting request 407906 from
 home:mateialbu:branches:Java:packages

OBS-URL: https://build.opensuse.org/request/show/407906
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=95
---
 tomcat.changes | 2 ++
 tomcat.spec    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tomcat.changes b/tomcat.changes
index 152e390..eb8fce4 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -6,6 +6,8 @@ Wed Jul  6 12:20:03 UTC 2016 - malbu@suse.com
     http://tomcat.apache.org/tomcat-8.0-doc/changelog.html#Tomcat_8.0.36_(markt)
 - CVE fixed by the version update:
   - CVE-2016-3092 (bnc#986359)
+- Fixed a deployment error in the examples webapp by changing the context.xml format to the new one
+  introduced by Tomcat 8. See http://tomcat.apache.org/migration-8.html#Web_application_resources
 
 -------------------------------------------------------------------
 Mon May  2 16:05:26 UTC 2016 - dmacvicar@suse.de
diff --git a/tomcat.spec b/tomcat.spec
index 7ced774..e58f3a1 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -484,7 +484,9 @@ popd
 mkdir -p %{buildroot}%{appdir}/examples/META-INF
 pushd %{buildroot}%{appdir}/examples/META-INF
 echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
-echo '<Context allowLinking="true"/>'>>context.xml
+echo '<Context>'>>context.xml
+echo '  <Resources allowLinking="true" />'>>context.xml
+echo '</Context>'>>context.xml                         
 popd
 
 pushd %{buildroot}%{appdir}/examples/WEB-INF/lib