cziegeler 2002/07/12 03:39:03
Modified: . Tag: cocoon_2_0_3_branch INSTALL.src build.xml
changes.xml
lib Tag: cocoon_2_0_3_branch jars.xml
Added: lib/core/jvm1.2 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm12-20020705.jar
lib/core/jvm1.4 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm14-20020705.jar
Removed: lib/core/jvm13 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm13-20020705.jar
lib/core/jvm14 Tag: cocoon_2_0_3_branch
avalon-excalibur-vm14-20020705.jar
Log:
Now the targetted jvm is detected automatically
Revision Changes Path
No revision
No revision
1.3.2.1 +10 -0 xml-cocoon2/INSTALL.src
Index: INSTALL.src
===================================================================
RCS file: /home/cvs/xml-cocoon2/INSTALL.src,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- INSTALL.src 3 Mar 2002 05:41:23 -0000 1.3
+++ INSTALL.src 12 Jul 2002 10:38:59 -0000 1.3.2.1
@@ -33,6 +33,16 @@
3) Create the Cocoon WAR package.
+ Due to the incompatibilities between JDK 1.3 and JDK 1.4, you have to
+ specify the targetted JVM for Cocoon before building. This is usually
+ done by setting your JAVA_HOME to the appropriate version as explained
+ above.
+ WARNING: Using a build targetted for one JVM on a different JVM
+ may result in runtime errors. So run Cocoon targetted for a
+ JVM only with this version.
+ The Cocoon build system automatically detects wheter you are using
+ JDK 1.4 or a previous version.
+
3a) Automatic install.
To create the package and automatically install it in your servlet
1.196.2.8 +76 -67 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196.2.7
retrieving revision 1.196.2.8
diff -u -r1.196.2.7 -r1.196.2.8
--- build.xml 11 Jul 2002 10:03:04 -0000 1.196.2.7
+++ build.xml 12 Jul 2002 10:38:59 -0000 1.196.2.8
@@ -118,72 +118,84 @@
<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 -->
- <!-- =================================================================== -->
- <path id="classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <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>
- </path>
-
- <path id="anttasks.classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <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>
- <fileset dir="./tools/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="scratchpad.classpath">
- <fileset dir="./lib/local">
- <include name="*.jar"/>
- </fileset>
- <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>
- <fileset dir="./src/scratchpad/lib">
- <include name="*.jar"/>
- </fileset>
- <!-- FIXME : how to build a path that references a property set in 'init'
target ? -->
- <pathelement path="./build/cocoon/classes"/>
- </path>
<!-- =================================================================== -->
<!-- Initialization target -->
<!-- =================================================================== -->
<target name="init">
+
<tstamp/>
+ <!-- Detecting the current jvm -->
+ <condition property="target.vm" value="1.4">
+ <equals arg1="1.4" arg2="${java.specification.version}"/>
+ </condition>
+ <condition property="target.vm" value="1.2">
+ <not>
+ <equals arg1="1.4" arg2="${java.specification.version}"/>
+ </not>
+ </condition>
+
+ <!-- =================================================================== -->
+ <!-- Identify Classpath -->
+ <!-- =================================================================== -->
+ <path id="classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="anttasks.classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./tools/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="scratchpad.classpath">
+ <fileset dir="./lib/local">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/core/jvm${target.vm}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./lib/optional">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="./src/scratchpad/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <!-- FIXME : how to build a path that references a property set in 'init'
target ? -->
+ <pathelement path="./build/cocoon/classes"/>
+ </path>
+
+ <!-- =================================================================== -->
+ <!-- Properties -->
+ <!-- =================================================================== -->
+
<property name="fullname" value="Apache Cocoon"/>
<property name="Name" value="Cocoon"/>
<property name="name" value="cocoon"/>
@@ -198,13 +210,11 @@
<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=" This build is targetted for use with JVM ${target.vm}"/>
<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"/>
@@ -212,7 +222,6 @@
<property name="deprecation" value="off"/>
<property name="nowarn" value="on"/>
<!-- <property name="build.compiler" value="classic"/> -->
- <property name="target.vm" value="1.2"/>
<property name="src.dir" value="./src"/>
<property name="java.dir" value="${src.dir}/java"/>
@@ -1141,7 +1150,7 @@
<taskdef name="xconf-tool" classname="XConfToolTask"
classpath="${tools.dir}/anttasks"/>
- <!-- Invoke the XConfTool to add optional entries for components -->
+ <!-- Invoke the XConfTool to add entries for optional components -->
<xconf-tool directory="${build.src}"
extension="xmap"
configuration="${build.war}/sitemap.xmap"/>
@@ -1199,7 +1208,7 @@
<fileset dir="${lib.dir}/core">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
<fileset dir="${lib.dir}/optional">
@@ -1224,7 +1233,7 @@
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
</copy>
@@ -1659,7 +1668,7 @@
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/core/jvm${jvm-target}">
+ <fileset dir="${lib.dir}/core/jvm${target.vm}">
<include name="*.jar"/>
</fileset>
</copy>
1.138.2.30 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.29
retrieving revision 1.138.2.30
diff -u -r1.138.2.29 -r1.138.2.30
--- changes.xml 12 Jul 2002 08:26:59 -0000 1.138.2.29
+++ changes.xml 12 Jul 2002 10:38:59 -0000 1.138.2.30
@@ -38,6 +38,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="add">
+ When Cocoon is built, the build system automatically detects the current jvm and
builds
+ a target for this virtual machine. This is eiter JVM 1.4 or JVM 1.2 upto 1.3.
+ </action>
<action dev="KP" type="fix">
Fixed current page indication in documentation menu (synced with HEAD).
</action>
No revision
No revision
1.11.2.9 +2 -2 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.11.2.8
retrieving revision 1.11.2.9
diff -u -r1.11.2.8 -r1.11.2.9
--- jars.xml 12 Jul 2002 09:43:06 -0000 1.11.2.8
+++ jars.xml 12 Jul 2002 10:38:59 -0000 1.11.2.9
@@ -15,7 +15,7 @@
<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.3 to be run on JVM 1.3 or earlier.)</description>
<used-by>Cocoon</used-by>
- <lib>core/jvm13/avalon-excalibur-vm13-20020705.jar</lib>
+ <lib>core/jvm1.2/avalon-excalibur-vm12-20020705.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
@@ -23,7 +23,7 @@
<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>
+ <lib>core/jvm1.4/avalon-excalibur-vm14-20020705.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/lib/core/jvm1.2/avalon-excalibur-vm12-20020705.jar
<<Binary file>>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/lib/core/jvm1.4/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]
