cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject svn commit: rev 55865 - in cocoon/branches/BRANCH_2_1_X: . tools/src
Date Thu, 28 Oct 2004 15:25:52 GMT
Author: unico
Date: Thu Oct 28 08:25:52 2004
New Revision: 55865

Modified:
   cocoon/branches/BRANCH_2_1_X/gump.xml
   cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Log:
add attribute bundle to library element to indicate if the jar should be copied to WEB-INF/lib
needed for instance to exclude servlet.jar. By default true is assumed.


Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml	Thu Oct 28 08:25:52 2004
@@ -159,7 +159,7 @@
     <depend project="cocoon-block-axis"/>
     <depend project="apache-garbage"/>
 
-    <library name="servlet-2_3"/>
+    <library name="servlet-2_3" bundle="false"/>
     <library name="velocity"/>
     <library name="castor"/>
     <library name="commons-jexl"/>
@@ -527,7 +527,7 @@
     <depend project="jakarta-servletapi"/>
 
     <library name="jtidy"/>
-    <library name="servlet"/>
+    <library name="servlet" bundle="false"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -684,7 +684,7 @@
     <depend project="commons-logging"/>
     <depend project="jakarta-servletapi"/>
 
-    <library name="servlet"/>
+    <library name="servlet" bundle="false"/>
     <library name="commons-httpclient"/>
     <library name="commons-logging"/>
 
@@ -741,7 +741,7 @@
     <library name="deli"/>
     <library name="jena"/>
     <library name="icu4j"/>
-    <library name="servlet"/>
+    <library name="servlet" bundle="false"/>
     <library name="log4j"/>
 
     <work nested="tools/anttasks"/>
@@ -815,7 +815,7 @@
     <library name="axis-jaxrpc"/>
     <library name="wsdl4j"/>
     <library name="commons-discovery"/>
-    <library name="servlet"/>
+    <library name="servlet" bundle="false"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -1220,7 +1220,7 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="jakarta-servletapi"/>
 
-    <library name="servlet"/>
+    <library name="servlet" bundle="false"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>

Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl	Thu Oct 28 08:25:52 2004
@@ -529,10 +529,10 @@
       </xsl:if>
 
       <!-- Copy the library depencies -->
-      <xsl:if test="library">
+      <xsl:if test="library[not(@bundle='false')]">
         <copy filtering="off" todir="${{build.webapp.lib}}">
           <fileset dir="${{lib.optional}}">
-            <xsl:for-each select="library">
+            <xsl:for-each select="library[not(@bundle='false')]">
               <include name="{@name}*.jar"/>
             </xsl:for-each>
           </fileset>

Mime
View raw message