Author: ias
Date: Fri Oct 8 16:30:46 2004
New Revision: 54131
Modified:
incubator/beehive/trunk/wsm/build.xml
Log:
Change JDK 1.5 to JDK 5 and later. Remove source="1.5" because it's default in
JDK 5 compiler.
Modified: incubator/beehive/trunk/wsm/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Fri Oct 8 16:30:46 2004
@@ -22,8 +22,8 @@
<property environment="os"/>
<property file="../beehive.properties"/>
- <!-- THE WSM BUILD REQUIRES JDK1.5. ATTEMPTS TO BUILD ON JDK1.4 WILL BE A
NOOP -->
- <condition property="isJDK15">
+ <!-- THE WSM BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON JDK
EALRIER THAN 5.0 WILL BE A NOOP -->
+ <condition property="isJDKOver5">
<equals arg1="${ant.java.version}" arg2="1.5"/>
</condition>
@@ -118,7 +118,7 @@
<echo message="runtime - Compiles the runtime source code of the
project."/>
<echo message="axis - Compiles the axis dependent source code of
the project."/>
<echo
message="================================================================" />
- <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK1.5
|" />
+ <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND LATER
|" />
<echo
message="================================================================" />
<echo message="" />
<echo message="" />
@@ -137,7 +137,7 @@
<!-- ==================================================================== -->
<!-- Compiles the source code of the project. -->
<!-- ==================================================================== -->
- <target name="classes" depends="api, runtime" if="isJDK15">
+ <target name="classes" depends="api, runtime" if="isJDKOver5">
<!-- Copy template files into the build -->
<copy todir="${runtime.classes}" overwrite="true" >
<fileset dir="${runtime.dir}"
includes="**/*.template,**/*.vm,META-INF/**" />
@@ -149,22 +149,22 @@
</copy>
</target>
- <target name="api" depends="dirs" if="isJDK15">
+ <target name="api" depends="dirs" if="isJDKOver5">
<!-- Build the API classes -->
- <javac destdir="${api.classes}" classpathref="api.classpath" source="1.5"
debug="on" >
+ <javac destdir="${api.classes}" classpathref="api.classpath" debug="on" >
<src path="${api.dir}"/>
</javac>
</target>
- <target name="runtime" depends="api" if="isJDK15">
+ <target name="runtime" depends="api" if="isJDKOver5">
<!-- Build the runtime classes -->
- <javac destdir="${runtime.classes}" classpathref="runtime.classpath"
source="1.5" debug="on">
+ <javac destdir="${runtime.classes}" classpathref="runtime.classpath"
debug="on">
<src path="${runtime.dir}"/>
<exclude name="**/axis/**"/>
</javac>
</target>
- <target name="axis" depends="runtime" if="isJDK15">
+ <target name="axis" depends="runtime" if="isJDKOver5">
<!-- Build the badtiger classes using source=1.4 compile flag -->
<echo message="BadTiger build"/>
<javac destdir="${runtime.classes}" classpathref="axis.classpath"
source="1.4" debug="on">
@@ -174,7 +174,7 @@
<!-- Build the axis classes -->
<echo message="AXIS build"/>
- <javac destdir="${runtime.classes}" classpathref="axis.classpath"
source="1.5" debug="on">
+ <javac destdir="${runtime.classes}" classpathref="axis.classpath"
debug="on">
<src path="${runtime.dir}"/>
<include name="**/axis/**"/>
<exclude name="**/axis/badtiger/**"/>
@@ -187,7 +187,7 @@
<!-- ==================================================================== -->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ==================================================================== -->
- <target name="build" depends="classes" if="isJDK15">
+ <target name="build" depends="classes" if="isJDKOver5">
<echo message="--------------------------------------------------" />
<echo message="| WSM build starting |" />
<echo message="--------------------------------------------------" />
@@ -205,7 +205,7 @@
</target>
- <target name="build_axis" depends="axis" if="isJDK15">
+ <target name="build_axis" depends="axis" if="isJDKOver5">
<echo message="--------------------------------------------------" />
<echo message="| WSM-AXIS build starting |" />
<echo message="--------------------------------------------------" />
@@ -264,7 +264,7 @@
<!-- ==================================================================== -->
<!-- deploy -->
<!-- ==================================================================== -->
- <target name="deploy" depends="build_all" if="isJDK15">
+ <target name="deploy" depends="build_all" if="isJDKOver5">
<echo message="--------------------------------------------------" />
<echo message="| WSM deploy starting |" />
<echo message="--------------------------------------------------" />
@@ -311,7 +311,7 @@
<!-- ==================================================================== -->
<!-- docs -->
<!-- ==================================================================== -->
- <target name="docs" if="isJDK15">
+ <target name="docs" if="isJDKOver5">
<javadoc
destdir="${docs.dir}"
maxmemory="256M"
@@ -322,8 +322,7 @@
use="true"
additionalparam="-breakiterator -noqualifier all"
useexternalfile="true"
- classpathref="runtime.classpath"
- source="1.5">
+ classpathref="runtime.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes">
</packageset>
<packageset dir="${runtime.dir}" defaultexcludes="yes">
