Author: ronvoe122
Date: 2006-11-08 08:57:54-0800
New Revision: 10348
Modified:
trunk/ (props changed)
trunk/build/build.xml
trunk/maven.xml
trunk/src/conf/conf/componentConfiguration.xml
Log:
Merged revisions 10330 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10330 | ronvoe122 | 2006-11-07 11:06:01 +0100 (Di, 07 Nov 2006) | 2 lines
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: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10348&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10347&r2=10348
==============================================================================
--- trunk/build/build.xml (original)
+++ trunk/build/build.xml 2006-11-08 08:57:54-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: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=diff&rev=10348&p1=trunk/maven.xml&p2=trunk/maven.xml&r1=10347&r2=10348
==============================================================================
--- trunk/maven.xml (original)
+++ trunk/maven.xml 2006-11-08 08:57:54-0800
@@ -435,6 +435,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: trunk/src/conf/conf/componentConfiguration.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/componentConfiguration.xml?view=diff&rev=10348&p1=trunk/src/conf/conf/componentConfiguration.xml&p2=trunk/src/conf/conf/componentConfiguration.xml&r1=10347&r2=10348
==============================================================================
--- trunk/src/conf/conf/componentConfiguration.xml (original)
+++ trunk/src/conf/conf/componentConfiguration.xml 2006-11-08 08:57:54-0800
@@ -29,7 +29,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 -->
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.