From 5a03e842be0a132bfa36cd3a8dd02dac6b7735d5 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 14 Jul 2011 15:14:41 +0000
Subject: [PATCH] NIHVIVO-2757 Unpack the Solr WAR file directly into Tomcat.
 Not the optimum solution.

---
 solr/exampleSolrContext.xml | 3 +--
 webapp/build.xml            | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/exampleSolrContext.xml b/solr/exampleSolrContext.xml
index 54550bb0d..cf34e76f9 100644
--- a/solr/exampleSolrContext.xml
+++ b/solr/exampleSolrContext.xml
@@ -1,5 +1,4 @@
-<Context docBase="${solr.docbase}" 
-    crossContext="true" override="true">
+<Context crossContext="true" override="true">
 
    <!-- For security, restrict access to clients on this machine
         for IPv4 requests, localhost is 127.0.0.1
diff --git a/webapp/build.xml b/webapp/build.xml
index 50f68dbab..471198351 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -342,6 +342,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
           target: deploySolr                      
          - - - - - - - - - - - - - - - - - -->
 	<target name="deploySolr" depends="prepareSolr" unless="noSolrDeploy">
+		<unwar src="${solr.docbase}" dest="${tomcat.home}/webapps/${solr.context.name}" />
 		<copy todir="${tomcat.home}/conf/Catalina/localhost" overwrite="true" >
 			<fileset file="${solr.context.config}" />
 		</copy>