From 81c48b9fddee99dfef928f72e65b627aba69fe21 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 1 Apr 2011 18:55:46 +0000
Subject: [PATCH] changes to solr build.xml

---
 solr/build.xml              | 11 ++++++-----
 solr/exampleSolrContext.xml | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/solr/build.xml b/solr/build.xml
index fb698b136..2bbd9be4a 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -13,8 +13,6 @@
 	<property name="solr.example.dir" location="${solr.build.dir}/exampleSolr" />
 	<property name="solr.context.config.example" location="${solr.build.dir}/exampleSolrContext.xml"/>
     <property name="solr.war" location="${solr.build.dir}/apache-solr-1.4.1.war"/>
-	
-	<property name="deploy.properties.file" location="???"/>
 
 	<!-- ================================= 
       target: describe              
@@ -56,7 +54,7 @@ deploy   - Deploy solr service for use by vitro.
 		</copy>
 		
 		<!-- Place context configuration XML in tomcat config directory. -->
-		<copy tofile="${tomcat.home}/conf/Catalina/localhost">
+		<copy todir="${tomcat.home}/conf/Catalina/localhost">
 		  <fileset file="${solr.context.config}"/>
 		</copy>
 		
@@ -67,8 +65,11 @@ deploy   - Deploy solr service for use by vitro.
           target: properties                      
          - - - - - - - - - - - - - - - - - -->
 	<target name="properties">
-		<property name="deploy.properties.file" location="deploy.properties" />
-		<fail message="You must create a &quot;${deploy.properties.file}&quot; file.">
+		<!--<property name="deploy.properties.file" location="deploy.properties" /> -->
+	    <fail unless="deploy.properties.file"
+              message="The ant property deploy.properties.file must be defined to indicate the vitro deploy to create a solr service for." />
+	    
+		<fail message="There is no accessable deploy.properties file at &quot;${deploy.properties.file}&quot;.">
 			<condition>
 				<not>
 					<available file="${deploy.properties.file}" />
diff --git a/solr/exampleSolrContext.xml b/solr/exampleSolrContext.xml
index 93e5cdf2a..2ccdf112d 100644
--- a/solr/exampleSolrContext.xml
+++ b/solr/exampleSolrContext.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <Context docBase="${solr.docbase}" 
-   debug="0" crossContext="true">
+    crossContext="true" override="true">
 
-   <Environment 
-        name="solr/home" 
+   <Environment
         type="java.lang.String" 
+        name="solr/home"  
         value="${solr.home}" override="true"/>
 
+   <!-- Disable persist sessions on shut down.-->
+   <Manager pathname="" />
 </Context>