From bad54952b8267113169b31fa9f94f01519c5c4aa Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 20 Aug 2013 16:16:35 +0200
Subject: [PATCH] Refactor to new solr war name

---
 debian/rules                        |    2 +-
 etc/solr4-devl.xml                  |    2 +-
 etc/solr4-tomcat-context-master.xml |    2 +-
 etc/solr4-tomcat-context-slave.xml  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 86f0ca1..4c7d85d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ install-stamp: build
 
 	# lui-solr-common. Install a Solr WAR.
 	mkdir -p $(LUI_SOLR_COMMON_DIR)
-	cp dist/apache-solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
 	cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master
diff --git a/etc/solr4-devl.xml b/etc/solr4-devl.xml
index 69e678d..d546a3d 100644
--- a/etc/solr4-devl.xml
+++ b/etc/solr4-devl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/home/dennis/proj/lui-solr4/dist/apache-solr-4.4.0.war" 
+    docBase="/home/dennis/proj/lui-solr4/dist/solr-4.4.0.war" 
 >
   <Environment name="solr/home" type="java.lang.String" value="/home/dennis/proj/lui-solr4" override="true"/>
 </Context>
diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
index 3dc86c6..c2b52f3 100644
--- a/etc/solr4-tomcat-context-master.xml
+++ b/etc/solr4-tomcat-context-master.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.4.0.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/master" override="true"/>
diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
index ba25984..de2b171 100644
--- a/etc/solr4-tomcat-context-slave.xml
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/apache-solr-4.4.0.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4-slave"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/slave" override="true"/>
-- 
1.7.10.4