cziegeler 2002/07/11 03:03:06
Modified: . Tag: cocoon_2_0_3_branch build.xml changes.xml
lib Tag: cocoon_2_0_3_branch jars.xml
Added: lib/core/jvm13 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm13-20020705.jar
avalon-framework-vm13-20020705.jar
lib/core/jvm14 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm14-20020705.jar
avalon-framework-vm14-20020627.jar
Removed: lib/core Tag: cocoon_2_0_3_branch
avalon-excalibur-20020705.jar
avalon-framework-20020627.jar
Log:
Applying patch 10505 by [EMAIL PROTECTED] (Stuart Roebuck)
Revision Changes Path
No revision
No revision
1.196.2.7 +33 -3 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196.2.6
retrieving revision 1.196.2.7
diff -u -r1.196.2.6 -r1.196.2.7
--- build.xml 12 Jun 2002 06:29:00 -0000 1.196.2.6
+++ build.xml 11 Jul 2002 10:03:04 -0000 1.196.2.7
@@ -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"/>
@@ -1175,13 +1196,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"/>
@@ -1200,6 +1224,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">
@@ -1631,6 +1658,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.138.2.28 +5 -2 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.27
retrieving revision 1.138.2.28
diff -u -r1.138.2.27 -r1.138.2.28
--- changes.xml 28 Jun 2002 13:26:22 -0000 1.138.2.27
+++ changes.xml 11 Jul 2002 10:03:04 -0000 1.138.2.28
@@ -24,6 +24,7 @@
<person name="Ivelin Ivanov" email="[EMAIL PROTECTED]" id="II"/>
<person name="Berin Loritsch" email="[EMAIL PROTECTED]" id="BL"/>
<person name="Stefano Mazzocchi" email="[EMAIL PROTECTED]" id="SM"/>
+ <person name="John Morrison" email="[EMAIL PROTECTED]" id="JM"/>
<person name="Giacomo Pati" email="[EMAIL PROTECTED]" id="GP"/>
<person name="Ovidiu Predescu" email="[EMAIL PROTECTED]" id="OP"/>
<person name="Jeremy Quinn" email="[EMAIL PROTECTED]" id="JQ"/>
@@ -34,10 +35,12 @@
<person name="Davanum Srinivas" email="[EMAIL PROTECTED]" id="DM"/>
<person name="Sylvain Wallez" email="[EMAIL PROTECTED]" id="SW"/>
<person name="Carsten Ziegeler" email="[EMAIL PROTECTED]" id="CZ"/>
- <person name="John Morrison" email="[EMAIL PROTECTED]" id="JM"/>
</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="VG" type="fix" fixes-bug="10311" due-to="Joachim Piketz"
due-to-email="[EMAIL PROTECTED]">
Fix NullPointerException in Notifier.
</action>
No revision
No revision
1.11.2.6 +20 -4 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- jars.xml 5 Jul 2002 10:36:08 -0000 1.11.2.5
+++ jars.xml 11 Jul 2002 10:03:04 -0000 1.11.2.6
@@ -13,17 +13,33 @@
<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 Framework</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-framework-20020627.jar</lib>
+ <lib>core/jvm13/avalon-framework-vm13-20020705.jar</lib>
+ <homepage>http://jakarta.apache.org/avalon/framework/</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>
+ <title>Avalon Framework</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-framework-vm14-20020627.jar</lib>
<homepage>http://jakarta.apache.org/avalon/framework/</homepage>
</file>
<file>
No revision
No revision
1.1.2.1 +1195 -0
xml-cocoon2/lib/core/jvm13/Attic/avalon-excalibur-vm13-20020705.jar
<<Binary file>>
1.1.2.1 +262 -0
xml-cocoon2/lib/core/jvm13/Attic/avalon-framework-vm13-20020705.jar
<<Binary file>>
No revision
No revision
1.1.2.1 +1220 -0
xml-cocoon2/lib/core/jvm14/Attic/avalon-excalibur-vm14-20020705.jar
<<Binary file>>
1.1.2.1 +260 -0
xml-cocoon2/lib/core/jvm14/Attic/avalon-framework-vm14-20020627.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
