[MO-java-dev] CVS: mockobjects-java build.xml,1.42,1.43

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

Update of /cvsroot/mockobjects/mockobjects-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4102

Modified Files:
	build.xml 
Log Message:
Path from tomy at users.sourceforge.net to build javadoc for user installed
jdk version


Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build.xml	14 May 2004 13:42:12 -0000	1.42
+++ build.xml	14 May 2004 14:03:41 -0000	1.43
@@ -109,7 +109,7 @@
                classname="org.apache.commons.httpclient.HttpClient" />
  
     <available property="jar.j2ee.name"
-               value="_j2ee${j2ee.version}"
+               value="-j2ee${j2ee.version}"
                classpathref="lib.classpath"
                classname="javax.servlet.Servlet" />
     <condition property="jar.j2ee.name" value="">
@@ -221,6 +221,7 @@
         <fileset dir="${core.classes}">
           <include name="test/**/Test*.class" />
           <exclude name="test/**/*Test*$*.class" />
+          <exclude name="test/**/TestExpectationCollection.class" />
           <exclude name="**/AllTests.class" />
         </fileset>
 
@@ -298,9 +299,9 @@
           description="Generate j2ee mockobjects jar">
     <antcall target="_inner-jar">
       <param name="jarfile.name"
-             value="${out.dir}/${ant.project.name}-jdk${jdk.version}-j2ee${j2ee.version}-${project.version}.jar" />
+             value="${out.dir}/${ant.project.name}-jdk${jdk.version}${jar.j2ee.name}-${project.version}.jar" />
       <param name="alt.jarfile.name"
-             value="${out.dir}/${ant.project.name}-alt-jdk${jdk.version}-j2ee${j2ee.version}-${project.version}.jar" />
+             value="${out.dir}/${ant.project.name}-alt-jdk${jdk.version}${jar.j2ee.name}-${project.version}.jar" />
       <param name="classes.dir" value="${j2ee.classes}" />
     </antcall>
   </target>
@@ -345,13 +346,14 @@
           depends="call-me-first, deliverable-names"
           unless="javadoc.notrequired"
           description="Generate the javadoc for the current version">
+    <mkdir dir="${out.javadoc.dir}-${jdk.version}${jar.j2ee.name}" />
     <javadoc packagenames="com.mockobjects.*,alt.*"
-             destdir="${out.javadoc.dir}"
-	     author="true"
-	     public="true" version="true" use="true"
-	     windowtitle="${project.fullname} ${project.version}"
-	     doctitle="${project.fullname} ${project.version}"
-	     bottom="Copyright &amp;copy; ${year} Mock Objects. All Rights Reserved.">
+      destdir="${out.javadoc.dir}-${jdk.version}${jar.j2ee.name}"
+	    author="true"
+      package="true" version="true" use="true"
+	    windowtitle="${project.fullname} ${project.version}"
+	    doctitle="${project.fullname} ${project.version}"
+	    bottom="Copyright &amp;copy; ${year} Mock Objects. All Rights Reserved.">
 
       <classpath>
         <path refid="lib.classpath" />
@@ -360,9 +362,9 @@
       <sourcepath>
         <pathelement path="${src.dir}/core"/>
         <pathelement path="${src.dir}/jdk/common"/>
-        <pathelement path="${src.dir}/jdk/1.3"/>
+        <pathelement path="${src.dir}/jdk/${jdk.version}"/>
         <pathelement path="${src.dir}/j2ee/common"/>
-        <pathelement path="${src.dir}/j2ee/1.3"/>
+        <pathelement path="${src.dir}/j2ee/${j2ee.version}"/>
       </sourcepath>
       <group title="Core" packages="com.mockobjects"/>
       <group title="JDK" packages="com.mockobjects.*"/>