Attachment #25382 for bug #49236

View | Details | Raw Unified | Return to bug 49236
Collapse All | Expand All




    -->

    <!-- Protocol handlers - AJP -->
    <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar">
      <fileset dir="${tomcat.build}/classes">
        <include name="org/apache/coyote/ajp/**" />
        <include name="org/apache/jk/**" />


    <!-- Coyote API -->
    <delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
    <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
      <fileset dir="${tomcat.build}/classes">
        <include name="org/apache/coyote/*" />
        <include name="org/apache/coyote/memory/*" />

    </ant>

    <!-- Protocol handlers - HTTP -->
    <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar">
      <fileset dir="${tomcat.build}/classes">
        <include name="org/apache/coyote/http11/**" />
        <!-- Javadoc and i18n exclusions -->

    </ant>

    <!-- APR -->
    <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar">
      <fileset dir="${tomcat.build}/classes">
        <include name="org/apache/tomcat/jni/**" />
        <!-- Javadoc and i18n exclusions -->

    </ant>

    <!-- Java.util.logging Implementation -->
    <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar">
      <fileset dir="${tomcat.build}/classes">
        <include name="org/apache/juli/**" />
        <!-- Javadoc and i18n exclusions -->

           encoding="ISO-8859-1">
      <include name="**" />
    </javac>
    <jar jarfile="${tomcat-dbcp.jar}">
         index="true">
       <fileset dir="${tomcat-dbcp.home}/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />


      <target name="-build-jasper-compiler-jdt">
        <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
        <jar destfile="${jasper-compiler-jdt.jar}">
            <fileset dir="${jasper-compiler-jdt.home}">
                <include name="org/eclipse/jdt/core/compiler/**"/>
                <include name="org/eclipse/jdt/internal/compiler/**"/>


    <!-- Build JARs for webapps classes -->
    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
         index="true">
       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />
       </fileset>
    </jar>
    <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
    <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
         index="true">
       <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />
       </fileset>
    </jar>
    <mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />
    <jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar">
         index="true">
       <fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />
       </fileset>
    </jar>
    <mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />
    <jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar">
         index="true">
       <fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />
       </fileset>
    </jar>
    <mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />
    <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar">
         index="true">
       <fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">
          <include name="**/*.class" />
          <include name="**/*.properties" />

Lines 111-117 Link Here

(-)connectors/build.xml (-1 / +1 lines)
111	</fileset>	111	</fileset>
112	</jar>	112	</jar>
113		113
114	<jar file="${dist.dir}/tomcat-connectors.jar" index="true" >	114	<jar file="${dist.dir}/tomcat-connectors.jar">
115	<fileset dir="${build.dir}/classes" >	115	<fileset dir="${build.dir}/classes" >
116	<include name="**" />	116	<include name="**" />
117	<exclude name="org/apache/ajp/**" />	117	<exclude name="org/apache/ajp/**" />





  <target name="jar.tomcat5" depends="compile.tomcat5" >
    <jar  jarfile="${tomcat-coyote.jar}"
         index="true"
         basedir="${build.home}/classes"
         manifest="${build.home}/conf/MANIFEST.MF"
         excludes="**/tomcat3/*" >

       description="Build shared Coyote jar"> 
    <property name="tomcat-coyote.jar" value="${build.home}/lib/tomcat-${component.name}.jar" />
    <jar    jarfile="${tomcat-coyote.jar}"
            index="true"
            manifest="${build.home}/conf/MANIFEST.MF">
      <fileset dir="${build.home}/classes" >
        <exclude name="**/tomcat3/*"/>

       description="Build Tomcat 4 Adapter jar" if="tomcat4.detect">
    <property name="tomcat4-coyote.jar" value="${build.home}/lib/tomcat4-${component.name}.jar" />
    <jar jarfile="${tomcat4-coyote.jar}"
         index="true"
         basedir="${build.home}/classes"
         manifest="${build.home}/conf/MANIFEST.MF"
         includes="org/apache/coyote/tomcat4/**" />

       description="Build Tomcat 3.3 Adapter jar" if="tomcat33.detect">
    <property name="tomcat33-coyote.jar" value="${build.home}/lib/tomcat33-${component.name}.jar" />
    <jar jarfile="${tomcat33-coyote.jar}"
         index="true"
         basedir="${build.home}/classes"
         manifest="${build.home}/conf/MANIFEST.MF"
         includes="org/apache/coyote/tomcat3/**" /> 

