cziegeler 2002/07/12 02:58:17
Modified: . build.xml changes.xml
lib jars.xml
Added: lib/core/jvm13 avalon-excalibur-vm13-20020705.jar
lib/core/jvm14 avalon-excalibur-vm14-20020705.jar
Removed: lib/core avalon-excalibur-20020705.jar
Log:
Applied patch for build system (sync with 2.0.3 branch
Revision Changes Path
1.243 +33 -3 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- build.xml 5 Jul 2002 08:23:30 -0000 1.242
+++ build.xml 12 Jul 2002 09:58:13 -0000 1.243
@@ -118,6 +118,9 @@
<property name="build.compiler.pedantic" value="false"/>
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
+ <!-- specify the target Java Virtual Machine so that compatible libraries
+ can be included with the build. Default this to 13 -->
+ <property name="jvm-target" value="13" />
<!-- =================================================================== -->
<!-- Indentify Classpath -->
@@ -129,6 +132,9 @@
<fileset dir="./lib/core">
<include name="*.jar"/>
</fileset>
+ <fileset dir="./lib/core/jvm${jvm-target}">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="./lib/optional">
<include name="*.jar"/>
</fileset>
@@ -141,6 +147,9 @@
<fileset dir="./lib/core">
<include name="*.jar"/>
</fileset>
+ <fileset dir="./lib/core/jvm${jvm-target}">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="./lib/optional">
<include name="*.jar"/>
</fileset>
@@ -156,6 +165,9 @@
<fileset dir="./lib/core">
<include name="*.jar"/>
</fileset>
+ <fileset dir="./lib/core/jvm${jvm-target}">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="./lib/optional">
<include name="*.jar"/>
</fileset>
@@ -185,6 +197,15 @@
<echo message="Building with ${ant.version}"/>
<echo message="using build file ${ant.file}"/>
<echo message="--------------------------------------------------------------"/>
+ <echo message=" WARNING: "/>
+ <echo message=" This build is targetted for use with JVM ${jvm-target}"/>
+ <echo message=" "/>
+ <echo message=" Using this build on a virtual machine other than the one "/>
+ <echo message=" it is targetted for may result in runtime errors. "/>
+ <echo message=" "/>
+ <echo message=" Set property jvm-target to '13' or '14' to switch between "/>
+ <echo message=" JVM targets 1.3 and before and 1.4 respectively. "/>
+ <echo message="--------------------------------------------------------------"/>
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
@@ -1182,13 +1203,16 @@
<java classname="org.apache.cocoon.Main" fork="yes" failonerror="true">
<arg line="-P -C ${build.war}/WEB-INF/cocoon.xconf -w
${build.war}/WEB-INF/classes -c ${build.war}" />
<classpath>
- <fileset dir="lib/core">
+ <fileset dir="${lib.dir}/core">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="lib/optional">
+ <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/optional">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="lib/local">
+ <fileset dir="${lib.dir}/local">
<include name="**/*.jar"/>
</fileset>
<pathelement location="${build.war}/WEB-INF/classes"/>
@@ -1207,6 +1231,9 @@
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
+ <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${lib.dir}/optional">
@@ -1673,6 +1700,9 @@
<fileset dir="${lib.dir}/core">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <include name="*.jar"/>
</fileset>
</copy>
<copy todir="${dist.bin.dir}/webapp/WEB-INF/lib">
1.210 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- changes.xml 12 Jul 2002 07:29:54 -0000 1.209
+++ changes.xml 12 Jul 2002 09:58:14 -0000 1.210
@@ -39,6 +39,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="add" fixes-bug="10505" due-to="Stuart Roebuck"
due-to-email="[EMAIL PROTECTED]">
+ When building Cocoon it is required to set the targetted JVM (either 1.3 (means
1.3 or lower) or 1.4.
+ </action>
<action dev="SMS" type="update" fixes-bug="9521" due-to="Andrew Timberlake"
due-to-email="[EMAIL PROTECTED]">
Applied patch to add javascript support for the mozilla browser for transforming
xml
to html.
1.17 +10 -2 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jars.xml 5 Jul 2002 10:36:55 -0000 1.16
+++ jars.xml 12 Jul 2002 09:58:14 -0000 1.17
@@ -13,9 +13,17 @@
<file>
<title>Avalon Excalibur</title>
<description>Part of jakarta-avalon, it is a set of classes and patterns that
- support high level server development.</description>
+ support high level server development. (This JAR has been compiled on Java
1.3 to be run on JVM 1.3 or earlier.)</description>
<used-by>Cocoon</used-by>
- <lib>core/avalon-excalibur-20020705.jar</lib>
+ <lib>core/jvm13/avalon-excalibur-vm13-20020705.jar</lib>
+ <homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
+ </file>
+ <file>
+ <title>Avalon Excalibur</title>
+ <description>Part of jakarta-avalon, it is a set of classes and patterns that
+ support high level server development. (This JAR has been compiled on Java
1.4 to be run on JVM 1.4.)</description>
+ <used-by>Cocoon</used-by>
+ <lib>core/jvm14/avalon-excalibur-vm14-20020705.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
1.2 +1195 -0 xml-cocoon2/lib/core/jvm13/avalon-excalibur-vm13-20020705.jar
<<Binary file>>
1.2 +1220 -0 xml-cocoon2/lib/core/jvm14/avalon-excalibur-vm14-20020705.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
