--- build.xml.sav	2006-05-23 18:11:15.000000000 -0400
+++ build.xml	2006-06-12 08:48:34.000000000 -0400
@@ -43,21 +43,38 @@
 	</target>
 
 	<target name="compile-15"  if="HAVE_JDK_1.5">
-		<javac srcdir="${src-jdk15}"  destdir="${build.classesdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.4" source="1.4"/>
-		<javac srcdir="${tests-src-jdk15}"  destdir="${build.testsdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.5" source="1.5"/>
+		<antcall target="compile-15-main"/>
+		<antcall target="compile-15-tests"/>
 	</target>
 
 	<target name="compile" description="Compile all java files" depends="init">
+		<antcall target="compile-main"/>
+		<antcall target="compile-tests"/>
+		<antcall target="compile-15"/>
+	</target>
+
+	<target name="compile-main" description="Compile main java files" depends="init">
 		<javac srcdir="${src}"  destdir="${build.classesdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.4" source="1.4"/>
+		<antcall target="compile-15-main"/>
+	</target>
+
+	<target name="compile-tests" description="Compile test java files" depends="init">
 		<javac srcdir="${tests-src}"  destdir="${build.testsdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.4" source="1.4"/>
-		<antcall target="compile-15"/>
+	</target>
+
+	<target name="compile-15-main" description="Compile JDK15 main java files" depends="init">
+		<javac srcdir="${src-jdk15}"  destdir="${build.classesdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.4" source="1.4"/>
+	</target>
+
+	<target name="compile-15-tests" description="Compile JDK15 test java files" depends="init">
+		<javac srcdir="${tests-src-jdk15}"  destdir="${build.testsdir}" classpathref="build.classpath" compiler="modern" debug="on" optimize="true" target="1.5" source="1.5"/>
 	</target>
 
 	<target name="clean" description="Remove all the output files">
 		<delete dir="${build}" />
 	</target>
 
-	<target name="jar" depends="compile" description="Generates Serialization Package">
+	<target name="jar" depends="compile-main" description="Generates Serialization Package">
 		<mkdir dir="${assemble.jar}" />
 		<jar jarfile="${jar}">
 			<zipfileset dir="${build.classesdir}" />
@@ -167,6 +184,7 @@
         </receiver>
 
         <junit printsummary="true">
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <classpath refid="build.classpath">
             </classpath>
             <!-- <jvmarg value="-XrunjbossInspector:c:/temp/tst,wakeupOnStartup=true"/> -->
@@ -242,6 +260,23 @@
 
     </target>
 
+  <target name="javadocs">
+    <javadoc packagenames="org.jboss.serial.*"
+           sourcepath="src"
+           classpathref="build.classpath"
+           defaultexcludes="yes"
+           locale="en_US"
+           destdir="build/api"
+           author="true"
+           version="true"
+           use="true"
+           public="true"
+           nohelp="true"
+           windowtitle="JBoss Serialization">
+      <doctitle><![CDATA[<h1>JBoss Serialization</h1>]]></doctitle>
+      <bottom><![CDATA[<i>JBoss Serialization, a new approach to java-serialization.</i>]]></bottom>
+    </javadoc>
+  </target>
 
 
 </project>