From af9af824ce6595bc461d56e5b464ddfc902922ae Mon Sep 17 00:00:00 2001
From: Dirk Stenger <stenger@lat-lon.de>
Date: Tue, 5 Jul 2022 20:24:46 +0200
Subject: [PATCH] #498 - Move xercesImpl from WEB-INF/lib to tomcat/lib

---
 src/site/markdown/installation.md           | 2 +-
 teamengine-web/pom.xml                      | 1 +
 teamengine-web/src/assembly/common-libs.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/site/markdown/installation.md b/src/site/markdown/installation.md
index 9e1092566..372ee028b 100644
--- a/src/site/markdown/installation.md
+++ b/src/site/markdown/installation.md
@@ -126,7 +126,7 @@ The recommended JVM options for the Tomcat instance are shown below.
 Note that the maximum memory heap size (`-Xmx`) may need to be increased
 as the number of concurrent users increases.
 
-`CATALINA_OPTS="-server -Xmx1024m -XX:MaxPermSize=128m -DTE_BASE=$TE_BASE -Dderby.system.home=$DERBY_DATA -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"`
+`CATALINA_OPTS="-server -Xmx1024m -XX:MaxPermSize=128m -DTE_BASE=$TE_BASE -Dderby.system.home=$DERBY_DATA"`
 
 Unpack the contents of the teamengine-common-libs archive into the
 CATALINA_BASE/lib directory. Deploy the `teamengine.war` component by
diff --git a/teamengine-web/pom.xml b/teamengine-web/pom.xml
index e3eebc75c..0cdf1003e 100644
--- a/teamengine-web/pom.xml
+++ b/teamengine-web/pom.xml
@@ -149,6 +149,7 @@
             WEB-INF/lib/jsr311-api-*.jar,
             WEB-INF/lib/asm-*.jar,
             WEB-INF/lib/derby-*.jar,
+            WEB-INF/lib/xercesImpl-*.jar,
           </packagingExcludes>
           <archive>
             <manifest>
diff --git a/teamengine-web/src/assembly/common-libs.xml b/teamengine-web/src/assembly/common-libs.xml
index 58b660b6e..4b51f41dc 100644
--- a/teamengine-web/src/assembly/common-libs.xml
+++ b/teamengine-web/src/assembly/common-libs.xml
@@ -15,6 +15,7 @@
         <include>com.sun.jersey:jersey-*</include>
         <include>org.apache.derby:derby</include>
         <include>org.opengis.cite.teamengine:teamengine-realm</include>
+        <include>xerces:xercesImpl</include>
       </includes>
       <scope>runtime</scope>
       <useProjectArtifact>false</useProjectArtifact>