Changeset 30035

Show
Ignore:
Timestamp:
16.07.2015 20:46:39 (4 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:
3 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/build.xml

    r30000 r30035  
    223223      <path path="${tomcat.dir}"/><!-- creates an absolute path--> 
    224224    </pathconvert> 
    225     <filter token="gsdl3home" value="${gsdl3.web.home}"/> 
     225    <filter token="gsdl3webhome" value="${gsdl3.web.home}"/> 
    226226    <filter token="tomcathome" value="${tomcat.home}"/> 
    227227    <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

    r29842 r30035  
    33     crossContext="true"  
    44     privileged="true"> 
    5   <Environment name="solr/home" type="java.lang.String" value="@gsdl3home@/ext/solr" override="true" /> 
     5  <Environment name="solr/home" type="java.lang.String" value="@gsdl3webhome@/ext/solr" override="true" /> 
    66   
    77  <!--Access log. Already created in packages\tomcat\logs localhost_access_log.YYYY-MM-DD.txt--> 
  • main/trunk/greenstone3/build.xml

    r30013 r30035  
    14261426      </filterset> 
    14271427    </copy> 
     1428 
     1429    <!-- set up the solr context --> 
     1430    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true"> 
     1431      <filterset> 
     1432        <filter token="gsdl3webhome" value="${web.writablehome}"/> 
     1433    <filter token="tomcathome" value="${basedir}/packages/tomcat"/> 
     1434      </filterset> 
     1435    </copy> 
     1436 
    14281437    <!-- set up the greenstone3 context, it may have a custom name specified in build.properties --> 
    14291438    <if><bool><not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not></bool>