[MO-java-dev] CVS: mockobjects-java build.xml,1.21,1.22

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java
In directory usw-pr-cvs1:/tmp/cvs-serv6418

Modified Files:
	build.xml 
Log Message:
Added mock object extension for Jakarta HttpClient project


Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml	1 May 2002 11:36:18 -0000	1.21
+++ build.xml	9 May 2002 13:16:38 -0000	1.22
@@ -1,146 +1,62 @@
 <?xml version="1.0"?>
-<!--
-  =============================================================================
-    Build file for the mockobjects project.
-
-    The following Ant tasks must be available in your ant installation
-    (i.e. the Ant task themselves and their dependent jars need to be put
-    in ANT_HOME/lib) :
-
-        stylebook             [REQUIRED] For builing the documentation and
-                               web site.
-
-        junit                 [REQUIRED] For running the unit tests.
-
-    The following properties need to be set in a ./build.properties or
-    or ${user.home}/build.properties file :
-
-        dist.dir              [OPTIONAL] The directories where distributable
-                              files will be copied with version number
-                              postfixed. Required for the dist target only.
-                              Default is <root>/dist
-
-    To build any of the mocks for the j2ee library, you'll need to copy the
-    relevant version of
-        j2ee.jar
-    to <root>/lib>. The build script will pick this up and include whatever
-    extra mocks it has available for the given version of j2ee. At present,
-    we support:
-        j2ee 1.2
-        j2ee 1.3
-
-    This script should be started with the following command line :
-
-        ant <target>
-
-    Run "ant -projecthelp" to get a list of available targets.
-  =============================================================================
--->
 <project name="mockobjects" default="jar" basedir=".">
-<!-- Give user a chance to override without editing this file
-         (and without typing -D each time it compiles it) -->
   <property file="${user.home}/build.properties" />
-
   <property file="build.properties" />
-
   <property name="out.dir" value="out" />
-
   <property name="out.doc.dir" value="${out.dir}/doc" />
-
   <property name="out.javadoc.dir"
-  value="${out.doc.dir}/javadoc" />
-
+    value="${out.doc.dir}/javadoc" />
   <property name="core.classes" value="${out.dir}/core/classes" />
-
   <property name="jdk.classes" value="${out.dir}/jdk/classes" />
-
   <property name="j2ee.classes" value="${out.dir}/j2ee/classes" />
-
+  <property name="httpclient.classes"
+    value="${out.dir}/ext/httpclient/classes" />
   <property name="out.site.dir" value="${out.dir}/site" />
-
   <property name="out.src.dir" value="${out.dir}/src" />
-
   <property name="out.src.examples.dir"
-  value="${out.src.dir}/examples" />
-
-  <property name="out.conf.dir" value="${out.dir}/conf" />
-
+    value="${out.src.dir}/examples" />
   <property name="out.xdoc.doc.dir" value="${out.dir}/xdoc/doc" />
-
   <property name="out.xdoc.site.dir"
-  value="${out.dir}/xdoc/site" />
+    value="${out.dir}/xdoc/site" />
 
   <target name="project-properties">
     <property name="project.fullname" value="Mock Objects" />
-
     <property name="project.version" value="0.03" />
-
     <property name="project.name" value="mockobjects" />
-
-<!-- Miscellaneous settings -->
     <property name="year" value="2002" />
-
     <property name="debug" value="on" />
-
     <property name="optimize" value="off" />
-
     <property name="deprecation" value="off" />
   </target>
 
   <target name="source-locations">
     <property name="src.dir" value="src" />
-
     <property name="src.core.dir" value="${src.dir}/core" />
-
     <property name="src.j2ee.dir" value="${src.dir}/j2ee" />
-
     <property name="src.jdk.dir" value="${src.dir}/jdk" />
-
+    <property name="src.httpclient.dir" value="${src.dir}/extensions" />
     <property name="src.examples.dir"
-    value="${src.dir}/examples" />
-
+      value="${src.dir}/examples" />
     <property name="conf.dir" value="conf" />
-
     <property name="doc.dir" value="doc" />
-
     <property name="xdoc.dir" value="${doc.dir}/xdocs" />
-
     <property name="skin.dir" value="${doc.dir}/skins" />
-
     <property name="lib.dir" value="lib" />
   </target>
 
-<!-- Destination locations for the build (relative to the basedir as
-           specified in the basedir attribute of the project tag) -->
   <target name="deliverable-names" depends="project-properties">
     <property name="dist.dir" value="dist" />
