diff -up appserv-jstl/build.xml.orig appserv-jstl/build.xml
--- appserv-jstl/build.xml.orig	2007-11-26 15:15:10.000000000 -0500
+++ appserv-jstl/build.xml	2007-11-26 16:11:29.000000000 -0500
@@ -33,9 +33,6 @@
  only if the new code is made subject to such option by the copyright
  holder.
 -->
-<!DOCTYPE project [
-  <!ENTITY commonBuild SYSTEM "../bootstrap/ant-common.xml">
-]>
 <project name="standard" default="build" basedir=".">
 
   <!-- =================================================================== -->
@@ -51,7 +48,6 @@
   <!-- Inherited properties                                                -->
   <!-- =================================================================== -->
 
-  <property file="../bootstrap/project.properties"/>
   <property file="./build.properties"/>
 
   <!-- =================================================================== -->
@@ -59,7 +55,7 @@
   <!-- =================================================================== -->
     
   <property name="taglib.name"    value="standard"/>
-
+	
   <!--
         These property values are derived from the previously defined values,
 	and should not normally be overridden from the command line.
@@ -73,7 +69,6 @@
 	dist.tld                    Destination TLD file for tag library
   -->
 
-  &commonBuild;
 
   <!-- =================================================================== -->
   <!-- Destination Preparation                                             -->
@@ -101,6 +96,7 @@
     <mkdir dir="${build.library}/META-INF"/>
     <mkdir dir="${build.library}/classes"/>
     <mkdir dir="${build.library}/lib"/>
+    <mkdir dir="${build.library}/javadoc"/>
     <mkdir dir="${build.examples}"/>
     <mkdir dir="${build.examples}/WEB-INF"/>
     <mkdir dir="${build.examples}/WEB-INF/classes"/>
@@ -169,13 +165,13 @@
     </copy>
     
     <!-- Update javaee.jar -->
-    <jar destfile="${javaee.jar}"
+  <!--  <jar destfile="${javaee.jar}"
          basedir="${build.library}/classes"
          includes="javax/**"
-         update="true"/>
+         update="true"/>-->
 
     <!-- Create the JSTL jar -->
-    <jar destfile="${glassfish.lib.home}/appserv-jstl.jar"
+  <!--  <jar destfile="${glassfish.lib.home}/appserv-jstl.jar"
          manifest="appserv-jstl.mf"
          basedir="${build.library}/classes"
          includes="org/**">
@@ -191,7 +187,7 @@
         <attribute name="Implementation-Vendor-Id" value="com.sun"/>
         <attribute name="Extension-Name" value="javax.servlet.jsp.jstl"/>
       </manifest>         
-    </jar>        
+    </jar>-->        
   </target>
 
   <!-- Build the tag library and update PWC jars -->
@@ -249,7 +245,7 @@
 
   <!-- Assemble jstl.jar without updating glassfish/image/lib/ -->
   <target name="jar" depends="compile, cook-manifest">
-      <copy file="${glassfish.maven}/legal/CDDLv1.0.txt" tofile="${build.library}/META-INF/LICENSE.txt"/>
+      <copy file="CDDLv1.0.txt" tofile="${build.library}/META-INF/LICENSE.txt"/>
       <!-- copy the TLDs to META-INF -->
       <copy todir="${build.library}/META-INF">
         <fileset dir="conf" includes="*.tld"/>
@@ -332,7 +328,7 @@
   <!-- =================================================================== -->
 
   <!-- Create the entire set of distribution files -->
-  <target name="dist" depends="library-dist,examples-dist,documentation-dist,javadoc-dist"/>
+  <target name="dist" depends="library-dist,examples-dist,javadoc-dist"/>
 
   <!-- Create the library distribution files -->
   <target name="library-dist" depends="library-build, prepare-dist">
@@ -348,7 +344,7 @@
     </copy>
       
     <!-- LICENSE file copied at the top level of the distribution -->
-    <copy file="${glassfish.maven}/legal/CDDLv1.0.txt" tofile="${dist.library}/LICENSE.txt"/>
+    <copy file="CDDLv1.0.txt" tofile="${dist.library}/LICENSE.txt"/>
   </target>
 
   <!-- Create the examples application WAR file -->
@@ -372,23 +368,11 @@
   <target name="javadoc-dist" depends="prepare-dist">
    <javadoc packagenames="javax.servlet.jsp.jstl.*"
             sourcepath="src"
-            classpath="${servlet25.jar}:${jsp21.jar}:${el-api.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}:${xercesImpl.jar}:${xalan.jar}"
-            destdir="${dist.library}/javadoc"
+            classpath="${javaee.jar}"
+            destdir="${build.library}/javadoc"
             bottom='&lt;font size="-1"&gt;Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.&lt;/font&gt;'/>
   </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 -->
-        <maven-repository-importer destdir="build/maven-repo" version="${release.version}">
-            <artifact jar="${release.jstl.jar}" pom="jstl.pom" srczip="build/jstl.src.zip" />
-        </maven-repository-importer>
-    </target>
-
-    <target name="push-to-maven" depends="push-to-maven-prepare"
-        description="pushes jars to the java.net maven repository">
-        <cvs-import src="build/maven-repo" dest="glassfish/repo" />
-    </target>
 
   <!-- =================================================================== -->
   <!-- Nightly (components generated for the website)                      -->
@@ -478,8 +462,7 @@
     <copy todir="${release.dir}" >
       <fileset dir="${dist.dir}/${taglib.name}" excludes="doc/**"/>
     </copy>
-    <copy file="${glassfish.maven}/legal/CDDLv1.0.txt"   tofile="${release.dir}/LICENSE.txt"/>
-    <copy file="../README"    tofile="${release.dir}/README"/>
+    <copy file="CDDLv1.0.txt"   tofile="${release.dir}/LICENSE.txt"/>
     <zip zipfile="${dist.dir}/${release.name}.zip"
        basedir="${dist.dir}" includes="${release.name}/**"/>
     <tar tarfile="${dist.dir}/${release.name}.tar"
diff -up appserv-jstl/build.properties.orig appserv-jstl/build.properties
--- appserv-jstl/build.properties.orig	2007-11-26 15:57:43.000000000 -0500
+++ appserv-jstl/build.properties	2007-11-26 16:12:10.000000000 -0500
@@ -41,6 +41,11 @@ build.library = ${build.dir}
 build.examples = ${build.dir}/examples
 build.doc = ${build.dir}/doc
 dist.dir = ${base.dir}/dist
+#Adding the following since they are required by the ant script (But are missing here)
+dist.library=${dist.dir}
+dist.examples=${dist.dir}/examples
+dist.doc=${dist.dir}/doc
+dist.tld=${dist.dir}/tld
 
 # ----- Run Control Flags -----
 
@@ -56,9 +61,9 @@ dist.dir = ${base.dir}/dist
 
 # ----- Compile Control Flags -----
 
-javac.deprecation = true
-javac.debug = true
-javac.optimize = false
+javac.deprecation=off
+javac.debug=on
+javac.optimize=off
 
 # --------------------------------------------------
 #   REQUIRED LIBRARIES FOR UNIT TESTS