Changeset 30035 for gs3-extensions

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.

Location:

gs3-extensions/solr/trunk/src

Files:

• build.xml (modified) (1 diff)
• solr-tomcat-context.xml.in (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-->