From 02a6347396fdf3e7965c201b37b8454254de6893 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Fri, 7 Nov 2014 22:55:05 +0000
Subject: [PATCH] Updates for Tomcat 8 on Elastic Beanstalk

---
 zxingorg/pom.xml                                              | 2 +-
 zxingorg/src/web/.ebextensions/05-update-tomcat-server.config | 2 +-
 zxingorg/src/web/.ebextensions/server.xml                     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index 6f3cf94dc..2ec346668 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-web-api</artifactId>
-      <version>6.0</version>
+      <version>7.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/zxingorg/src/web/.ebextensions/05-update-tomcat-server.config b/zxingorg/src/web/.ebextensions/05-update-tomcat-server.config
index f08fa35fd..84ddd84de 100644
--- a/zxingorg/src/web/.ebextensions/05-update-tomcat-server.config
+++ b/zxingorg/src/web/.ebextensions/05-update-tomcat-server.config
@@ -1,3 +1,3 @@
 container_commands:
   replace-config:
-    command: cp .ebextensions/server.xml /etc/tomcat7/server.xml
\ No newline at end of file
+    command: cp .ebextensions/server.xml /etc/tomcat8/server.xml
\ No newline at end of file
diff --git a/zxingorg/src/web/.ebextensions/server.xml b/zxingorg/src/web/.ebextensions/server.xml
index 86e555881..f4b8ecded 100644
--- a/zxingorg/src/web/.ebextensions/server.xml
+++ b/zxingorg/src/web/.ebextensions/server.xml
@@ -18,8 +18,6 @@
 <Server port="8005" shutdown="SHUTDOWN">
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
-  <Listener className="org.apache.catalina.core.JasperListener" />
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />