jsalvata 2002/12/29 09:01:46
Modified: . build.xml
src/core/org/apache/jmeter/util JMeterUtils.java
Log:
New build.xml
Revision Changes Path
1.76 +327 -408 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- build.xml 11 Dec 2002 16:07:08 -0000 1.75
+++ build.xml 29 Dec 2002 17:01:46 -0000 1.76
@@ -1,4 +1,16 @@
+<?xml version="1.0"?>
<project name="JMeter" default="all" basedir=".">
+ <description>
+ To build JMeter from source and install:
+ ./build.sh
+ To rebuild and install:
+ ./build.sh install
+ For more info:
+ ./build.sh -projecthelp
+ </description>
+
+ <!-- JMeter version -->
+ <property name="version" value="1.8+"/>
<!-- Where the class files should live -->
<property name="build.dir" value="build"/>
@@ -10,7 +22,7 @@
<property name="build.components" value="build/components"/>
<property name="build.functions" value="build/functions"/>
<property name="build.jorphan" value="build/jorphan"/>
-
+
<!-- Where the Sources live -->
<property name="src.dir" value="src"/>
<property name="src.core" value="src/core"/>
@@ -21,426 +33,333 @@
<property name="src.components" value="src/components"/>
<property name="src.functions" value="src/functions"/>
<property name="src.jorphan" value="src/jorphan"/>
-
+
<!-- Where the API documentation lives -->
<property name="docs.api.dest.dir" value="docs/api"/>
- <property name="version" value="1.8"/>
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="./docs"/>
<property name="printable_docs.dest" value="./printable_docs"/>
<property name="optimize" value="on"/>
- <property name="tools.jar" value="${java.home}/lib/tools.jar"/>
<!-- Build classpath -->
<path id="classpath">
- <fileset dir=".">
- <include name="**/lib/*.jar"/>
- <include name="**/ext/*.jar"/>
- </fileset>
- <pathelement location="${tools.jar}"/>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
</path>
- <path id="testClasspath">
- <path refid="classpath"/>
- </path>
-
<path id="srcpaths">
- <pathelement location="${src.core}"/>
- <pathelement location="${src.core}"/>
- <pathelement location="${src.components}"/>
- <pathelement location="${src.functions}"/>
- <pathelement location="${src.http}"/>
- <pathelement location="${src.ftp}"/>
- <pathelement location="${src.jdbc}"/>
- <pathelement location="${src.java}"/>
- <pathelement location="${src.jorphan}"/>
+ <pathelement location="${src.core}"/>
+ <pathelement location="${src.components}"/>
+ <pathelement location="${src.functions}"/>
+ <pathelement location="${src.http}"/>
+ <pathelement location="${src.ftp}"/>
+ <pathelement location="${src.jdbc}"/>
+ <pathelement location="${src.java}"/>
+ <pathelement location="${src.jorphan}"/>
</path>
-
- <target name="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.core}"/>
- <mkdir dir="${build.http}"/>
- <mkdir dir="${build.jdbc}"/>
- <mkdir dir="${build.ftp}"/>
- <mkdir dir="${build.java}"/>
- <mkdir dir="${build.components}"/>
- <mkdir dir="${build.functions}"/>
- <mkdir dir="${build.jorphan}"/>
- </target>
-
-
- <!--
- - Check for optional JSSE libs.
- -->
- <target name="check.jsse.libs">
- <available classname="com.sun.net.ssl.internal.ssl.Provider"
- property="jsse.present">
- <classpath refid="classpath"/>
- </available>
- </target>
-
- <!--
- - Check for optional JavaMail libs.
- -->
- <target name="check.mail.libs">
- <available classname="javax.mail.Transport"
- property="javamail.present">
- <classpath refid="classpath"/>
- </available>
- <available classname="javax.activation.DataHandler"
- property="javamail.complete"/>
- </target>
-
- <!--
- - Check for optional IAIK libs (related to SSL)
- -->
- <target name="check.iaik.libs">
- <available classname="iaik.protocol.https.Handler"
- property="isasilk.present">
- <classpath refid="classpath"/>
- </available>
- </target>
-
- <!--
- - Check for anakia task
- -->
- <target name="check.anakia">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present"/>
- </target>
-
- <target name="no.anakia" depends="check.anakia" unless="AnakiaTask.present">
- <echo>
- AnakiaTask is not present, documentation will not be generated.
- </echo>
- </target>
-
- <target name="ssl.message" depends="check.jsse.libs,iaik.message"
unless="jsse.present">
- <echo message="Classes for SSL not found in classpath"/>
- </target>
-
- <target name="iaik.message" depends="check.iaik.libs" unless="isasilk.present">
- <echo message="Classes for IAIK iSaSiLk not found in classpath"/>
- </target>
-
- <target name="mail.message" depends="check.mail.libs"
unless="javamail.complete">
- <echo message="Classes for Mail support not found in classpath"/>
- </target>
-
- <!--
- - Compiles the source into class files - dumping results into the
- - bin/clases directory
- -->
- <target name="compile_all"
depends="init,ssl.message,iaik.message,mail.message">
- <javac
- destdir="${build.dir}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <src>
- <path refid="srcpaths"/>
- </src>
- <include name="**/*.java"/>
- <exclude name="org/apache/jmeter/util/JsseSSLManager.java"
- unless="jsse.present"/>
- <exclude name="org/apache/jmeter/util/IaikSSLManager.java"
- unless="isasilk.present"/>
- <exclude name="org/apache/jmeter/util/keystore/PKCS12KeyStore.java"
- unless="isasilk.present"/>
- <exclude name="org/apache/jmeter/util/keystore/DefaultKeyStore.java"
- unless="jsse.present"/>
- <exclude name="org/apache/jmeter/visualizers/MailerVisualizer.java"
- unless="javamail.complete"/>
- <exclude name="org/apache/jmeter/visualizers/MailerModel.java"
- unless="javamail.complete"/>
- <exclude
name="org/apache/jmeter/reporters/MailerResultCollector.java"
- unless="javamail.complete"/>
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="compile_core" depends="init,compile_all">
- <copy tofile="${src.core}/org/apache/jmeter/util/JMeterUtils.java_temp"
-
file="${src.core}/org/apache/jmeter/util/JMeterUtils.java"
- overwrite="yes"/>
- <replace file="${src.core}/org/apache/jmeter/util/JMeterUtils.java"
- token="@VERSION@"
- value="${version}"/>
- <javac srcdir="${src.core}"
- destdir="${build.core}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <exclude name="org/apache/jmeter/util/JsseSSLManager.java"
- unless="jsse.present"/>
- <exclude name="org/apache/jmeter/util/IaikSSLManager.java"
- unless="isasilk.present"/>
- <exclude name="org/apache/jmeter/util/keystore/PKCS12KeyStore.java"
- unless="isasilk.present"/>
- <exclude name="org/apache/jmeter/util/keystore/DefaultKeyStore.java"
- unless="jsse.present"/>
- <exclude
name="org/apache/jmeter/reporters/MailerResultCollector.java"
- unless="javamail.complete"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- <copy tofile="${src.core}/org/apache/jmeter/util/JMeterUtils.java"
-
file="${src.core}/org/apache/jmeter/util/JMeterUtils.java_temp"
- overwrite="yes"/>
- <delete
file="${src.core}/org/apache/jmeter/util/JMeterUtils.java_temp"/>
- </target>
-
- <target name="compile_components" depends="init,compile_all">
- <javac srcdir="${src.components}"
- destdir="${build.components}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <exclude name="org/apache/jmeter/visualizers/MailerVisualizer.java"
- unless="javamail.complete"/>
- <exclude name="org/apache/jmeter/visualizers/MailerModel.java"
- unless="javamail.complete"/>
- <exclude
name="org/apache/jmeter/reporters/MailerResultCollector.java"
- unless="javamail.complete"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_functions" depends="init,compile_all">
- <javac srcdir="${src.functions}"
- destdir="${build.functions}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_http" depends="init,compile_all">
- <javac srcdir="${src.http}"
- destdir="${build.http}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_ftp" depends="init,compile_all">
- <javac srcdir="${src.ftp}"
- destdir="${build.ftp}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_jdbc" depends="init,compile_all">
- <javac srcdir="${src.jdbc}"
- destdir="${build.jdbc}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_java" depends="init,compile_all">
- <javac srcdir="${src.java}"
- destdir="${build.java}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_jorphan" depends="init,compile_all">
- <javac srcdir="${src.jorphan}"
- destdir="${build.jorphan}"
- optimize="${optimize}"
- debug="on"
- target="1.3">
- <include name="**/*.java"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${build.dir}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile_protocols"
depends="clean,compile_http,compile_ftp,compile_jdbc,compile_java,compile_jorphan"/>
-
- <target name="compile"
depends="clean,compile_core,compile_components,compile_functions,compile_protocols"/>
-
- <target name="rmi" depends="compile">
- <rmic base="${build.core}"
classname="org.apache.jmeter.engine.RemoteJMeterEngineImpl">
- <classpath>
- <path refid="classpath"/>
- <pathelement path="${build.core}"/>
- <pathelement path="${build.jorphan}"/>
- </classpath>
- </rmic>
-
- <rmic classpath="${build.core}" base="${build.core}"
classname="org.apache.jmeter.samplers.RemoteSampleListenerImpl"/>
- </target>
-
- <!--
- - Generates java-docs
- -->
- <target name="api-docs">
- <mkdir dir="${docs.api.dest.dir}"/>
- <javadoc sourcepathref="srcpaths"
- destdir="${docs.api.dest.dir}"
- Protected="yes" author="yes" version="yes"
- doctitle="Apache JMeter APIs Specification"
- windowtitle="Apache JMeter API Specification"
- header="<b>Apache
JMeter</b><br><font size='-1'>1.7</font>"
- bottom="Copyright © 1998-2002 Apache Software
Foundation. All Rights Reserved."
- packagenames="org.apache.jmeter.*">
- <classpath refid="classpath"/>
- </javadoc>
- </target>
-
- <!--
- - Creates the ApacheJMeter.jar file.
- -->
- <target name="package" depends="compile,rmi">
- <copy toDir="${build.core}/org/apache/jmeter/images">
- <fileset dir="${src.core}/org/apache/jmeter/images"/>
- </copy>
- <copy toDir="${build.core}/org/apache/jmeter/resources">
- <fileset dir="${src.core}/org/apache/jmeter/resources">
- <exclude name="*eucJP*"/>
- </fileset>
- </copy>
- <copy toFile="${build.core}/org/apache/jmeter/help.txt"
- file="${src.core}/org/apache/jmeter/help.txt"/>
- <mkdir dir="./lib/ext/"/>
-
- <jar jarfile="./lib/ext/ApacheJMeter_core.jar" excludes="**/NewDriver*"
manifest="${src.core}/MANIFEST" basedir="${build.core}"/>
- <jar jarfile="bin/ApacheJMeter.jar" includes="**/NewDriver*"
manifest="${src.core}/MANIFEST" basedir="${build.core}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_components.jar"
basedir="${build.components}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_functions.jar"
basedir="${build.functions}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_http.jar" basedir="${build.http}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_ftp.jar" basedir="${build.ftp}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_jdbc.jar" basedir="${build.jdbc}"/>
- <jar jarfile="./lib/ext/ApacheJMeter_java.jar" basedir="${build.java}"/>
- <jar jarfile="./lib/jorphan.jar" basedir="${build.jorphan}"/>
- </target>
-
- <!--
- - Copies the jar file to bin/ and everything else needed to run JMeter
- - from bin/.
- -->
- <target name="install" depends="package">
- <fixcrlf srcdir="." eol="lf" includes="**/jmeter,**/jmeter-server" />
- </target>
-
- <!--
- - Another name for install(?)
- -->
- <target name="all" depends="install"/>
-
- <target name="assume_packages_present">
- <property name="jsse.present" value="assume"/>
- <property name="javamail.present" value="assume"/>
- <property name="javamail.complete" value="assume"/>
- </target>
-
- <!--
- - Creates the distribution packages
- -->
- <target name="dist" depends="assume_packages_present,clean,install">
- <zip zipfile="../ApacheJMeter_${version}.zip">
- <fileset dir="../">
- <include name="jakarta-jmeter/**"/>
- <exclude name="**/build/**"/>
- <exclude name="**/classes*/**"/>
- <exclude name="**/xdocs/**"/>
- <exclude name="jakarta-jmeter/ext/**"/>
- </fileset>
- </zip>
- <tar tarfile="../ApacheJMeter_${version}.tar" basedir=".."
includes="jakarta-jmeter/**"
-
excludes="**/classes*/**,**/xdocs/**,jakarta-jmeter/ext/**,**/build/**"/>
- <gzip zipfile="../ApacheJMeter_${version}.tar.gz"
src="../ApacheJMeter_${version}.tar" />
- </target>
-
- <!--
- - Deletes old build files.
- -->
- <target name="clean">
- <delete file="bin/ApacheJMeter.jar"/>
- <delete dir="lib/ext"/>
- <delete dir="${build.dir}"/>
- <delete dir="${docs.api.dest.dir}"/>
- </target>
-
-
- <target name="docs" depends="no.anakia" if="AnakiaTask.present">
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
- <anakia basedir="${docs.src}" destdir="${docs.dest}/"
- extension=".html" style="./xdocs/stylesheets/site.vsl"
- projectFile="./stylesheets/project.xml"
- excludes="**/stylesheets/**"
- includes="**/*.xml"
- lastModifiedCheck="true"
-
velocityPropertiesFile="${docs.src}/velocity.properties"/>
- <copy todir="${docs.dest}">
- <fileset dir="${docs.src}">
- <include name="images/**"/>
- <include name="demos/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="printable_docs" depends="no.anakia" if="AnakiaTask.present">
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
- <anakia basedir="${docs.src}" destdir="${docs.dest}/"
- extension=".html"
style="./xdocs/stylesheets/site_printable.vsl"
- projectFile="./stylesheets/project.xml"
- excludes="**/stylesheets/**"
- includes="**/*.xml"
- lastModifiedCheck="true"
-
velocityPropertiesFile="${docs.src}/velocity.properties"/>
-
- </target>
-
- <target name="test" depends="install">
- <java classname="org.apache.jorphan.test.AllTests" fork="yes"
dir="${basedir}/bin">
- <classpath refid="testClasspath"/>
- <arg value="../lib/ext"/>
- <arg value="./jmeter.properties"/>
- <arg value="org.apache.jmeter.util.JMeterUtils"/>
- </java>
+
+ <target name="init" depends="check-libs,report-missing-libs"/>
+ <target name="init-docs" depends="check-anakia,report-anakia-missing"/>
+
+ <!--
+ - Check for optional libraries.
+ -->
+ <target name="check-libs" description="Check availability of optional libraries."
unless="assuming.libs.present">
+ <available classname="com.sun.net.ssl.internal.ssl.Provider"
property="jsse.present">
+ <classpath refid="classpath"/>
+ </available>
+ <available classname="javax.mail.Transport" property="javamail.present">
+ <classpath refid="classpath"/>
+ </available>
+ <available classname="javax.activation.DataHandler"
property="javamail.complete"/>
+ <available classname="iaik.protocol.https.Handler" property="isasilk.present">
+ <classpath refid="classpath"/>
+ </available>
+ </target>
+
+ <!--
+ - Messages for missing libraries
+ -->
+ <target name="ssl-message" depends="check-libs" unless="jsse.present">
+ <echo message="Classes for SSL not found in classpath"/>
+ </target>
+
+ <target name="iaik-message" depends="check-libs" unless="isasilk.present">
+ <echo message="Classes for IAIK iSaSiLk not found in classpath"/>
+ </target>
+
+ <target name="mail-message" depends="check-libs" unless="javamail.complete">
+ <echo message="Classes for Mail support not found in classpath"/>
+ </target>
+
+ <target name="report-missing-libs"
depends="ssl-message,iaik-message,mail-message"/>
+
+ <!--
+ - Check for anakia task
+ -->
+ <target name="check-anakia">
+ <available classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"/>
+ </target>
+ <target name="report-anakia-missing" depends="check-anakia"
unless="AnakiaTask.present">
+ <echo>
+ AnakiaTask is not present, documentation will not be generated.
+ </echo>
+ </target>
+
+ <!--
+ <target name="copy-data">
+ <copy toDir="${build.core}/org/apache/jmeter/images">
+ <fileset dir="${src.core}/org/apache/jmeter/images"/>
+ </copy>
+ <copy toDir="${build.core}/org/apache/jmeter/resources">
+ <fileset dir="${src.core}/org/apache/jmeter/resources">
+ <exclude name="*eucJP*"/>
+ </fileset>
+ </copy>
+ <copy toFile="${build.core}/org/apache/jmeter/help.txt"
file="${src.core}/org/apache/jmeter/help.txt"/>
+ </target>
+ -->
+
+ <target name="compile-core" depends="compile-jorphan" description="Compile JMeter
core classes.">
+ <mkdir dir="${build.core}"/>
+ <replaceregexp file="${src.core}/org/apache/jmeter/util/JMeterUtils.java"
+ match="VERSION=".*?""
+ replace="VERSION="${version}""/>
+ <javac srcdir="${src.core}" destdir="${build.core}" optimize="${optimize}"
debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <exclude name="org/apache/jmeter/util/JsseSSLManager.java"
unless="jsse.present"/>
+ <exclude name="org/apache/jmeter/util/IaikSSLManager.java"
unless="isasilk.present"/>
+ <exclude name="org/apache/jmeter/util/keystore/PKCS12KeyStore.java"
unless="isasilk.present"/>
+ <exclude name="org/apache/jmeter/util/keystore/DefaultKeyStore.java"
unless="jsse.present"/>
+ <exclude name="org/apache/jmeter/reporters/MailerResultCollector.java"
unless="javamail.complete"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-components" depends="compile-jorphan,compile-core"
description="Compile generic (protocol-independent) components.">
+ <mkdir dir="${build.components}"/>
+ <javac srcdir="${src.components}" destdir="${build.components}"
optimize="${optimize}" debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <exclude name="org/apache/jmeter/visualizers/MailerVisualizer.java"
unless="javamail.complete"/>
+ <exclude name="org/apache/jmeter/visualizers/MailerModel.java"
unless="javamail.complete"/>
+ <exclude name="org/apache/jmeter/reporters/MailerResultCollector.java"
unless="javamail.complete"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-functions" depends="compile-jorphan,compile-core"
description="Compile functions.">
+ <mkdir dir="${build.functions}"/>
+ <javac srcdir="${src.functions}" destdir="${build.functions}"
optimize="${optimize}" debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-http" depends="compile-jorphan,compile-core"
description="Compile components specific to HTTP sampling.">
+ <mkdir dir="${build.http}"/>
+ <javac srcdir="${src.http}" destdir="${build.http}" optimize="${optimize}"
debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-ftp" depends="compile-jorphan,compile-core"
description="Compile components specific to FTP sampling.">
+ <mkdir dir="${build.ftp}"/>
+ <javac srcdir="${src.ftp}" destdir="${build.ftp}" optimize="${optimize}"
debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-jdbc" depends="compile-jorphan,compile-core"
description="Compile components specific to JDBC sampling.">
+ <mkdir dir="${build.jdbc}"/>
+ <javac srcdir="${src.jdbc}" destdir="${build.jdbc}" optimize="${optimize}"
debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
</target>
+ <target name="compile-java" depends="compile-jorphan,compile-core"
description="Compile components specific to Java sampling.">
+ <mkdir dir="${build.java}"/>
+ <javac srcdir="${src.java}" destdir="${build.java}" optimize="${optimize}"
debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-protocols"
depends="compile-http,compile-ftp,compile-jdbc,compile-java" description="Compile all
protocol-specific components."/>
+
+ <target name="compile-jorphan" depends="init" description="Compile JOrphan
utility classes.">
+ <mkdir dir="${build.jorphan}"/>
+ <javac srcdir="${src.jorphan}" destdir="${build.jorphan}"
optimize="${optimize}" debug="on" target="1.3">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="compile-rmi" depends="compile-jorphan,compile-core"
description="Compile RMI stubs and skeletons.">
+ <rmic base="${build.core}"
classname="org.apache.jmeter.engine.RemoteJMeterEngineImpl">
+ <classpath>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement path="${build.core}"/>
+ </classpath>
+ </rmic>
+ <rmic classpath="${build.core}" base="${build.core}"
classname="org.apache.jmeter.samplers.RemoteSampleListenerImpl"/>
+ </target>
+
+ <target name="compile"
depends="compile-core,compile-components,compile-functions,compile-protocols,compile-rmi"
description="Compile everything."/>
+
+ <target name="api-docs" description="Generate the API documentation.">
+ <mkdir dir="${docs.api.dest.dir}"/>
+ <javadoc sourcepathref="srcpaths" destdir="${docs.api.dest.dir}"
Protected="yes" author="yes" version="yes" doctitle="Apache JMeter APIs Specification"
windowtitle="Apache JMeter API Specification" header="<b>Apache
JMeter</b><br><font size='-1'>1.7</font>" bottom="Copyright
© 1998-2002 Apache Software Foundation. All Rights Reserved."
packagenames="org.apache.jmeter.*">
+ <classpath refid="classpath"/>
+ </javadoc>
+ </target>
+
+ <target name="package" depends="compile">
+ <mkdir dir="lib/ext"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_core.jar" excludes="**/NewDriver*"
manifest="${src.core}/MANIFEST">
+ <fileset dir="${build.core}"/>
+ <fileset dir="${src.core}" includes="org/apache/jmeter/images/"/>
+ <fileset dir="${src.core}" includes="org/apache/jmeter/resources/">
+ <exclude name="*eucJP*"/>
+ </fileset>
+ <fileset dir="${src.core}" includes="org/apache/jmeter/help.txt"/>
+ </jar>
+ <jar jarfile="bin/ApacheJMeter.jar" includes="**/NewDriver*"
manifest="${src.core}/MANIFEST" basedir="${build.core}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_components.jar"
basedir="${build.components}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_functions.jar"
basedir="${build.functions}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_http.jar" basedir="${build.http}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_ftp.jar" basedir="${build.ftp}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_jdbc.jar" basedir="${build.jdbc}"/>
+ <jar jarfile="./lib/ext/ApacheJMeter_java.jar" basedir="${build.java}"/>
+ <jar jarfile="./lib/jorphan.jar" basedir="${build.jorphan}"/>
+ </target>
+
+ <target name="install" depends="package" description="Install JMeter.">
+ <fixcrlf srcdir="." eol="lf" includes="**/jmeter,**/jmeter-server"/>
+ </target>
+
+ <target name="all" depends="clean,install" description="Default target: build
from source and install."/>
+
+ <target name="assume-libs-present">
+ <property name="assuming.libs.present" value="true"/>
+
+ <property name="jsse.present" value="assume"/>
+ <property name="isasilk.present" value="assume"/>
+ <property name="javamail.present" value="assume"/>
+ <property name="javamail.complete" value="assume"/>
+ </target>
+
+ <patternset id="dist.sources">
+ <include name="**"/>
+ <exclude name="bin/ApacheJMeter.jar"/>
+ <exclude name="lib/jorphan.jar"/>
+ <exclude name="lib/ext/"/>
+ <exclude name="${build.dir}/"/>
+ <exclude name="${docs.api.dest.dir}"/>
+ </patternset>
+
+ <patternset id="dist.binaries">
+ <include name="**"/>
+ <exclude name="build/"/>
+ <exclude name="xdocs/"/>
+ <exclude name="src/"/>
+ </patternset>
+
+ <target name="dist" depends="assume-libs-present,clean,install,all-docs"
description="Create the distribution packages.">
+ <zip zipfile="../ApacheJMeter_${version}.zip">
+ <zipfileset dir="." prefix="jakarta-jmeter-${version}">
+ <patternset refid="dist.binaries"/>
+ </zipfileset>
+ </zip>
+ <zip zipfile="../ApacheJMeter_${version}.src.zip">
+ <zipfileset dir="." prefix="jakarta-jmeter-${version}">
+ <patternset refid="dist.sources"/>
+ </zipfileset>
+ </zip>
+ <tar destfile="../ApacheJMeter_${version}.tar" longfile="gnu">
+ <tarfileset dir="." prefix="jakarta-jmeter-${version}">
+ <patternset refid="dist.binaries"/>
+ </tarfileset>
+ </tar>
+ <tar destfile="../ApacheJMeter_${version}.src.tar" longfile="gnu">
+ <tarfileset dir="." prefix="jakarta-jmeter-${version}">
+ <patternset refid="dist.sources"/>
+ </tarfileset>
+ </tar>
+ <gzip zipfile="../ApacheJMeter_${version}.tgz"
src="../ApacheJMeter_${version}.tar" />
+ <gzip zipfile="../ApacheJMeter_${version}.src.tgz"
src="../ApacheJMeter_${version}.src.tar" />
+ </target>
+
+ <target name="clean" description="Clean up to force a build from source.">
+ <delete file="bin/ApacheJMeter.jar"/>
+ <delete file="lib/jorphan.jar"/>
+ <delete dir="lib/ext"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${docs.api.dest.dir}"/>
+ </target>
+
+ <target name="docs" depends="init-docs" if="AnakiaTask.present"
description="Generate browsable HTML documentation.">
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
+ <anakia basedir="${docs.src}" destdir="${docs.dest}/" extension=".html"
style="./xdocs/stylesheets/site.vsl" projectFile="./stylesheets/project.xml"
excludes="**/stylesheets/**" includes="**/*.xml" lastModifiedCheck="true"
velocityPropertiesFile="${docs.src}/velocity.properties"/>
+ <copy todir="${docs.dest}">
+ <fileset dir="${docs.src}">
+ <include name="images/**"/>
+ <include name="demos/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="printable-docs" depends="init-docs" if="AnakiaTask.present"
description="Generate printable HTML documentation.">
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
+ <anakia basedir="${docs.src}" destdir="${docs.dest}/" extension=".html"
style="./xdocs/stylesheets/site_printable.vsl" projectFile="./stylesheets/project.xml"
excludes="**/stylesheets/**" includes="**/*.xml" lastModifiedCheck="true"
velocityPropertiesFile="${docs.src}/velocity.properties"/>
+ </target>
+
+ <target name="all-docs" depends="docs,printable-docs,api-docs"
description="Generate documentation."/>
+
+ <target name="test" depends="install" description="Run tests">
+ <java classname="org.apache.jorphan.test.AllTests" fork="yes"
dir="${basedir}/bin">
+ <classpath>
+ <path refid="classpath"/>
+ <fileset dir="./lib/ext">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+
+ <arg value="../lib/ext"/>
+ <arg value="./jmeter.properties"/>
+ <arg value="org.apache.jmeter.util.JMeterUtils"/>
+ </java>
+ </target>
</project>
1.11 +4 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMeterUtils.java 27 Dec 2002 15:51:17 -0000 1.10
+++ JMeterUtils.java 29 Dec 2002 17:01:46 -0000 1.11
@@ -2,7 +2,7 @@
* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@
*/
public class JMeterUtils implements UnitTestManager
{
+ private static final String VERSION="1.8+";
+
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.util");
private static LoggingManager logManager;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
