--- pal/pal-portal/build.xml	2007/03/07 07:05:13	1.11
+++ pal/pal-portal/build.xml	2007/03/10 01:15:22	1.12
@@ -197,7 +197,7 @@
 
   <target name="source.distribution" depends="display.logo"
           description="--> Create Binary Distribution">
-    <antcall target="clean.dist"/>
+    <antcall target="clean.installer"/>
     <antcall target="remove"/>
     <antcall target="checkout"/>
     <antcall target="update"/>
@@ -207,7 +207,7 @@
   <target name="binary.distribution" depends="display.logo"
           description="--> Create Binary Distribution">
     <property name="build.dist" value="true" />
-    <antcall target="clean.dist"/>
+    <antcall target="clean.installer"/>
     <antcall target="remove"/>
     <antcall target="checkout"/>
     <antcall target="update"/>
@@ -216,25 +216,17 @@
     <antcall target="create.binary.distribution"/>
   </target>
 
-  <target name="clean.dist" depends="display.logo"
+  <target name="clean.installer" depends="display.logo"
           description="--> Clean Portal and Portlets Distribution">
-    <delete dir="${dist.dir}" failonerror="false"/>
+    <ant antfile="${installer.dir}/build.xml" target="clean.installer" />
   </target>
 
   <target name="create.binary.distribution" depends="display.logo"
           description="--> Create Portal and Portlets Distribution">
     <property name="build.dist" value="true" />
-    <!-- Derby Base Build -->
-    <!--property name="install.name" value="derby" /-->
-    <ant antfile="${installer.dir}/build-installer.xml" target="clean" />
-    <antcall target="deploy.portal.for.dist"/>
+    <mkdir dir="${installer.portlets.dir}"/>
     <antcall target="deploy.portlets.for.dist"/>
-    <delete file="${dist.server.war.dir}/${org.apache.jetspeed.portal.artifactId}.war"/>
-    <copy file="${installer.resources.dir}/antinstall-config-derby.xml"
-        tofile="${dist.build.dir}/antinstall-config.xml" overwrite="true" />
-    <ant antfile="${installer.dir}/build-installer.xml" target="selfextract" />
-    <ant antfile="${installer.dir}/build-installer.xml" target="build.portletpack" />
-    <ant antfile="${installer.dir}/build-installer.xml" target="build.allportletpack" />
+    <ant antfile="${installer.dir}/build.xml" target="build.installer" />
   </target>
 
   <target name="deploy.portal.for.dist"