cziegeler 02/01/14 03:04:20
Modified: . build.bat build.sh build.xml
Added: lib/core avalon-excalibur-20011229.jar
avalon-framework-20011229.jar
commons-collections-1.0.jar
commons-httpclient-20011012.jar deli.jar
hsqldb-1.61.jar jakarta-regexp-1.2.jar
logkit-20011212.jar resolver.jar servlet_2_2.jar
xalan-2.2.0-D14.jar xerces-1.4.4.jar xml-apis.jar
lib/optional axis-samples.jar axis.jar batik-libs-1.1.1.jar
bsf-2.2.jar fop-0.20.2.jar jena.jar jimi-1.0.jar
jstyle.jar jtidy-04aug2000r7-dev.jar
lucene-1.2-rc2.jar maybeupload_1-0-5pre3.jar
rdffilter.jar rhino-1.5r2.jar velocity-1.2.jar
xmldb-20010924.jar xt.jar
tools/lib junit.jar
Removed: lib junit.jar
Log:
Created lib/core and lib/optional directories
Revision Changes Path
1.10 +4 -4 xml-cocoon2/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.bat 11 Jan 2002 09:35:27 -0000 1.9
+++ build.bat 14 Jan 2002 11:04:16 -0000 1.10
@@ -2,13 +2,13 @@
rem ----------------------------------------------------------------------------
rem build.bat - Win32 Build Script for Apache Cocoon
rem
-rem $Id: build.bat,v 1.9 2002/01/11 09:35:27 cziegeler Exp $
+rem $Id: build.bat,v 1.10 2002/01/14 11:04:16 cziegeler Exp $
rem ----------------------------------------------------------------------------
rem ----- Copy Xalan and Xerces for the build system ------------------------
-copy lib\xerces*.jar tools\lib
-copy lib\xalan*.jar tools\lib
-copy lib\xml-api*.jar tools\lib
+copy lib\core\xerces*.jar tools\lib
+copy lib\core\xalan*.jar tools\lib
+copy lib\core\xml-api*.jar tools\lib
rem ----- Verify and Set Required Environment Variables ------------------------
1.10 +3 -3 xml-cocoon2/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.sh 11 Jan 2002 17:34:07 -0000 1.9
+++ build.sh 14 Jan 2002 11:04:16 -0000 1.10
@@ -4,9 +4,9 @@
echo "Apache Cocoon 2 Build System"
echo "----------------------------"
-cp ./lib/xalan*.jar ./tools/lib
-cp ./lib/xerces*.jar ./tools/lib
-cp ./lib/xml-api*.jar ./tools/lib
+cp ./lib/core/xalan*.jar ./tools/lib
+cp ./lib/core/xerces*.jar ./tools/lib
+cp ./lib/core/xml-api*.jar ./tools/lib
chmod u+x ./tools/bin/antRun
chmod u+x ./tools/bin/ant
1.132 +92 -21 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 11 Jan 2002 09:35:27 -0000 1.131
+++ build.xml 14 Jan 2002 11:04:16 -0000 1.132
@@ -123,13 +123,19 @@
<!-- Indentify Classpath -->
<!-- =================================================================== -->
<path id="classpath">
- <fileset dir="./lib">
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
<include name="*.jar"/>
</fileset>
</path>
<path id="scratchpad.classpath">
- <fileset dir="./lib">
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
<include name="*.jar"/>
</fileset>
<fileset dir="./src/scratchpad/lib">
@@ -271,20 +277,29 @@
property="servlet23.present"
classname="javax.servlet.http.HttpServletRequestWrapper"/>
- <available property="rhino.present"
- classname="org.mozilla.javascript.tools.jsc.Main">
- <classpath refid="classpath"/>
- </available>
-
- <available property="jstyle.present"
- classname="jstyle.JSFormatter">
- <classpath refid="classpath"/>
- </available>
-
- <available property="xpath.present"
- classname="org.apache.xpath.XPathAPI">
- <classpath refid="classpath"/>
- </available>
+ <ClassAvailable classpathref="classpath"
+ property="bsf.present"
+ classname="com.ibm.bsf.BSFException"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="rhino.present"
+ classname="org.mozilla.javascript.tools.jsc.Main"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="jstyle.present"
+ classname="jstyle.JSFormatter"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="xpath.present"
+ classname="org.apache.xpath.XPathAPI"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="deli.present"
+ classname="com.hp.hpl.deli.Profile"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="velocity.present"
+ classname="org.apache.velocity.app.Velocity"/>
<available property="ora.driver.present"
classname="oracle.jdbc.OracleResultSet">
@@ -371,6 +386,16 @@
<!-- =================================================================== -->
<!-- Warnings -->
<!-- =================================================================== -->
+ <target name="bsf-warn" unless="bsf.present" depends="optional-tests"
+ description="Outputs a warning if com.ibm.bsf.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="BSF"/>
+ <param name="recovery"
+ value="Get the BSF package and place the jar in the lib dir"/>
+ <param name="message"
+ value="BSF is required for the script action."/>
+ </antcall>
+ </target>
<target name="jfor-warn" unless="jfor.present" depends="optional-tests"
description="Outputs a warning if org.jfor.jfor.* classes are missing during
compilation">
<antcall target="op-warning">
@@ -471,12 +496,32 @@
value="Lucene is required for the Cocoon searches."/>
</antcall>
</target>
+ <target name="deli-warn" unless="deli.present" depends="optional-tests"
+ description="Outputs a warning if com.hp.hpl.deli.* classes are missing
during compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="Deli"/>
+ <param name="recovery"
+ value="Get Deli and place the jar in the lib/optional dir"/>
+ <param name="message"
+ value="Deli is required for ..."/>
+ </antcall>
+ </target>
+ <target name="velocity-warn" unless="velocity.present" depends="optional-tests"
+ description="Outputs a warning if org.apache.velocity.* classes are missing
during compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="Velocity"/>
+ <param name="recovery"
+ value="Get Velocity from http://jakarta.apache.org and place the jar in the
lib/optional dir"/>
+ <param name="message"
+ value="Velocity is required for the velocity generator"/>
+ </antcall>
+ </target>
<!-- =================================================================== -->
<!-- Print out warnings for optional components -->
<!-- =================================================================== -->
<target name="optional-warnings"
- depends="jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn,
fop-warn, tidy-warn, maybeupload-warn, lucene-warn"
+ depends="bsf-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn,
svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn"
description="Outputs warnings if some optional jars are missing from the
environment">
</target>
@@ -499,9 +544,19 @@
<exclude name="**/JSP*.java" unless="servlet.present"/>
<exclude name="**/servlet.sitemap" unless="servlet.present"/>
+ <exclude name="**/ScriptAction.java" unless="bsf.present"/>
+ <exclude name="**/ScriptGenerator.java" unless="bsf.present"/>
+ <exclude name="**/bsf.sitemap" unless="bsf.present"/>
+
+ <exclude name="**/components/deli/**.java" unless="deli.present"/>
+ <exclude name="**/deli.sitemap" unless="deli.present"/>
+
<exclude name="**/HTMLGenerator.java" unless="tidy.present"/>
<exclude name="**/tidy.sitemap" unless="tidy.present"/>
+ <exclude name="**/VelocityGenerator.java" unless="velocity.present"/>
+ <exclude name="**/velocity.sitemap" unless="velocity.present"/>
+
<exclude name="**/SVG*.java"
unless="svg.present"/>
<exclude name="**/svg.sitemap"
unless="svg.present"/>
<exclude name="**/components/transcoder/**.java"
unless="svg.present"/>
@@ -545,7 +600,9 @@
<exclude name="**/CocoonServlet*.java" unless="servlet.present"/>
- <exclude name="**/lucene/*" unless="lucene.present"/>
+ <exclude name="**/components/search/*"
unless="lucene.present"/>
+ <exclude name="**/generation/SearchGenerator.java"
unless="lucene.present"/>
+ <exclude name="**/lucene.sitemap"
unless="lucene.present"/>
<exclude name="**/http/RequestWrapper*.java"/>
<exclude name="**/browser/*.x*"/>
@@ -557,6 +614,8 @@
<copy todir="${build.scratchpad.src}" filtering="on">
<fileset dir="${scratchpad.src}">
<exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
+
+ <exclude name="**/XMLDB*.java" unless="xmldb.present"/>
</fileset>
</copy>
</target>
@@ -846,7 +905,7 @@
<java classname="org.apache.cocoon.Main" fork="yes" failonerror="true">
<arg line="-x -w ${build.war}/WEB-INF/classes -c webapp" />
<classpath>
- <fileset dir="lib">
+ <fileset dir="lib/core">
<include name="**/*.jar"/>
</fileset>
<pathelement location="${build.dir}/${name}.jar"/>
@@ -860,7 +919,13 @@
<!-- =================================================================== -->
<target name="prepare-webapp-libs" depends="package,prepare-tools-lib"
if="include.webapp.libs">
<copy todir="${build.war}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
+ <fileset dir="${lib.dir}/core">
+ <include name="*.jar"/>
+ <exclude name="servlet*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.war}/WEB-INF/lib">
+ <fileset dir="${lib.dir}/optional">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
@@ -1224,7 +1289,13 @@
<!-- And now the jars -->
<copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
- <fileset dir="${lib.dir}">
+ <fileset dir="${lib.dir}/core">
+ <include name="*.jar"/>
+ <exclude name="servlet*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
+ <fileset dir="${lib.dir}/optional">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
1.1 xml-cocoon2/lib/core/avalon-excalibur-20011229.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/avalon-framework-20011229.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/commons-collections-1.0.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/commons-httpclient-20011012.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/deli.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/hsqldb-1.61.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/jakarta-regexp-1.2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/logkit-20011212.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/resolver.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/servlet_2_2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/xalan-2.2.0-D14.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/xerces-1.4.4.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/xml-apis.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/axis-samples.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/axis.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/batik-libs-1.1.1.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/bsf-2.2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/fop-0.20.2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/jena.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/jimi-1.0.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/jstyle.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/jtidy-04aug2000r7-dev.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/lucene-1.2-rc2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/maybeupload_1-0-5pre3.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/rdffilter.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/rhino-1.5r2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/velocity-1.2.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/xmldb-20010924.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/xt.jar
<<Binary file>>
1.1 xml-cocoon2/tools/lib/junit.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