Lines 194-200 Link Here

(-)connectors/http11/build.xml (-2 lines)
194	</copy>	194	</copy>
195	<property name="tomcat-http11.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>	195	<property name="tomcat-http11.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>
196	<jar jarfile="${tomcat-http11.jar}"	196	<jar jarfile="${tomcat-http11.jar}"
197	index="true"
198	basedir="${build.home}/classes"	197	basedir="${build.home}/classes"
199	manifest="${build.home}/conf/MANIFEST.MF">	198	manifest="${build.home}/conf/MANIFEST.MF">
200	<include name="org/apache/coyote/http11/**"/>	199	<include name="org/apache/coyote/http11/**"/>
Lines 204-210 Link Here
204	<target name="compile" depends="static,compile-only"	203	<target name="compile" depends="static,compile-only"
205	description="Compile shareable components">	204	description="Compile shareable components">
206	<jar jarfile="${build.home}/lib/tomcat33-resource.jar"	205	<jar jarfile="${build.home}/lib/tomcat33-resource.jar"
207	index="true"
208	basedir="${build.home}/classes"	206	basedir="${build.home}/classes"
209	includes="*/.properties" />	207	includes="*/.properties" />
210	</target>	208	</target>




	    </classpath>
	</javac>
	<jar jarfile="${tomcat-jkconfig.jar}"
             index="true"
	     basedir="${jk.build}/classes" 
             manifest="conf/jkconfig.manifest">
            <include name="org/apache/jk/config/**" />
        </jar>
	<jar jarfile="${tomcat-jk2.jar}"
             index="true"
             manifest="conf/tomcat-jk2.manifest"
	     basedir="${jk.build}/classes" >
            <include name="org/apache/jk/**" />

        </jar>
	
	<jar jarfile="${tomcat-jni.jar}"
             index="true"
	     basedir="${jk.build}/classes" 
             manifest="conf/jk2.manifest" >
            <include name="org/apache/jk/apr/**" />

	    </classpath>
	</javac>
	<jar jarfile="${tomcat-jkconfig.jar}"
             index="true"
	     basedir="${jk.build}/classes" 
             manifest="conf/jkconfig.manifest">
            <include name="org/apache/jk/config/**" />

	</javac>

	<jar jarfile="${tomcat-jk.jar}"
             index="true"
	     basedir="${jk.build}/classes">
            <include name="org/apache/ajp/**" />
        </jar>
	
	<jar jarfile="${tomcat-jkshm.jar}"
             index="true"
	     basedir="${jk.build}/classes" 
             manifest="conf/shm.manifest">
            <include name="org/apache/ajp/common/Shm.class" />

	</javac>

	<jar jarfile="${tomcat-jk.jar}"
             index="true"
	     basedir="${jk.build}/classes">
            <include name="org/apache/ajp/**" />
        </jar>

	<copy todir="${jk.build}/classes/META-INF" 
              file="jkant/ant.tasks"/>
	<jar jarfile="${jk.build}/lib/jkant.jar"
             index="true"
	     basedir="${jk.build}/classes" >
            <include name="org/apache/jk/ant/**" />
            <include name="META-INF/ant.tasks" />

Lines 168-174 Link Here

