You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jo...@apache.org on 2005/12/06 11:41:03 UTC
svn commit: r354395 - in /lenya/branches/BRANCH_1_2_X: lib/endorsed/
src/targets/properties-build.xml src/targets/webapp-build.xml
Author: josias
Date: Tue Dec 6 02:40:50 2005
New Revision: 354395
URL: http://svn.apache.org/viewcvs?rev=354395&view=rev
Log:
Applied a patch by Felix Roethenbacher, s.t. Lenya also works with Cocoon 2.1.8 (see bug #36382). Thanks Felix.
Added:
lenya/branches/BRANCH_1_2_X/lib/endorsed/
Modified:
lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml?rev=354395&r1=354394&r2=354395&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml Tue Dec 6 02:40:50 2005
@@ -46,9 +46,13 @@
<property name="fullname" value="${ant.project.name}-${version}"/>
<property name="distname" value="apache-${ant.project.name}-${version}"/>
+ <!-- cocoon endorsed libraries directory -->
+ <property name="cocoon.endorsed.lib.dir" value="${cocoon.src.dir}/lib/endorsed"/>
+
<!-- The libraries we use and which are not already included in the cocoon package -->
<property name="lib.dir" value="lib"/>
<property name="tools.lib.dir" value="tools/lib"/>
+ <property name="endorsed.lib.dir" value="lib/endorsed"/>
<!-- All compilation and preparation takes place in build.root -->
<property name="build.root" value="build"/>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?rev=354395&r1=354394&r2=354395&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Tue Dec 6 02:40:50 2005
@@ -135,7 +135,27 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
+ <!-- now create directory for endorsed libraries -->
+ <mkdir dir="${build.webapp}/WEB-INF/lib/endorsed"/>
+
+ <!-- Copy libraries from ${endorsed.lib.dir} and ${cocoon.endorsed.lib.dir} to ${build.webapp}/WEB-INF/lib/endorsed -->
+ <copy todir="${build.webapp}/WEB-INF/lib/endorsed">
+ <fileset dir="${endorsed.lib.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${cocoon.endorsed.lib.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Delete endorsed libraries from common webapp lib directory -->
+ <delete>
+ <fileset dir="${build.webapp}/WEB-INF/lib">
+ <present present="both" targetdir="${cocoon.endorsed.lib.dir}"/>
+ </fileset>
+ </delete>
+
<!-- Replace version placeholder with build version -->
<replace dir="${build.webapp}">
<include name="**/publication.xml"/>
@@ -213,16 +233,24 @@
<fileset dir="${build.webapp}" excludes="${target.install.excludes}"/>
</copy>
+ <!-- tomcat 5.0.28 already contains some endorsed libs, but
+ they cause conflicts with lenya's endorsed libs,
+ so we move them to the 'old' directory -->
+ <mkdir dir="${tomcat.endorsed.dir}/old"/>
+ <move todir="${tomcat.endorsed.dir}/old">
+ <fileset dir="${tomcat.endorsed.dir}">
+ <include name="xml-apis.jar"/>
+ <include name="xercesImpl.jar"/>
+ </fileset>
+ </move>
+
<!-- Copy endorsed libraries -->
<copy todir="${tomcat.endorsed.dir}">
- <fileset dir="${build.webapp}/WEB-INF/lib/">
- <include name="xercesImpl-*.jar"/>
- <include name="xalan-*.jar"/>
- <include name="jakarta-regexp-*.jar"/>
- <include name="jakarta-bcel-*.jar"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib/endorsed">
+ <include name="*.jar"/>
</fileset>
</copy>
- <copy file="${build.webapp}/WEB-INF/lib/xml-apis.jar" todir="${tomcat.endorsed.dir}"/>
+
</target>
<!-- ============================================================ -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org