Author: unico
Date: Thu Oct 28 09:57:37 2004
New Revision: 55878
Added:
cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.8.jar
- copied unchanged from rev 55875,
cocoon/branches/BRANCH_2_1_X/lib/optional/log4j-1.2.8.jar
cocoon/branches/BRANCH_2_1_X/lib/core/servlet_2_2.jar
- copied unchanged from rev 55875,
cocoon/branches/BRANCH_2_1_X/lib/optional/servlet_2_2.jar
Removed:
cocoon/branches/BRANCH_2_1_X/lib/optional/log4j-1.2.8.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/servlet_2_2.jar
Modified:
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Log:
servlet 2.2 and log4j are core dependencies;
don't include optional jars in core classpath
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 09:57:37 2004
@@ -527,7 +527,6 @@
<depend project="jakarta-servletapi"/>
<library name="jtidy"/>
- <library name="servlet" bundle="false"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -684,7 +683,6 @@
<depend project="commons-logging"/>
<depend project="jakarta-servletapi"/>
- <library name="servlet" bundle="false"/>
<library name="commons-httpclient"/>
<library name="commons-logging"/>
@@ -741,7 +739,6 @@
<library name="deli"/>
<library name="jena"/>
<library name="icu4j"/>
- <library name="servlet" bundle="false"/>
<library name="log4j"/>
<work nested="tools/anttasks"/>
@@ -815,7 +812,6 @@
<library name="axis-jaxrpc"/>
<library name="wsdl4j"/>
<library name="commons-discovery"/>
- <library name="servlet" bundle="false"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1219,8 +1215,6 @@
<depend project="cocoon" inherit="all"/>
<depend project="jakarta-servletapi"/>
-
- <library name="servlet" bundle="false"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Thu Oct 28 09:57:37 2004
@@ -571,7 +571,7 @@
<title>Log4j</title>
<description>Logging for java</description>
<used-by>Core and DELI (deli block)</used-by>
- <lib>optional/log4j-1.2.8.jar</lib>
+ <lib>core/log4j-1.2.8.jar</lib>
<homepage>http://logging.apache.org/log4j/</homepage>
</file>
@@ -591,7 +591,7 @@
<title>Servlet API</title>
<description>Servlet API Version 2.2</description>
<used-by>Cocoon</used-by>
- <lib>optional/servlet_2_2.jar</lib>
+ <lib>core/servlet_2_2.jar</lib>
<homepage>http://jakarta.apache.org/tomcat/</homepage>
</file>
<file>
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Thu Oct 28
09:57:37 2004
@@ -129,9 +129,6 @@
<include name="*.jar"/>
</fileset>
-->
- <fileset dir="${lib.optional}">
- <include name="*.jar"/>
- </fileset>
<path location="${build.mocks}"/>
<path location="${build.dest}"/>
</path>
