Scarab commit: svn commit: r10330 - branches/release/b21: . build src/conf/conf

Author: ronvoe122
Date: 2006-11-07 02:06:01-0800
New Revision: 10330

Modified:
   branches/release/b21/build/build.xml
   branches/release/b21/maven.xml
   branches/release/b21/src/conf/conf/componentConfiguration.xml

Log:
Bugfix: The build property "searchindex.path" was not considered in the build process.
The path of the Lucene search index was hardcoded as "WEB-INF/index" in componentConfiguration.xml.

Modified: branches/release/b21/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/build/build.xml?view=diff&rev=10330&p1=branches/release/b21/build/build.xml&p2=branches/release/b21/build/build.xml&r1=10329&r2=10330
==============================================================================
--- branches/release/b21/build/build.xml	(original)
+++ branches/release/b21/build/build.xml	2006-11-07 02:06:01-0800
@@ -217,11 +217,12 @@
         <!-- ======================================= -->        
         <echo> copy the base configuration files ...   </echo>      
         <!-- ======================================= -->        
-        <copy todir="${build.project.webinf}/conf" filtering="no">
+        <copy todir="${build.project.webinf}/conf" filtering="true">
              <fileset dir="${src.dir}/conf/conf">
                  <include name="**/*.*"/>
              </fileset>
              <filterset>
+                 <filter token="SEARCH_INDEX_PATH" value="${searchindex.path}"/>
                  <filter token="SCARAB_MODULE_CODE_LENGTH" value="${scarab.module.code.length}"/>
                  <filter token="VERSION" value="${version}"/>
                  <filter token="BUILD_DATE" value="${DSTAMP}${TSTAMP}"/>

Modified: branches/release/b21/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/maven.xml?view=diff&rev=10330&p1=branches/release/b21/maven.xml&p2=branches/release/b21/maven.xml&r1=10329&r2=10330
==============================================================================
--- branches/release/b21/maven.xml	(original)
+++ branches/release/b21/maven.xml	2006-11-07 02:06:01-0800
@@ -431,6 +431,7 @@
             <ant:filter token="BUILD_DATE" value="${DSTAMP}${TSTAMP}" />
             <ant:filter token="SCARAB_MODULE_CODE_LENGTH" 
                 value="${scarab.module.code.length}" />
+            <ant:filter token="SEARCH_INDEX_PATH" value="${searchindex.path}"/>
         </ant:filterset>
         <j:set var="warWebappBuildDir" 
             value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>

Modified: branches/release/b21/src/conf/conf/componentConfiguration.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/conf/componentConfiguration.xml?view=diff&rev=10330&p1=branches/release/b21/src/conf/conf/componentConfiguration.xml&p2=branches/release/b21/src/conf/conf/componentConfiguration.xml&r1=10329&r2=10330
==============================================================================
--- branches/release/b21/src/conf/conf/componentConfiguration.xml	(original)
+++ branches/release/b21/src/conf/conf/componentConfiguration.xml	2006-11-07 02:06:01-0800
@@ -30,7 +30,7 @@
         # Path for writing index, if starts with a '/', the path is assumed to be 
         # absolute, otherwise it will be created relative to the webapp root.
     -->
-    <searchIndex path="WEB-INF/index" />
+    <searchIndex path="@SEARCH_INDEX_PATH@" />
     <XmlRpcComponent>
         <!-- Port on which the XML-RPC server will listen for
             incoming connections -->