Changeset 27860 for main/trunk/greenstone3/build.xml

Timestamp:

2013-07-15T20:30:45+12:00 (11 years ago)

Author:

davidb

Message:

Code to regenerate web/ext/solr.xml as needed

File:

• main/trunk/greenstone3/build.xml (modified) (6 diffs)

main/trunk/greenstone3/build.xml

@@ -94 +94 @@
   <property name="src.packages.home" value="${basedir}/src/packages"/>
   <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/>
+
+  <property name="solr-ext.home" value="${basedir}/ext/solr"/>
 
   <property file="build.properties"/>
@@ -171 +173 @@
       <mkdir dir="${gsdl3.writablehome}/packages"/> 
       <mkdir dir="${gsdl3.writablehome}/logs"/>
+      <mkdir dir="${gsdl3.writablehome}/ext/solr"/>
 
       <chmod perm="a+rwx" dir="${gsdl3.writablehome}"/>
       <chmod perm="a+rwx" dir="${gsdl3.writablehome}/packages"/>
       <chmod perm="a+rwx" dir="${gsdl3.writablehome}/logs"/> 
+      <chmod perm="a+rwx" dir="${gsdl3.writablehome}/ext/solr"/> 
 
       <!-- copy over packages tomcat folder -->
@@ -778 +782 @@
   </target> 
   
-  <target name="start" depends="init,configure-tomcat,configure-web,start-tomcat"
+  <target name="start" depends="init,configure-tomcat,configure-web,configure-solr-ext,start-tomcat"
     description="Startup the Tomcat server." >
     <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 
@@ -1064 +1068 @@
   
   <target name="prepare-solr-ext" depends="init" >
-    <property name="solr-ext.home" value="${basedir}/ext/solr"/>
     <exec executable="ant.bat" os="${os.windows}" dir="${solr-ext.home}" spawn="false">
       <arg value="add-service"/>
@@ -1289 +1292 @@
     </copy>
     
-    <!-- set up the greenstone3 web.xml file -->
-    <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true">
-        <filterset>
-            <filter token="perlpath" value="${perl.path}"/>
-        </filterset>
-    </copy>
+    <!-- set up the greenstone3 web.xml file -->
+    <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true">
+      <filterset>
+    <filter token="perlpath" value="${perl.path}"/>
+      </filterset>
+    </copy>
   </target>
 
@@ -1302 +1305 @@
   </target>
 
+
+  <target name="configure-solr-ext" depends="init" >
+    <!-- re-setup the web/ext/solr/solr.xml file -->
+    <copy file="${solr-ext.home}/solr.xml.in"
+      tofile="${gsdl3.writablehome}/solr/ext/solr.xml" overwrite="true">
+      <filterset>
+        <filter token="gsdl3.home" value="${src.gsdl3.home.unix}"/>
+        <filter token="gsdl3.writablehome" value="${src.gsdl3.writablehome.unix}"/>
+      </filterset>
+    </copy>
+  </target>
  
   <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start"