Lines 213-218
Link Here
|
213 |
|
213 |
|
214 |
<!-- ====================== DEPLOY: Copy Static Files =================== --> |
214 |
<!-- ====================== DEPLOY: Copy Static Files =================== --> |
215 |
<target name="deploy-static" depends="init"> |
215 |
<target name="deploy-static" depends="init"> |
|
|
216 |
<!-- |
216 |
<copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/> |
217 |
<copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/> |
217 |
<copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/> |
218 |
<copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/> |
218 |
|
219 |
|
Lines 231-239
Link Here
|
231 |
|
232 |
|
232 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
233 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
233 |
|
234 |
|
234 |
<!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/> |
235 |
<copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/> |
235 |
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> --> |
236 |
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> |
236 |
<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/> |
237 |
<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/> |
|
|
238 |
--> |
237 |
</target> |
239 |
</target> |
238 |
|
240 |
|
239 |
<!-- ====================== Build all components =================== --> |
241 |
<!-- ====================== Build all components =================== --> |
Lines 446-460
Link Here
|
446 |
<target name="build-webapps-precompile" |
448 |
<target name="build-webapps-precompile" |
447 |
depends="init" description="Precompile webapps" > |
449 |
depends="init" description="Precompile webapps" > |
448 |
|
450 |
|
|
|
451 |
<antcall target="build-webapp-precompile-admin" /> |
452 |
<antcall target="build-webapp-precompile-examples" /> |
453 |
|
449 |
<!-- JSPC --> |
454 |
<!-- JSPC --> |
450 |
<property name="admin.base" location="${tomcat.build}/server/webapps/admin" /> |
|
|
451 |
<property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" /> |
455 |
<property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" /> |
452 |
<property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" /> |
|
|
453 |
|
456 |
|
454 |
<mkdir dir="${admin.base}/WEB-INF/src/admin" /> |
|
|
455 |
<mkdir dir="${ROOT.base}/WEB-INF/src" /> |
457 |
<mkdir dir="${ROOT.base}/WEB-INF/src" /> |
456 |
<mkdir dir="${ROOT.base}/WEB-INF/classes" /> |
458 |
<mkdir dir="${ROOT.base}/WEB-INF/classes" /> |
457 |
<mkdir dir="${jsp-examples.base}/WEB-INF/src" /> |
|
|
458 |
|
459 |
|
459 |
<path id="jspc.classpath"> |
460 |
<path id="jspc.classpath"> |
460 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
461 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
Lines 489-513
Link Here
|
489 |
outputDir="${ROOT.base}/WEB-INF/src" |
490 |
outputDir="${ROOT.base}/WEB-INF/src" |
490 |
javaEncoding="UTF-8" /> |
491 |
javaEncoding="UTF-8" /> |
491 |
|
492 |
|
492 |
<jasper2 |
|
|
493 |
compile="false" |
494 |
validateXml="false" |
495 |
uriroot="${jsp-examples.base}" |
496 |
webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml" |
497 |
addWebXmlMappings="true" |
498 |
outputDir="${jsp-examples.base}/WEB-INF/src" |
499 |
javaEncoding="UTF-8" /> |
500 |
|
501 |
<jasper2 |
502 |
package="admin" |
503 |
compile="false" |
504 |
validateXml="false" |
505 |
uriroot="${admin.base}" |
506 |
webXmlFragment="${admin.base}/WEB-INF/generated_web.xml" |
507 |
addWebXmlMappings="true" |
508 |
outputDir="${admin.base}/WEB-INF/src/admin" |
509 |
javaEncoding="UTF-8" /> |
510 |
|
511 |
<javac destdir="${ROOT.base}/WEB-INF/classes" |
493 |
<javac destdir="${ROOT.base}/WEB-INF/classes" |
512 |
optimize="off" |
494 |
optimize="off" |
513 |
debug="${compile.debug}" |
495 |
debug="${compile.debug}" |
Lines 530-594
Link Here
|
530 |
<include name="**" /> |
512 |
<include name="**" /> |
531 |
</javac> |
513 |
</javac> |
532 |
|
514 |
|
533 |
<mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/> |
515 |
</target> |
534 |
<copy todir="${jsp-examples.base}/WEB-INF/classes"> |
516 |
|
535 |
<fileset dir="${jsp-examples.base}/WEB-INF/src"> |
517 |
<target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired"> |
536 |
<include name="**/*.class" /> |
518 |
<property name="admin.base" location="${tomcat.build}/server/webapps/admin" /> |
537 |
</fileset> |
519 |
<mkdir dir="${admin.base}/WEB-INF/src/admin" /> |
538 |
</copy> |
520 |
<taskdef classname="org.apache.jasper.JspC" name="jasper2" > |
539 |
|
521 |
<classpath refid="jspc.classpath"/> |
540 |
<javac destdir="${jsp-examples.base}/WEB-INF/classes" |
522 |
</taskdef> |
541 |
optimize="off" |
523 |
<jasper2 |
542 |
debug="${compile.debug}" |
524 |
package="admin" |
543 |
deprecation="${compile.deprecation}" |
525 |
compile="false" |
544 |
source="${compile.source}" |
526 |
validateXml="false" |
545 |
failonerror="false" |
527 |
uriroot="${admin.base}" |
546 |
srcdir="${jsp-examples.base}/WEB-INF/src" |
528 |
webXmlFragment="${admin.base}/WEB-INF/generated_web.xml" |
547 |
excludes="**/*.smap" |
529 |
addWebXmlMappings="true" |
548 |
encoding="UTF-8"> |
530 |
outputDir="${admin.base}/WEB-INF/src/admin" /> |
549 |
<classpath> |
531 |
<javac destdir="${admin.base}/WEB-INF/classes" |
550 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
532 |
optimize="off" |
551 |
<fileset dir="${tomcat.build}/server/lib"> |
533 |
debug="${compile.debug}" |
552 |
<include name="*.jar"/> |
534 |
deprecation="${compile.deprecation}" |
553 |
</fileset> |
535 |
source="${compile.source}" |
554 |
<fileset dir="${jsp-examples.base}/WEB-INF/lib"> |
536 |
failonerror="false" |
555 |
<include name="*.jar"/> |
537 |
srcdir="${admin.base}/WEB-INF/src" |
556 |
</fileset> |
538 |
excludes="**/*.smap"> |
557 |
<fileset dir="${tomcat.build}/common/lib"> |
539 |
<classpath> |
558 |
<include name="*.jar"/> |
540 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
559 |
</fileset> |
541 |
<fileset dir="${tomcat.build}/server/lib"> |
560 |
<pathelement location="${tomcat.build}/classes"/> |
542 |
<include name="*.jar"/> |
561 |
<pathelement location="${jsp-examples.base}/WEB-INF/classes"/> |
543 |
</fileset> |
562 |
</classpath> |
544 |
<fileset dir="${admin.base}/WEB-INF/lib"> |
563 |
<include name="**" /> |
545 |
<include name="*.jar"/> |
564 |
<exclude name="tags/**" /> |
546 |
</fileset> |
565 |
</javac> |
547 |
<fileset dir="${tomcat.build}/common/lib"> |
566 |
|
548 |
<include name="*.jar"/> |
567 |
<javac destdir="${admin.base}/WEB-INF/classes" |
549 |
</fileset> |
568 |
optimize="off" |
550 |
<pathelement location="${tomcat.build}/classes"/> |
569 |
debug="${compile.debug}" |
551 |
</classpath> |
570 |
deprecation="${compile.deprecation}" |
552 |
<include name="admin/**" /> |
571 |
source="${compile.source}" |
553 |
</javac> |
572 |
failonerror="false" |
554 |
</target> |
573 |
srcdir="${admin.base}/WEB-INF/src" |
555 |
|
574 |
excludes="**/*.smap" |
556 |
<target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired"> |
575 |
encoding="UTF-8"> |
557 |
<property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" /> |
576 |
<classpath> |
558 |
<mkdir dir="${jsp-examples.base}/WEB-INF/src" /> |
577 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
559 |
<taskdef classname="org.apache.jasper.JspC" name="jasper2" > |
578 |
<fileset dir="${tomcat.build}/server/lib"> |
560 |
<classpath refid="jspc.classpath"/> |
579 |
<include name="*.jar"/> |
561 |
</taskdef> |
580 |
</fileset> |
562 |
<jasper2 |
581 |
<fileset dir="${admin.base}/WEB-INF/lib"> |
563 |
compile="false" |
582 |
<include name="*.jar"/> |
564 |
validateXml="false" |
583 |
</fileset> |
565 |
uriroot="${jsp-examples.base}" |
584 |
<fileset dir="${tomcat.build}/common/lib"> |
566 |
webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml" |
585 |
<include name="*.jar"/> |
567 |
addWebXmlMappings="true" |
|
|
568 |
outputDir="${jsp-examples.base}/WEB-INF/src" /> |
569 |
<mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/> |
570 |
<copy todir="${jsp-examples.base}/WEB-INF/classes"> |
571 |
<fileset dir="${jsp-examples.base}/WEB-INF/src"> |
572 |
<include name="**/*.class" /> |
586 |
</fileset> |
573 |
</fileset> |
587 |
<pathelement location="${tomcat.build}/classes"/> |
574 |
</copy> |
588 |
</classpath> |
575 |
<javac destdir="${jsp-examples.base}/WEB-INF/classes" |
589 |
<include name="admin/**" /> |
576 |
optimize="off" |
590 |
</javac> |
577 |
debug="${compile.debug}" |
591 |
</target> |
578 |
deprecation="${compile.deprecation}" |
|
|
579 |
source="${compile.source}" |
580 |
failonerror="false" |
581 |
srcdir="${jsp-examples.base}/WEB-INF/src" |
582 |
excludes="**/*.smap"> |
583 |
<classpath> |
584 |
<pathelement location="${java.home}/../lib/tools.jar"/> |
585 |
<fileset dir="${tomcat.build}/server/lib"> |
586 |
<include name="*.jar"/> |
587 |
</fileset> |
588 |
<fileset dir="${jsp-examples.base}/WEB-INF/lib"> |
589 |
<include name="*.jar"/> |
590 |
</fileset> |
591 |
<fileset dir="${tomcat.build}/common/lib"> |
592 |
<include name="*.jar"/> |
593 |
</fileset> |
594 |
<pathelement location="${tomcat.build}/classes"/> |
595 |
<pathelement location="${jsp-examples.base}/WEB-INF/classes"/> |
596 |
</classpath> |
597 |
<include name="**" /> |
598 |
<exclude name="tags/**" /> |
599 |
</javac> |
600 |
</target> |
592 |
|
601 |
|
593 |
<target name="build-catalina" depends="init" |
602 |
<target name="build-catalina" depends="init" |
594 |
description="Builds catalina"> |
603 |
description="Builds catalina"> |
Lines 713-719
Link Here
|
713 |
<param name="sourcefile" value="${commons-collections-src.loc}"/> |
722 |
<param name="sourcefile" value="${commons-collections-src.loc}"/> |
714 |
<param name="destfile" value="${tomcat-dbcp.jar}" /> |
723 |
<param name="destfile" value="${tomcat-dbcp.jar}" /> |
715 |
</antcall> |
724 |
</antcall> |
716 |
--> |
725 |
|
717 |
<antcall target="downloadgz"> |
726 |
<antcall target="downloadgz"> |
718 |
<param name="sourcefile" value="${commons-pool-src.loc}"/> |
727 |
<param name="sourcefile" value="${commons-pool-src.loc}"/> |
719 |
<param name="destfile" value="${commons-pool.home}/build.xml" /> |
728 |
<param name="destfile" value="${commons-pool.home}/build.xml" /> |
Lines 731-736
Link Here
|
731 |
<param name="destdir" value="${base.path}"/> |
740 |
<param name="destdir" value="${base.path}"/> |
732 |
</antcall> |
741 |
</antcall> |
733 |
<antcall target="build-jasper-compiler-jdt" /> |
742 |
<antcall target="build-jasper-compiler-jdt" /> |
|
|
743 |
--> |
734 |
</target> |
744 |
</target> |
735 |
|
745 |
|
736 |
<target name="build-tomcat-dbcp"> |
746 |
<target name="build-tomcat-dbcp"> |
Lines 812-825
Link Here
|
812 |
</jar> |
822 |
</jar> |
813 |
</target> |
823 |
</target> |
814 |
|
824 |
|
815 |
<target name="build-webapps" depends="init" |
825 |
<target name="build-examples" unless="examples.build.notrequired"> |
816 |
description="build webapps"> |
|
|
817 |
|
818 |
<echo>========== Building: webapps </echo> |
819 |
|
820 |
<mkdir dir="${tomcat.build}/webapps" /> |
821 |
<mkdir dir="${tomcat.build}/server/webapps" /> |
822 |
|
823 |
<!-- The build files are far too difficult to hack - just build it and copy --> |
826 |
<!-- The build files are far too difficult to hack - just build it and copy --> |
824 |
<ant dir="${api.home}/jsr154" target="dist"> |
827 |
<ant dir="${api.home}/jsr154" target="dist"> |
825 |
</ant> |
828 |
</ant> |
Lines 837-842
Link Here
|
837 |
<exclude name="WEB-INF/tagPlugins.xml" /> |
840 |
<exclude name="WEB-INF/tagPlugins.xml" /> |
838 |
</fileset> |
841 |
</fileset> |
839 |
</copy> |
842 |
</copy> |
|
|
843 |
</target> |
844 |
|
845 |
<target name="build-webapps" depends="init" |
846 |
description="build webapps"> |
847 |
|
848 |
<echo>========== Building: webapps </echo> |
849 |
|
850 |
<mkdir dir="${tomcat.build}/webapps" /> |
851 |
<mkdir dir="${tomcat.build}/server/webapps" /> |
852 |
|
853 |
<antcall target="build-examples" /> |
840 |
|
854 |
|
841 |
<ant dir="${catalina.home}/webapps/ROOT" target="build-main"> |
855 |
<ant dir="${catalina.home}/webapps/ROOT" target="build-main"> |
842 |
<property name="webapps.build" value="${tomcat.build}/webapps" /> |
856 |
<property name="webapps.build" value="${tomcat.build}/webapps" /> |
Lines 908-920
Link Here
|
908 |
filtering="true" encoding="ISO-8859-1" /> |
922 |
filtering="true" encoding="ISO-8859-1" /> |
909 |
|
923 |
|
910 |
<!-- Build JARs for webapps classes --> |
924 |
<!-- Build JARs for webapps classes --> |
911 |
<mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" /> |
925 |
<antcall target="fix-admin-webapp" /> |
912 |
<jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"> |
|
|
913 |
<fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes"> |
914 |
<include name="**/*.class" /> |
915 |
<include name="**/*.properties" /> |
916 |
</fileset> |
917 |
</jar> |
918 |
<mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" /> |
926 |
<mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" /> |
919 |
<jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"> |
927 |
<jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"> |
920 |
<fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes"> |
928 |
<fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes"> |
Lines 949-957
Link Here
|
949 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
957 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
950 |
<copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml" |
958 |
<copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml" |
951 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
959 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
|
|
960 |
</target> |
961 |
|
962 |
<target name="fix-admin-webapp" unless="admin.build.notrequired"> |
963 |
<mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" /> |
964 |
<jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar" |
965 |
index="true"> |
966 |
<fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes"> |
967 |
<include name="**/*.class" /> |
968 |
<include name="**/*.properties" /> |
969 |
</fileset> |
970 |
</jar> |
952 |
<copy file="${tomcat.build}/server/webapps/admin/admin.xml" |
971 |
<copy file="${tomcat.build}/server/webapps/admin/admin.xml" |
953 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
972 |
todir="${tomcat.build}/conf/Catalina/localhost" /> |
954 |
|
|
|
955 |
</target> |
973 |
</target> |
956 |
|
974 |
|
957 |
<!-- ====================== Embed target =================== --> |
975 |
<!-- ====================== Embed target =================== --> |
Lines 1097-1107
Link Here
|
1097 |
<!-- ====================== Compat target =================== --> |
1115 |
<!-- ====================== Compat target =================== --> |
1098 |
|
1116 |
|
1099 |
<target name="compat" description="Create compatibility binaries for JREs before 1.5" > |
1117 |
<target name="compat" description="Create compatibility binaries for JREs before 1.5" > |
1100 |
|
1118 |
<!-- |
1101 |
<copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/> |
1119 |
<copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/> |
1102 |
<copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/> |
1120 |
<copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/> |
1103 |
<copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/> |
1121 |
<copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/> |
1104 |
|
1122 |
--> |
1105 |
</target> |
1123 |
</target> |
1106 |
|
1124 |
|
1107 |
<!-- ====================== DEPLOY: Deploy Components =================== --> |
1125 |
<!-- ====================== DEPLOY: Deploy Components =================== --> |
Lines 1247-1257
Link Here
|
1247 |
<target name="run-tester" |
1265 |
<target name="run-tester" |
1248 |
description="Catalina Tests" depends="dist-tester"> |
1266 |
description="Catalina Tests" depends="dist-tester"> |
1249 |
|
1267 |
|
1250 |
<!-- For Java 1.4 --> |
1268 |
<!-- For Java 1.4 |
1251 |
<copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" /> |
1269 |
<copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" /> |
1252 |
<copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/> |
1270 |
<copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/> |
1253 |
<copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/> |
1271 |
<copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/> |
1254 |
|
1272 |
--> |
1255 |
<parallel> |
1273 |
<parallel> |
1256 |
|
1274 |
|
1257 |
<java classname="LauncherBootstrap" fork="yes"> |
1275 |
<java classname="LauncherBootstrap" fork="yes"> |
Lines 1986-1992
Link Here
|
1986 |
description="Download binary packages" > |
2004 |
description="Download binary packages" > |
1987 |
<mkdir dir="${base.path}" /> |
2005 |
<mkdir dir="${base.path}" /> |
1988 |
|
2006 |
|
1989 |
<!-- Download any sub package or tools needed. --> |
2007 |
<!-- Download any sub package or tools needed. |
1990 |
<antcall target="downloadgz"> |
2008 |
<antcall target="downloadgz"> |
1991 |
<param name="sourcefile" value="${commons-beanutils.loc}"/> |
2009 |
<param name="sourcefile" value="${commons-beanutils.loc}"/> |
1992 |
<param name="destfile" value="${commons-beanutils.jar}"/> |
2010 |
<param name="destfile" value="${commons-beanutils.jar}"/> |
Lines 2028-2034
Link Here
|
2028 |
</antcall> |
2046 |
</antcall> |
2029 |
|
2047 |
|
2030 |
<antcall target="downloadgz"> |
2048 |
<antcall target="downloadgz"> |
2031 |
<!-- xerces2 brings 2 files, test for one of them --> |
|
|
2032 |
<param name="sourcefile" value="${xerces.loc}"/> |
2049 |
<param name="sourcefile" value="${xerces.loc}"/> |
2033 |
<param name="destfile" value="${xml-apis.jar}"/> |
2050 |
<param name="destfile" value="${xml-apis.jar}"/> |
2034 |
</antcall> |
2051 |
</antcall> |
Lines 2100-2106
Link Here
|
2100 |
<param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/> |
2117 |
<param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/> |
2101 |
<param name="destdir" value="${tomcat-native.home}"/> |
2118 |
<param name="destdir" value="${tomcat-native.home}"/> |
2102 |
</antcall> |
2119 |
</antcall> |
2103 |
|
2120 |
--> |
2104 |
<!-- Grab the JAF/Javamail dependencies if doing full release --> |
2121 |
<!-- Grab the JAF/Javamail dependencies if doing full release --> |
2105 |
<antcall target="fulldist"/> |
2122 |
<antcall target="fulldist"/> |
2106 |
|
2123 |
|