svn commit: r355050 - in /lenya/branches/BRANCH_1_2_X: lib/xercesImpl-2.6.2.jar lib/xml-apis.jar src/targets/webapp-build.xml

Author: josias
Date: Thu Dec  8 01:10:34 2005
New Revision: 355050

URL: http://svn.apache.org/viewcvs?rev=355050&view=rev
Log:
readded libraries because they are needed to build lenya, but remove them from 
the build directory because they cause conflicts with the endorsed libraries 
from cocoon.

Added:
    lenya/branches/BRANCH_1_2_X/lib/xercesImpl-2.6.2.jar   (with props)
    lenya/branches/BRANCH_1_2_X/lib/xml-apis.jar   (with props)
Modified:
    lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml

Added: lenya/branches/BRANCH_1_2_X/lib/xercesImpl-2.6.2.jar
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/lib/xercesImpl-2.6.2.jar?rev=355050&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/BRANCH_1_2_X/lib/xercesImpl-2.6.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/BRANCH_1_2_X/lib/xml-apis.jar
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/lib/xml-apis.jar?rev=355050&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/BRANCH_1_2_X/lib/xml-apis.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=355050&r1=355049&r2=355050&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 Thu Dec  8 
01:10:34 2005
@@ -139,11 +139,8 @@
     <!-- 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 libraries from ${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>
@@ -153,6 +150,10 @@
     <delete>
       <fileset dir="${build.webapp}/WEB-INF/lib">
         <present present="both" targetdir="${cocoon.endorsed.lib.dir}"/>
+      </fileset>
+      <fileset dir="${build.webapp}/WEB-INF/lib">
+        <include name="xml-apis.jar"/>
+        <include name="xercesImpl-2.6.2.jar"/>
       </fileset>
     </delete>