morrijr 2002/06/09 05:47:48
Modified: . Tag: cocoon_2_0_3_branch build.xml
Added: lib Tag: cocoon_2_0_3_branch jars.xml jars.xml.tmpl
tools/src Tag: cocoon_2_0_3_branch check-jars.xsl
Log:
Sync autogenerated jars.xml with head
Revision Changes Path
No revision
No revision
1.196.2.4 +47 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196.2.3
retrieving revision 1.196.2.4
diff -u -r1.196.2.3 -r1.196.2.4
--- build.xml 29 May 2002 10:37:21 -0000 1.196.2.3
+++ build.xml 9 Jun 2002 12:47:47 -0000 1.196.2.4
@@ -943,7 +943,7 @@
<!-- =================================================================== -->
<!-- Prepares the docs -->
<!-- =================================================================== -->
- <target name="prepare-docs" depends="init">
+ <target name="prepare-docs" depends="check-jars">
<mkdir dir="${build.context}"/>
<mkdir dir="${build.context}/images"/>
<mkdir dir="${build.docs}"/>
@@ -962,6 +962,8 @@
<replace file="${build.context}/xdocs/changes.xml"
token="src/documentation/xdocs/dtd/" value="dtd/"/>
<replace file="${build.context}/xdocs/todo.xml"
token="src/documentation/xdocs/dtd/" value="dtd/"/>
+ <copy file="${build.dir}/jars.xml"
tofile="${build.context}/xdocs/installing/jars.xml" filtering="off" overwrite="yes"/>
+
<!-- Copy images -->
<copy todir="${build.context}/images" filtering="off">
<fileset dir="${context.dir}/images"/>
@@ -989,6 +991,7 @@
<target name="docs_check" depends="init">
<uptodate property="docs.notrequired" targetfile="${build.docs}/index.html" >
<srcfiles dir="." includes="changes.xml,todo.xml"/>
+ <srcfiles dir="${build.dir}" includes="jars.xml"/>
<srcfiles dir="${context.dir}/xdocs" includes="**/*.xml"/>
</uptodate>
</target>
@@ -1158,7 +1161,7 @@
<!-- =================================================================== -->
<!-- Prepares the libraries for the war package -->
<!-- =================================================================== -->
- <target name="copy-webapp-libs" depends="copy-tools-lib" if="include.webapp.libs">
+ <target name="copy-webapp-libs" depends="copy-tools-lib, check-jars"
if="include.webapp.libs">
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${lib.dir}/core">
<include name="*.jar"/>
@@ -1724,6 +1727,48 @@
<!-- =================================================================== -->
<target name="fixsrclf" depends="init" description="Fix lf in src directory
(internal use only!)">
<fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Check if all the JAR files are properly declared in lib/jars.xml -->
+ <!-- =================================================================== -->
+ <target name="check-jars" depends="init">
+ <path id="all.jars">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <property name="all.jars" refid="all.jars"/>
+ <copy file="${lib.dir}/jars.xml.tmpl"
+ tofile="${build.dir}/current-jars.xml"
+ filtering="yes"
+ overwrite="yes">
+ <filterset>
+ <filter token="JARS" value="${all.jars}"/>
+ </filterset>
+ </copy>
+
+ <!-- split the path in 'jar' XML elements -->
+ <replace file="${build.dir}/current-jars.xml"
+ token="${path.separator}" value="</jar>
 <jar>"/>
+ <!-- relativize file names by removing the current directory -->
+ <replace file="${build.dir}/current-jars.xml"
+ token="${user.dir}${file.separator}lib${file.separator}" value=""/>
+ <!-- and incase that fails, remove the base directory -->
+ <replace file="${build.dir}/current-jars.xml"
+ token="${basedir}${file.separator}lib${file.separator}" value=""/>
+
+ <!-- replace platform-dependent path separator by '/' -->
+ <replace file="${build.dir}/current-jars.xml"
+ token="${file.separator}" value="/"/>
+
+ <style in="${lib.dir}/jars.xml" out="${build.dir}/jars.xml"
+ processor="trax"
+ style="${tools.dir}/src/check-jars.xsl">
+ <param name="current-files"
+ expression="../../${build.dir}/current-jars.xml"/>
+ </style>
</target>
</project>
No revision
No revision
1.11.2.1 +10 -10 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- jars.xml 5 Jun 2002 00:54:20 -0000 1.11
+++ jars.xml 9 Jun 2002 12:47:47 -0000 1.11.2.1
@@ -120,7 +120,7 @@
it requires a description of the capabilities of the client known as the
delivery context.</description>
<used-by>DELI</used-by>
- <lib>optional/deli-0.6.5.jar</lib>
+ <lib>optional/deli-0.50.jar</lib>
<homepage>http://devnet.hp.com/projects/deli/</homepage>
</file>
<file>
@@ -147,7 +147,7 @@
various file formats based upon Microsoft's OLE 2 Compound Document
format using pure Java.</description>
<used-by>?</used-by>
- <lib>optional/jakarta-poi-1.6.0-dev-20020505.jar</lib>
+ <lib>optional/jakarta-poi-1.5.0-dev-20020408.jar.jar</lib>
<homepage>http://jakarta.apache.org/poi/</homepage>
</file>
<file>
@@ -249,17 +249,17 @@
<homepage>http://www.xmldb.org/</homepage>
</file>
<file>
- <title>Jakarta Commons JXPath</title>
- <description>XPath interpreter.</description>
- <used-by>JXPath logicsheet and XMLForm</used-by>
- <lib>optional/commons-jxpath.jar</lib>
- <homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
- </file>
- <file>
<title>Continuations-based JavaScript engine</title>
<description>Rhino is an implementation of JavaScript in Java.</description>
<used-by>Control flow</used-by>
- <lib>optional/rhino1.5r4-continuations-20020429.jar</lib>
+ <lib>optional/rhino-1.5r3.jar</lib>
<homepage>http://www.mozilla.org/rhino/</homepage>
</file>
+ <file>
+ <title>XT</title>
+ <description>XT is an implementation of XSLT 1.0</description>
+ <used-by></used-by>
+ <lib>optional/xt-19991105.jar</lib>
+ <homepage>http://www.blnz.com/xt/</homepage>
+ </file>
</jars>
1.1.2.1 +0 -0 xml-cocoon2/lib/jars.xml.tmpl
Index: jars.xml.tmpl
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.5.2.1 +0 -0 xml-cocoon2/tools/src/check-jars.xsl
Index: check-jars.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/tools/src/check-jars.xsl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
