From f5b0494e3cdcda7bcfb25a4dd25f30b56a6ef129 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Fri, 20 Nov 2015 21:21:11 +0000
Subject: [PATCH] Maven (second draft)

---
 legacy/solr/template.context.xml |  9 ---------
 solr/pom.xml                     |  2 ++
 webapp/pom.xml                   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 legacy/solr/template.context.xml

diff --git a/legacy/solr/template.context.xml b/legacy/solr/template.context.xml
deleted file mode 100644
index 8244079c8..000000000
--- a/legacy/solr/template.context.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Context crossContext="true" override="true">
-   <Environment
-        type="java.lang.String" 
-        name="solr/home"  
-        value="${solr.home.dir}" override="true"/>
-
-   <!-- Disable persist sessions on shut down.-->
-   <Manager pathname="" />
-</Context>
diff --git a/solr/pom.xml b/solr/pom.xml
index d545171cb..0533f043a 100644
--- a/solr/pom.xml
+++ b/solr/pom.xml
@@ -19,6 +19,8 @@
 
     <name>Vitro Solr App</name>
 
+
+
     <dependencies>
         <dependency>
             <groupId>org.apache.solr</groupId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a76e94326..beea6bbe3 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -19,6 +19,19 @@
 
     <name>Vitro Web App</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <archiveClasses>false</archiveClasses>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.vivoweb</groupId>