Changeset 27857 for gs3-extensions

Show
Ignore:
Timestamp:
15.07.2013 17:22:43 (6 years ago)
Author:
davidb
Message:

Code changed to work off the solr.xml.in file, with @gsdl3home@ being substituted

Files:
1 modified

Legend:

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

    r27852 r27857  
    1010  <property name="jarwebdir" value="${web.home}/WEB-INF/lib"/>   
    1111  <property name="web.extdir" value="${web.home}/ext/solr"/> 
    12   <property name="web.list" value="solr.xml"/> 
    1312   
    1413  <!-- FILE LISTINGS.--> 
     
    4140  <property name="property-files"  
    4241            value="SharedSoleneGS2FieldSearch.properties"/>   
    43  
    44   <property name="web-list-files"  
    45             value="solr.xml"/> 
    4642 
    4743             
     
    8581     
    8682    <echo/> 
    87     <echo>Adding to gsdl3 web solr ext directory: ${web-list-files}</echo> 
     83    <echo>Adding to gsdl3 web solr ext directory: solr.xml</echo> 
    8884    <pathconvert targetos="unix" property="src.gsdl3.home.unix"> 
    8985      <path path="../../web"/> 
    9086    </pathconvert> 
    9187    <filter token="gsdl3home" value="${src.gsdl3.home.unix}"/> 
    92     <copy todir="${web.extdir}" filtering="true" overwrite="true"> 
    93           <filelist id="web-list" dir="${basedir}" files="${web-list-files}"/>  
    94     </copy> 
     88    <copy file="solr.xml.in" tofile="${web.extdir}/solr.xml" filtering="true" overwrite="true"/> 
    9589     
    9690    <echo/>