You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/01/21 10:55:15 UTC
svn commit: r125911 - /lenya/branches/BRANCH_1_2_X/build.properties /lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Author: michi
Date: Fri Jan 21 01:55:12 2005
New Revision: 125911
URL: http://svn.apache.org/viewcvs?view=rev&rev=125911
Log:
allow patching of Lucene
Modified:
lenya/branches/BRANCH_1_2_X/build.properties
lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Modified: lenya/branches/BRANCH_1_2_X/build.properties
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/build.properties?view=diff&rev=125911&p1=lenya/branches/BRANCH_1_2_X/build.properties&r1=125910&p2=lenya/branches/BRANCH_1_2_X/build.properties&r2=125911
==============================================================================
--- lenya/branches/BRANCH_1_2_X/build.properties (original)
+++ lenya/branches/BRANCH_1_2_X/build.properties Fri Jan 21 01:55:12 2005
@@ -19,6 +19,8 @@
# NOTE: Lenya cannot be built offline with Cocoon-2.1.5.1 because of a unresolvable
# DTD lookup, whereas offline building works with Cocoon-2.1.6
# NOTE: Cocoon-2.1.5.1 contains Lucene-1.3 whereas Lenya requires Lucene-1.4
+# Copy lucene-1.4.1.jar to src/webapp/WEB-INF/lib in order to patch it
+# during the build process
cocoon.src.dir=../cocoon-2.1.6
#cocoon.src.dir=../cocoon-2.1.5.1
Modified: lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml?view=diff&rev=125911&p1=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r1=125910&p2=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r2=125911
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml Fri Jan 21 01:55:12 2005
@@ -138,7 +138,14 @@
<outputproperty name="indent" value="yes"/>
</xslt>
- <!-- Copy Entities
+ <!-- patch lucene -->
+ <available file="${src.webapp.dir}/WEB-INF/lib/lucene-1.4.1.jar" type="file" property="lenya.lucene.patch.exists"/>
+ <echo>${src.webapp.dir}/WEB-INF/lib/lucene**.jar</echo>
+ <antcall target="patch-lucene"/>
+ <antcall target="do-not-patch-lucene"/>
+
+ <!-- Copy Entities -->
+ <!--
<echo>INFO: Copy publication-specific entities to Cocoon catalog</echo>
<copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="${src.entities.dir}" builddir="${build.webapp}/${build.entities.dir}" />
-->
@@ -190,5 +197,22 @@
flatten="true">
<fileset includes="*/java/lib/*"/>
</bulkCopy>
+ </target>
+
+
+ <!-- Patch Lucene -->
+ <target name="patch-lucene" if="lenya.lucene.patch.exists">
+ <echo message="INFO: Patch Lucene"/>
+ <delete>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lucene**.jar"/>
+ </delete>
+ <copy todir="${build.webapp}" filtering="off">
+ <fileset dir="${src.webapp.dir}">
+ <include name="WEB-INF/lib/lucene**.jar"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="do-not-patch-lucene" unless="lenya.lucene.patch.exists">
+ <echo message="INFO: Use Lucene from Cocoon and do not patch it"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org