(-)connectors/juli/build.xml (-1 lines)
168	</copy>	168	</copy>
169	<property name="tomcat-juli.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>	169	<property name="tomcat-juli.jar" value="${build.home}/lib/tomcat-${component.name}.jar"/>
170	<jar jarfile="${tomcat-juli.jar}"	170	<jar jarfile="${tomcat-juli.jar}"
171	index="true"
172	basedir="${build.home}/classes"	171	basedir="${build.home}/classes"
173	manifest="${build.home}/conf/MANIFEST.MF">	172	manifest="${build.home}/conf/MANIFEST.MF">
174	<include name="org/apache/juli/**"/>	173	<include name="org/apache/juli/**"/>




  	<!--
    <copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
    -->
	<jar jarfile="${tomcat-util.jar}">
             index="true">
      <fileset dir="${catalina.build}/classes">
        <include name="org/apache/tomcat/util/**"/>
        <!-- Javadoc and i18n exclusions -->

    </jar>

  	<!-- Naming - Factory JAR File -->
    <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/naming/**" />
        <exclude name="org/apache/naming/resources/**" />

    </jar>

    <!-- Naming - Resources JAR File -->
    <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/naming/JndiPermission.class" />
      	<include name="org/apache/naming/NameParserImpl.class" />

    </jar>

    <!-- Servlets - CGI Servlet -->
    <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/catalina/servlets/CGI*" />
      </fileset>
    </jar>

    <!-- Servlets - Default File-Serving Servlet -->
    <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/catalina/servlets/Default*" />
        <include name="org/apache/catalina/servlets/Constants.class" />

    </jar>

    <!-- Servlets - Invoker Servlet -->
    <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/catalina/servlets/Invoker*" />
      </fileset>
    </jar>

    <!-- Servlets - SSI Servlet -->
    <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/catalina/ssi/**" />
        <!-- Javadoc and i18n exclusions -->

    </jar>

    <!-- Servlets - Webdav Servlet -->
    <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar">
      <fileset dir="${classes.dir}">
        <include name="org/apache/catalina/servlets/Webdav*" />
      </fileset>

Return to bug 49236

Lines 236-248 Link Here

(-)connectors/jk/build.xml (-8 lines)
236	</classpath>	236	</classpath>
237	</javac>	237	</javac>
238	<jar jarfile="${tomcat-jkconfig.jar}"	238	<jar jarfile="${tomcat-jkconfig.jar}"
239	index="true"
240	basedir="${jk.build}/classes"	239	basedir="${jk.build}/classes"
241	manifest="conf/jkconfig.manifest">	240	manifest="conf/jkconfig.manifest">
242	<include name="org/apache/jk/config/**" />	241	<include name="org/apache/jk/config/**" />
243	</jar>	242	</jar>
244	<jar jarfile="${tomcat-jk2.jar}"	243	<jar jarfile="${tomcat-jk2.jar}"
245	index="true"
246	manifest="conf/tomcat-jk2.manifest"	244	manifest="conf/tomcat-jk2.manifest"
247	basedir="${jk.build}/classes" >	245	basedir="${jk.build}/classes" >
248	<include name="org/apache/jk/**" />	246	<include name="org/apache/jk/**" />
Lines 251-257 Link Here
251	</jar>	249	</jar>
252		250
253	<jar jarfile="${tomcat-jni.jar}"	251	<jar jarfile="${tomcat-jni.jar}"
254	index="true"
255	basedir="${jk.build}/classes"	252	basedir="${jk.build}/classes"
256	manifest="conf/jk2.manifest" >	253	manifest="conf/jk2.manifest" >
257	<include name="org/apache/jk/apr/**" />	254	<include name="org/apache/jk/apr/**" />
Lines 277-283 Link Here
277	</classpath>	274	</classpath>
278	</javac>	275	</javac>
279	<jar jarfile="${tomcat-jkconfig.jar}"	276	<jar jarfile="${tomcat-jkconfig.jar}"
280	index="true"
281	basedir="${jk.build}/classes"	277	basedir="${jk.build}/classes"
282	manifest="conf/jkconfig.manifest">	278	manifest="conf/jkconfig.manifest">
283	<include name="org/apache/jk/config/**" />	279	<include name="org/apache/jk/config/**" />
Lines 303-315 Link Here
303	</javac>	299	</javac>
304		300
305	<jar jarfile="${tomcat-jk.jar}"	301	<jar jarfile="${tomcat-jk.jar}"
306	index="true"
307	basedir="${jk.build}/classes">	302	basedir="${jk.build}/classes">
308	<include name="org/apache/ajp/**" />	303	<include name="org/apache/ajp/**" />
309	</jar>	304	</jar>
310		305
311	<jar jarfile="${tomcat-jkshm.jar}"	306	<jar jarfile="${tomcat-jkshm.jar}"
312	index="true"
313	basedir="${jk.build}/classes"	307	basedir="${jk.build}/classes"
314	manifest="conf/shm.manifest">	308	manifest="conf/shm.manifest">
315	<include name="org/apache/ajp/common/Shm.class" />	309	<include name="org/apache/ajp/common/Shm.class" />
Lines 335-341 Link Here
335	</javac>	329	</javac>
336		330
337	<jar jarfile="${tomcat-jk.jar}"	331	<jar jarfile="${tomcat-jk.jar}"
338	index="true"
339	basedir="${jk.build}/classes">	332	basedir="${jk.build}/classes">
340	<include name="org/apache/ajp/**" />	333	<include name="org/apache/ajp/**" />
341	</jar>	334	</jar>
Lines 360-366 Link Here
360	<copy todir="${jk.build}/classes/META-INF"	353	<copy todir="${jk.build}/classes/META-INF"
361	file="jkant/ant.tasks"/>	354	file="jkant/ant.tasks"/>
362	<jar jarfile="${jk.build}/lib/jkant.jar"	355	<jar jarfile="${jk.build}/lib/jkant.jar"
363	index="true"
364	basedir="${jk.build}/classes" >	356	basedir="${jk.build}/classes" >
365	<include name="org/apache/jk/ant/**" />	357	<include name="org/apache/jk/ant/**" />
366	<include name="META-INF/ant.tasks" />	358	<include name="META-INF/ant.tasks" />

Lines 535-542 Link Here

(-)container/catalina/build.xml (-9 / +8 lines)
535	<!--	535	<!--
536	<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>	536	<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
537	-->	537	-->
538	<jar jarfile="${tomcat-util.jar}"	538	<jar jarfile="${tomcat-util.jar}">
539	index="true">
540	<fileset dir="${catalina.build}/classes">	539	<fileset dir="${catalina.build}/classes">
541	<include name="org/apache/tomcat/util/**"/>	540	<include name="org/apache/tomcat/util/**"/>
542	<!-- Javadoc and i18n exclusions -->	541	<!-- Javadoc and i18n exclusions -->
Lines 1119-1125 Link Here
1119	</jar>	1118	</jar>
1120		1119
1121	<!-- Naming - Factory JAR File -->	1120	<!-- Naming - Factory JAR File -->
1122	<jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">	1121	<jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar">
1123	<fileset dir="${classes.dir}">	1122	<fileset dir="${classes.dir}">
1124	<include name="org/apache/naming/**" />	1123	<include name="org/apache/naming/**" />
1125	<exclude name="org/apache/naming/resources/**" />	1124	<exclude name="org/apache/naming/resources/**" />
Lines 1136-1142 Link Here
1136	</jar>	1135	</jar>
1137		1136
1138	<!-- Naming - Resources JAR File -->	1137	<!-- Naming - Resources JAR File -->
1139	<jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">	1138	<jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar">
1140	<fileset dir="${classes.dir}">	1139	<fileset dir="${classes.dir}">
1141	<include name="org/apache/naming/JndiPermission.class" />	1140	<include name="org/apache/naming/JndiPermission.class" />
1142	<include name="org/apache/naming/NameParserImpl.class" />	1141	<include name="org/apache/naming/NameParserImpl.class" />
Lines 1152-1165 Link Here
1152	</jar>	1151	</jar>
1153		1152
1154	<!-- Servlets - CGI Servlet -->	1153	<!-- Servlets - CGI Servlet -->
1155	<jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar" index="true">	1154	<jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar">
1156	<fileset dir="${classes.dir}">	1155	<fileset dir="${classes.dir}">
1157	<include name="org/apache/catalina/servlets/CGI*" />	1156	<include name="org/apache/catalina/servlets/CGI*" />
1158	</fileset>	1157	</fileset>
1159	</jar>	1158	</jar>
1160		1159
1161	<!-- Servlets - Default File-Serving Servlet -->	1160	<!-- Servlets - Default File-Serving Servlet -->
1162	<jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar" index="true">	1161	<jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar">
1163	<fileset dir="${classes.dir}">	1162	<fileset dir="${classes.dir}">
1164	<include name="org/apache/catalina/servlets/Default*" />	1163	<include name="org/apache/catalina/servlets/Default*" />
1165	<include name="org/apache/catalina/servlets/Constants.class" />	1164	<include name="org/apache/catalina/servlets/Constants.class" />
Lines 1168-1181 Link Here
1168	</jar>	1167	</jar>
1169		1168
1170	<!-- Servlets - Invoker Servlet -->	1169	<!-- Servlets - Invoker Servlet -->
1171	<jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar" index="true">	1170	<jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar">
1172	<fileset dir="${classes.dir}">	1171	<fileset dir="${classes.dir}">
1173	<include name="org/apache/catalina/servlets/Invoker*" />	1172	<include name="org/apache/catalina/servlets/Invoker*" />
1174	</fileset>	1173	</fileset>
1175	</jar>	1174	</jar>
1176		1175
1177	<!-- Servlets - SSI Servlet -->	1176	<!-- Servlets - SSI Servlet -->
1178	<jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar" index="true">	1177	<jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar">
1179	<fileset dir="${classes.dir}">	1178	<fileset dir="${classes.dir}">
1180	<include name="org/apache/catalina/ssi/**" />	1179	<include name="org/apache/catalina/ssi/**" />
1181	<!-- Javadoc and i18n exclusions -->	1180	<!-- Javadoc and i18n exclusions -->
Lines 1185-1191 Link Here
1185	</jar>	1184	</jar>
1186		1185
1187	<!-- Servlets - Webdav Servlet -->	1186	<!-- Servlets - Webdav Servlet -->
1188	<jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar" index="true">	1187	<jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar">
1189	<fileset dir="${classes.dir}">	1188	<fileset dir="${classes.dir}">
1190	<include name="org/apache/catalina/servlets/Webdav*" />	1189	<include name="org/apache/catalina/servlets/Webdav*" />
1191	</fileset>	1190	</fileset>

Lines 294-300 Link Here

(-)build/build.xml (-18 / +12 lines)
294	-->	294	-->
295		295
296	<!-- Protocol handlers - AJP -->	296	<!-- Protocol handlers - AJP -->
297	<jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">	297	<jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar">
298	<fileset dir="${tomcat.build}/classes">	298	<fileset dir="${tomcat.build}/classes">
299	<include name="org/apache/coyote/ajp/**" />	299	<include name="org/apache/coyote/ajp/**" />
300	<include name="org/apache/jk/**" />	300	<include name="org/apache/jk/**" />
Lines 323-329 Link Here
323		323
324	<!-- Coyote API -->	324	<!-- Coyote API -->
325	<delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />	325	<delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
326	<jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar" index="true">	326	<jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
327	<fileset dir="${tomcat.build}/classes">	327	<fileset dir="${tomcat.build}/classes">
328	<include name="org/apache/coyote/*" />	328	<include name="org/apache/coyote/*" />
329	<include name="org/apache/coyote/memory/*" />	329	<include name="org/apache/coyote/memory/*" />
Lines 350-356 Link Here
350	</ant>	350	</ant>
351		351
352	<!-- Protocol handlers - HTTP -->	352	<!-- Protocol handlers - HTTP -->
353	<jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">	353	<jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar">
354	<fileset dir="${tomcat.build}/classes">	354	<fileset dir="${tomcat.build}/classes">
355	<include name="org/apache/coyote/http11/**" />	355	<include name="org/apache/coyote/http11/**" />
356	<!-- Javadoc and i18n exclusions -->	356	<!-- Javadoc and i18n exclusions -->
Lines 376-382 Link Here
376	</ant>	376	</ant>
377		377
378	<!-- APR -->	378	<!-- APR -->
379	<jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar" index="true">	379	<jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar">
380	<fileset dir="${tomcat.build}/classes">	380	<fileset dir="${tomcat.build}/classes">
381	<include name="org/apache/tomcat/jni/**" />	381	<include name="org/apache/tomcat/jni/**" />
382	<!-- Javadoc and i18n exclusions -->	382	<!-- Javadoc and i18n exclusions -->
Lines 397-403 Link Here
397	</ant>	397	</ant>
398		398
399	<!-- Java.util.logging Implementation -->	399	<!-- Java.util.logging Implementation -->
400	<jar jarfile="${tomcat.build}/bin/tomcat-juli.jar" index="true">	400	<jar jarfile="${tomcat.build}/bin/tomcat-juli.jar">
401	<fileset dir="${tomcat.build}/classes">	401	<fileset dir="${tomcat.build}/classes">
402	<include name="org/apache/juli/**" />	402	<include name="org/apache/juli/**" />
403	<!-- Javadoc and i18n exclusions -->	403	<!-- Javadoc and i18n exclusions -->
Lines 783-790 Link Here
783	encoding="ISO-8859-1">	783	encoding="ISO-8859-1">
784	<include name="**" />	784	<include name="**" />
785	</javac>	785	</javac>
786	<jar jarfile="${tomcat-dbcp.jar}"	786	<jar jarfile="${tomcat-dbcp.jar}">
787	index="true">
788	<fileset dir="${tomcat-dbcp.home}/classes">	787	<fileset dir="${tomcat-dbcp.home}/classes">
789	<include name="*/.class" />	788	<include name="*/.class" />
790	<include name="*/.properties" />	789	<include name="*/.properties" />
Lines 801-807 Link Here
801		800
802	<target name="-build-jasper-compiler-jdt">	801	<target name="-build-jasper-compiler-jdt">
803	<unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />	802	<unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
804	<jar destfile="${jasper-compiler-jdt.jar}" index="true">	803	<jar destfile="${jasper-compiler-jdt.jar}">
805	<fileset dir="${jasper-compiler-jdt.home}">	804	<fileset dir="${jasper-compiler-jdt.home}">
806	<include name="org/eclipse/jdt/core/compiler/**"/>	805	<include name="org/eclipse/jdt/core/compiler/**"/>
807	<include name="org/eclipse/jdt/internal/compiler/**"/>	806	<include name="org/eclipse/jdt/internal/compiler/**"/>
Lines 907-946 Link Here
907		906
908	<!-- Build JARs for webapps classes -->	907	<!-- Build JARs for webapps classes -->
909	<mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />	908	<mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
910	<jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"	909	<jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
911	index="true">
912	<fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">	910	<fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
913	<include name="*/.class" />	911	<include name="*/.class" />
914	<include name="*/.properties" />	912	<include name="*/.properties" />
915	</fileset>	913	</fileset>
916	</jar>	914	</jar>
917	<mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />	915	<mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
918	<jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"	916	<jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
919	index="true">
920	<fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">	917	<fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
921	<include name="*/.class" />	918	<include name="*/.class" />
922	<include name="*/.properties" />	919	<include name="*/.properties" />
923	</fileset>	920	</fileset>
924	</jar>	921	</jar>
925	<mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />	922	<mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />
926	<jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar"	923	<jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar">
927	index="true">
928	<fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">	924	<fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">
929	<include name="*/.class" />	925	<include name="*/.class" />
930	<include name="*/.properties" />	926	<include name="*/.properties" />
931	</fileset>	927	</fileset>
932	</jar>	928	</jar>
933	<mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />	929	<mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />
934	<jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar"	930	<jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar">
935	index="true">
936	<fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">	931	<fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">
937	<include name="*/.class" />	932	<include name="*/.class" />
938	<include name="*/.properties" />	933	<include name="*/.properties" />
939	</fileset>	934	</fileset>
940	</jar>	935	</jar>
941	<mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />	936	<mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />
942	<jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar"	937	<jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar">
943	index="true">
944	<fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">	938	<fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">
945	<include name="*/.class" />	939	<include name="*/.class" />
946	<include name="*/.properties" />	940	<include name="*/.properties" />