-
     <property name="jar.base.name" value="mocks" />
-
     <property name="sources.zip.name"
-    value="${project.name}-src" />
-
-<!-- The project web site in a zip file (without the Javadoc but
-             with a link pointing to javadoc : <htdocs>/javadoc/index.html -->
+      value="${project.name}-src" />
     <property name="site.name" value="${project.name}-website" />
-
     <property name="javadoc.name"
-    value="${project.name}-javadoc" />
-
+      value="${project.name}-javadoc" />
     <property name="project.zip.name"
-    value="${project.name}-${project.version}" />
+      value="${project.name}-${project.version}" />
   </target>
 
   <target name="useful-file-patterns">
-<!-- All conf files (including test files) -->
-    <patternset id="nonjava.src.files">
-      <include name="**/*.txt" />
-
-      <include name="**/*.xml" />
-
-      <include name="**/*.properties" />
-    </patternset>
-
     <patternset id="java.src.files">
       <include name="**/*.java" />
     </patternset>
@@ -154,60 +70,45 @@
     </path>
 
     <available property="jdk.version" value="1.2"
-    classname="java.lang.ThreadLocal" />
-
+      classname="java.lang.ThreadLocal" />
     <available property="jdk.version" value="1.3"
-    classname="java.lang.StrictMath" />
-
+      classname="java.lang.StrictMath" />
     <available property="jdk.version" value="1.4"
-    classname="java.lang.CharSequence" />
-
+      classname="java.lang.CharSequence" />
     <available property="j2ee.version" value="1.2"
-    classpathref="lib.classpath"
-    classname="javax.servlet.Servlet" />
-
+      classpathref="lib.classpath"
+      classname="javax.servlet.Servlet" />
     <available property="j2ee.version" value="1.3"
-    classpathref="lib.classpath"
-    classname="javax.servlet.Filter" />
+      classpathref="lib.classpath"
+      classname="javax.servlet.Filter" />
+    <available property="httpclient" value="true"
+      classpathref="lib.classpath"
+      classname="org.apache.commons.httpclient.HttpClient" />
 
-<!-- sorry about this. It seems to be the easiest way to set a marker to describe
-            which j2ee the .jar supports. Later versions of Ant include an 'isset'
-            condition, which should do the trick -->
     <property name="jar.j2ee.name" value="" />
 
     <available property="jar.j2ee.name"
-    value="_j2ee${j2ee.version}" classpathref="lib.classpath"
-    classname="javax.servlet.Servlet" />
+      value="_j2ee${j2ee.version}" classpathref="lib.classpath"
+        classname="javax.servlet.Servlet" />
   </target>
 
   <target name="call-me-first"
-  depends="project-properties, useful-file-patterns, check-availabilities">
+    depends="project-properties, useful-file-patterns, check-availabilities">
 
-<!-- Initialize the build. Must be called by all targets -->
     <tstamp />
 
     <echo
     message="--------- ${project.fullname} ${project.version} ---------" />
-
     <echo message="" />
-
     <echo message="java.class.path = ${java.class.path}" />
-
     <echo message="" />
-
     <echo message="java.home = ${java.home}" />
-
     <echo message="user.home = ${user.home}" />
-
     <echo message="ant.home = ${ant.home}" />
-
     <echo message="" />
 
-<!-- Filters -->
     <filter token="version" value="${project.version}" />
-
     <filter token="year" value="${year}" />
-
     <filter token="today" value="${TODAY}" />
   </target>
 
@@ -243,15 +144,6 @@
     </copy>
   </target>
 
-  <target name="copy-java-files"
-  depends="source-locations, check-availabilities">
-    <antcall target="_copy-from-src">
-      <param name="copy.todir" value="${out.src.dir}" />
-
-      <param name="src.patternset.id" value="java.src.files" />
-    </antcall>
-  </target>
-
   <target name="compile-core" depends="call-me-first"
   description="Compile mock objects core">
     <mkdir dir="${core.classes}" />
@@ -327,6 +219,28 @@
     </javac>
   </target>
 
+  <target name="compile-ext-httpclient" depends="compile-jdk" if="httpclient"
+    description="Compile all the java files for included libraries">
+
+    <mkdir dir="${httpclient.classes}" />
+
+    <javac destdir="${httpclient.classes}" debug="${debug}"
+      deprecation="${deprecation}" verbose="false"
+      optimize="${optimize}">
+
+      <src path="${src.httpclient.dir}"/>
+      <include name="com/mockobjects/apache/**"/>
+      <include name="alt/org/apache/**"/>
+
+      <classpath>
+        <path refid="lib.classpath" />
+        <pathelement path="${java.class.path}" />
+        <pathelement path="${core.classes}" />
+        <pathelement path="${jdk.classes}" />
+      </classpath>
+    </javac>
+  </target>
+
   <target name="test" depends="call-me-first, compile-test"
   description="run the junit tests">
     <junit fork="yes" haltonfailure="yes">
@@ -359,72 +273,67 @@
   </target>
 
   <target name="copy-nonjava-files"
-  depends="source-locations, check-availabilities, call-me-first">
-<!--
-        <antcall target="_copy-from-src">
-            <param name="copy.todir" value="${out.classes.dir}" />
-            <param name="src.patternset.id" value="nonjava.src.files" />
-        </antcall>
--->
-  </target>
-
-  <target name="prepare-jar" depends="copy-nonjava-files">
-<!-- Copy the manifest in order to replace the version token filter -->
-    <copy todir="${out.conf.dir}" filtering="on">
-      <fileset dir="${conf.dir}">
-        <include name="manifest" />
-      </fileset>
-    </copy>
+    depends="source-locations, check-availabilities, call-me-first">
   </target>
 
   <target name="jar" depends="jar-core,jar-jdk,jar-j2ee"/>
 
-  <target name="jar-core" depends="test, prepare-jar"
-  description="Generate a mockobjects jar">
+  <target name="jar-core" depends="test"
+    description="Generate core mockobjects jar">
+
     <jar jarfile="${out.dir}/mockobjects-core.jar"
-      manifest="${out.conf.dir}/manifest">
+      manifest="${conf.dir}/manifest">
       <fileset dir="${core.classes}" />
     </jar>
   </target>
-  <target name="jar-jdk" depends="test, prepare-jar"
-  description="Generate a mockobjects jar">
+  <target name="jar-jdk" depends="test"
+  description="Generate jdk mockobjects jar">
     <jar jarfile="${out.dir}/mockobjects-jdk${jdk.version}.jar"
-      manifest="${out.conf.dir}/manifest">
+      manifest="${conf.dir}/manifest">
       <fileset dir="${jdk.classes}">
         <exclude name="alt/**"/>
       </fileset>
     </jar>
     <jar jarfile="${out.dir}/alt-jdk${jdk.version}.jar"
-      manifest="${out.conf.dir}/manifest">
+      manifest="${conf.dir}/manifest">
       <fileset dir="${jdk.classes}">
         <include name="alt/**"/>
       </fileset>
     </jar>
   </target>
-  <target name="jar-j2ee" depends="test, prepare-jar" if="j2ee.version"
-  description="Generate a mockobjects jar">
+  <target name="jar-j2ee" depends="test" if="j2ee.version"
+    description="Generate j2ee mockobjects jar">
     <jar jarfile="${out.dir}/mockobjects-j2ee${j2ee.version}.jar"
-      manifest="${out.conf.dir}/manifest">
+      manifest="${conf.dir}/manifest">
       <fileset dir="${j2ee.classes}">
         <exclude name="alt/**"/>
       </fileset>
     </jar>
     <jar jarfile="${out.dir}/alt-j2ee${j2ee.version}.jar"
-      manifest="${out.conf.dir}/manifest">
+      manifest="${conf.dir}/manifest">
       <fileset dir="${j2ee.classes}">
         <include name="alt/**"/>
       </fileset>
     </jar>
   </target>
-
-  <target name="prepare-javadoc" depends="copy-java-files">
-    <antcall target="_flush-dir">
-      <param name="flush.dir" value="${out.javadoc.dir}" />
-    </antcall>
+  <target name="jar-ext-httpclient" depends="test, compile-ext-httpclient"
+    description="Generate extention mockobjects jar">
+    <jar jarfile="${out.dir}/mockobjects-httpclient.jar"
+      manifest="${conf.dir}/manifest">
+      <fileset dir="${httpclient.classes}">
+        <exclude name="alt/**"/>
+      </fileset>
+    </jar>
+    <jar jarfile="${out.dir}/alt-httpclient.jar"
+      manifest="${conf.dir}/manifest">
+      <fileset dir="${httpclient.classes}">
+        <include name="alt/**"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="javadoc"
-  depends="call-me-first, deliverable-names, prepare-javadoc"
+  depends="call-me-first, deliverable-names"
   unless="javadoc.notrequired"
   description="Generate the javadoc for the current version">
     <javadoc sourcepath="${out.src.dir}"