Changeset 30035

Timestamp:

2015-07-16T20:46:39+12:00 (9 years ago)

Author:

ak19

Message:

Solr servlet and commands to its URL need to work in binary, for which the solr.xml tomcat context file needs to be regenerated with the correct values.

Files:

• gs3-extensions/solr/trunk/src/build.xml (modified) (1 diff)
• gs3-extensions/solr/trunk/src/solr-tomcat-context.xml.in (modified) (1 diff)
• main/trunk/greenstone3/build.xml (modified) (1 diff)

gs3-extensions/solr/trunk/src/build.xml

@@ -223 +223 @@
       <path path="${tomcat.dir}"/><!-- creates an absolute path-->
     </pathconvert>
-    <filter token="gsdl3home" value="${gsdl3.web.home}"/>
+    <filter token="gsdl3webhome" value="${gsdl3.web.home}"/>
     <filter token="tomcathome" value="${tomcat.home}"/>
     <copy file="solr-tomcat-context.xml.in" tofile="${tomcat.context.dir}/solr.xml" filtering="true" overwrite="true"/>

gs3-extensions/solr/trunk/src/solr-tomcat-context.xml.in

@@ -3 +3 @@
      crossContext="true" 
      privileged="true">
-  <Environment name="solr/home" type="java.lang.String" value="@gsdl3home@/ext/solr" override="true" />
+  <Environment name="solr/home" type="java.lang.String" value="@gsdl3webhome@/ext/solr" override="true" />
   
   <!--Access log. Already created in packages\tomcat\logs localhost_access_log.YYYY-MM-DD.txt-->

main/trunk/greenstone3/build.xml

@@ -1426 +1426 @@
       </filterset>
     </copy>
+
+    <!-- set up the solr context -->
+    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
+      <filterset>
+        <filter token="gsdl3webhome" value="${web.writablehome}"/>
+    <filter token="tomcathome" value="${basedir}/packages/tomcat"/>
+      </filterset>
+    </copy>
+
     <!-- set up the greenstone3 context, it may have a custom name specified in build.properties -->
     <if><bool><not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not></bool>