forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/src/core forrest.build.xml
Date Thu, 13 Nov 2003 08:23:48 GMT
crossley    2003/11/13 00:23:48

  Modified:    src/core forrest.build.xml
  Log:
  The lucene indexer needs to be off by default. If the optional skinconf
  parameter "disable-lucene" is missing or false, then off. This seems rather
  convoluted with Ant <condition>.
  
  Revision  Changes    Path
  1.9       +13 -5     xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- forrest.build.xml	9 Nov 2003 10:15:17 -0000	1.8
  +++ forrest.build.xml	13 Nov 2003 08:23:48 -0000	1.9
  @@ -635,7 +635,7 @@
     <!-- ===============================================================
          Prepares the Lucene context indexing the site. [RPR]
          =============================================================== -->
  -  <target name="lucene-index" depends="init, -prepare-classpath" unless="stop-lucene-indexer">
  +  <target name="lucene-index" depends="init, -prepare-classpath" if="use-lucene-indexer">
       <java classname="org.apache.forrest.search.ForrestIndexer"
         dir="${project.webapp}"
         fork="true"
  @@ -688,9 +688,17 @@
           <include name="*jar" unless="jdk1.4+"/>
         </fileset>
       </copy>
  -    <!-- Index files for Lucene [RPR] -->
  -    <condition property="stop-lucene-indexer">
  -      <istrue value="${skinconfig.disable-lucene}"/>
  +    <!-- Prepare the Lucene search index -->
  +    <!-- FIXME: There must be a better way to configure this.
  +         Is this really a concern of the skinconf?
  +         The indexer must be off by default. If the optional skinconf parameter
  +         "disable-lucene" is missing or false, then off. 
  +    -->
  +    <condition property="use-lucene-indexer">
  +      <!-- sorry for the convolution -->
  +      <not>
  +        <isfalse value="${skinconfig.disable-lucene}"/>
  +      </not>
       </condition>
       <antcall target="lucene-index"/>
   
  
  
  

Mime
View raw message