You are viewing a plain text version of this content. The canonical link for it is here.
Posted to servletapi-dev@jakarta.apache.org by cr...@apache.org on 2002/07/08 22:59:18 UTC
cvs commit: jakarta-servletapi/src/etc manifest
craigmcc 2002/07/08 13:59:18
Modified: . build.xml
Added: src/etc manifest
Log:
Updates for the Servlet 2.2 / JSP 1.1 API repository:
* Add manifest to the generated servlet.jar file.
* Move "build" and "dist" directories back inside the top-level
source directory compatible with current practice in other repositories
* Make compiler control options property-based.
Submitted by: Larry Isaacs <Larry.Isaacs at sas.com>
Revision Changes Path
1.6 +22 -11 jakarta-servletapi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-servletapi/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 5 Dec 2000 05:40:05 -0000 1.5
+++ build.xml 8 Jul 2002 20:59:17 -0000 1.6
@@ -2,10 +2,12 @@
<!-- =================== Environmental Properties ======================= -->
- <property name="ant.home" value="../jakarta-ant" />
- <property name="build.compiler" value="classic"/>
- <property name="servletapi.build" value="../build/servletapi"/>
- <property name="servletapi.dist" value="../dist/servletapi"/>
+ <property name="compile.debug" value="true"/>
+ <property name="compile.deprecation" value="false"/>
+ <property name="compile.optimize" value="true"/>
+ <property name="implementation.revision" value="1"/>
+ <property name="servletapi.build" value="build"/>
+ <property name="servletapi.dist" value="dist"/>
<property name="servletapi.lib" value="lib"/>
<!-- ===================== Prepare Directories ========================= -->
@@ -28,11 +30,11 @@
<!-- ======================== Compile Classes ========================== -->
<target name="compile" depends="prepare">
<javac srcdir="src/share" destdir="${servletapi.build}/classes"
- debug="on" optimize="on" deprecation="on"/>
-
+ debug="${compile.debug}" deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"/>
<copy todir="${servletapi.build}/classes">
<fileset dir="src/share">
- <include name="**/*.properties"/>
+ <exclude name="**/*.java"/>
</fileset>
</copy>
</target>
@@ -45,24 +47,33 @@
use="true"
windowtitle="Servlet and JavaServer Pages API Documentation"
doctitle="Servlet and JavaServer Pages API Documentation"
- bottom="Copyright &copy; 1999-2000 The Apache Software Foundation. All Rights Reserved."/>
+ bottom="Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved."/>
</target>
-
<!-- ===================== Distribution Files ========================= -->
<target name="dist" depends="compile,javadoc">
<copy todir="${servletapi.dist}/docs/api">
<fileset dir="${servletapi.build}/docs/api"/>
</copy>
+ <copy tofile="${servletapi.build}/manifest"
+ file="src/etc/manifest" overwrite="yes">
+ <filterset>
+ <filter token="implementation.revision"
+ value="${implementation.revision}"/>
+ </filterset>
+ </copy>
+
<jar jarfile="${servletapi.dist}/lib/servlet.jar"
- basedir="${servletapi.build}/classes"/>
+ basedir="${servletapi.build}/classes"
+ manifest="${servletapi.build}/manifest"/>
- <copy file="build.xml" tofile="${servletapi.dist}/lib/build.xml"/>
+ <copy file="LICENSE" tofile="${servletapi.dist}"/>
<copy todir="${servletapi.dist}/src">
<fileset dir="src/share"/>
</copy>
<copy file="${servletapi.dist}/lib/servlet.jar" tofile="${servletapi.lib}/servlet.jar"/>
+
</target>
<!-- ====================== Clean Generated Files ===================== -->
1.1 jakarta-servletapi/src/etc/manifest
Index: manifest
===================================================================
Manifest-version: 1.0
Name: javax/servlet/
Specification-Title: Java API for Servlets
Specification-Version: 2.2
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet
Implementation-Version: 2.2.@implementation.revision@
Implementation-Vendor: Apache Software Foundation
Name: javax/servlet/jsp/
Specification-Title: Java API for JavaServer Pages
Specification-Version: 1.1
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet.jsp
Implementation-Version: 1.1.@implementation.revision@
Implementation-Vendor: Apache Software Foundation
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>