Lines 247-253 Link Here

(-)connectors/coyote/build.xml (-4 lines)
247		247
248	<target name="jar.tomcat5" depends="compile.tomcat5" >	248	<target name="jar.tomcat5" depends="compile.tomcat5" >
249	<jar jarfile="${tomcat-coyote.jar}"	249	<jar jarfile="${tomcat-coyote.jar}"
250	index="true"
251	basedir="${build.home}/classes"	250	basedir="${build.home}/classes"
252	manifest="${build.home}/conf/MANIFEST.MF"	251	manifest="${build.home}/conf/MANIFEST.MF"
253	excludes="*/tomcat3/" >	252	excludes="*/tomcat3/" >
Lines 294-300 Link Here
294	description="Build shared Coyote jar">	293	description="Build shared Coyote jar">
295	<property name="tomcat-coyote.jar" value="${build.home}/lib/tomcat-${component.name}.jar" />	294	<property name="tomcat-coyote.jar" value="${build.home}/lib/tomcat-${component.name}.jar" />
296	<jar jarfile="${tomcat-coyote.jar}"	295	<jar jarfile="${tomcat-coyote.jar}"
297	index="true"
298	manifest="${build.home}/conf/MANIFEST.MF">	296	manifest="${build.home}/conf/MANIFEST.MF">
299	<fileset dir="${build.home}/classes" >	297	<fileset dir="${build.home}/classes" >
300	<exclude name="*/tomcat3/"/>	298	<exclude name="*/tomcat3/"/>
Lines 309-315 Link Here
309	description="Build Tomcat 4 Adapter jar" if="tomcat4.detect">	307	description="Build Tomcat 4 Adapter jar" if="tomcat4.detect">
310	<property name="tomcat4-coyote.jar" value="${build.home}/lib/tomcat4-${component.name}.jar" />	308	<property name="tomcat4-coyote.jar" value="${build.home}/lib/tomcat4-${component.name}.jar" />
311	<jar jarfile="${tomcat4-coyote.jar}"	309	<jar jarfile="${tomcat4-coyote.jar}"
312	index="true"
313	basedir="${build.home}/classes"	310	basedir="${build.home}/classes"
314	manifest="${build.home}/conf/MANIFEST.MF"	311	manifest="${build.home}/conf/MANIFEST.MF"
315	includes="org/apache/coyote/tomcat4/**" />	312	includes="org/apache/coyote/tomcat4/**" />
Lines 319-325 Link Here
319	description="Build Tomcat 3.3 Adapter jar" if="tomcat33.detect">	316	description="Build Tomcat 3.3 Adapter jar" if="tomcat33.detect">
320	<property name="tomcat33-coyote.jar" value="${build.home}/lib/tomcat33-${component.name}.jar" />	317	<property name="tomcat33-coyote.jar" value="${build.home}/lib/tomcat33-${component.name}.jar" />
321	<jar jarfile="${tomcat33-coyote.jar}"	318	<jar jarfile="${tomcat33-coyote.jar}"
322	index="true"
323	basedir="${build.home}/classes"	319	basedir="${build.home}/classes"
324	manifest="${build.home}/conf/MANIFEST.MF"	320	manifest="${build.home}/conf/MANIFEST.MF"
325	includes="org/apache/coyote/tomcat3/**" />	321	includes="org/apache/coyote/tomcat3/**" />

Lines 120-126 Link Here

(-)connectors/util/build.xml (-2 lines)
120	</copy>	120	</copy>
121		121
122	<jar jarfile="${tomcat-util.jar}"	122	<jar jarfile="${tomcat-util.jar}"
123	index="true"
124	basedir="${tomcat-util.build}/classes"	123	basedir="${tomcat-util.build}/classes"
125	manifest="java/tomcat-util.manifest" >	124	manifest="java/tomcat-util.manifest" >
126	<include name="org/apache/tomcat/util/**"/>	125	<include name="org/apache/tomcat/util/**"/>
Lines 141-147 Link Here
141	<classpath refid="compile.classpath"/>	140	<classpath refid="compile.classpath"/>
142	</javac>	141	</javac>
143	<jar jarfile="${tomcat-loader.jar}"	142	<jar jarfile="${tomcat-loader.jar}"
144	index="true"
145	basedir="${tomcat-util.build}/loader"	143	basedir="${tomcat-util.build}/loader"
146	manifest="loader/tomcat-loader.manifest" >	144	manifest="loader/tomcat-loader.manifest" >
147	<include name="org/apache/tomcat/util/loader/**"/>	145	<include name="org/apache/tomcat/util/loader/**"/>