diff -up glassfish-javamail/build.xml.orig glassfish-javamail/build.xml
--- glassfish-javamail/build.xml.orig	2007-11-23 11:26:53.000000000 -0500
+++ glassfish-javamail/build.xml	2007-11-23 11:29:52.000000000 -0500
@@ -19,9 +19,6 @@
  own identifying information: Portions Copyright [yyyy]
  [name of copyright owner]
 -->
-<!DOCTYPE project [
-  <!ENTITY commonBuild SYSTEM "../bootstrap/ant-common.xml">
-]>
 <project name="JavaMail" default="all" basedir=".">
 
 <!-- ========== Initialize Properties =================================== -->
@@ -32,10 +29,8 @@
     -->
     <property name="component.name" value="mail"/>
 
-    <property file="../bootstrap/project.properties"/>
     <property file="./build.properties"/>
     
-    &commonBuild;
 
     <!-- all -->
     <target name="all" depends="compile, assemble"
@@ -58,7 +53,7 @@
         </tstamp>
         <echo message="Building component ${component.name}"/>
         <mkdir dir="${component.classes.dir}"/>
-        <copy file="${glassfish.maven}/legal/LICENSE.txt"
+        <copy file="${basedir}/legal/LICENSE.txt"
                 toFile="${component.classes.dir}/META-INF/LICENSE.txt"/>
     </target>
 
@@ -74,10 +69,10 @@
         </copy>
         <javac srcdir="${src.dir}"
                destdir="${component.classes.dir}"
-               debug="${javac.debug}"
-               optimize="${javac.optimize}"
+               debug="on"
+               optimize="off"
                source="1.4"
-               deprecation="${javac.deprecation}"
+               deprecation="off"
                failonerror="true"
                target="1.4">
             <classpath>
@@ -362,10 +357,10 @@
                 </fileset>
         </javadoc>
     </target>
-
+<!--
     <target name="push-to-maven-prepare" depends="-push-to-maven-init, jar"
         description="creates an image for the 'push-to-maven' goal">
-        <delete dir="build/maven-repo" /><!-- clean it -->
+        <delete dir="build/maven-repo" />
         <maven-repository-importer destdir="build/maven-repo" version="${release.version}">
             <artifact jar="build/release/mail.jar" pom="mail.pom" srczip="build/mail.src.zip" />
         </maven-repository-importer>
@@ -375,4 +370,5 @@
         description="pushes jars to the java.net maven repository">
         <cvs-import src="build/maven-repo" dest="glassfish/repo" />
     </target>
+-->
 </project>