- Add new files.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@416314 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index f8cd0cd..6701496 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -22,6 +22,7 @@ compile.target=1.5
 compile.debug=true\r
 \r
 base-jakarta.loc=http://archive.apache.org/dist/jakarta\r
+base-tomcat.loc=http://archive.apache.org/dist/tomcat\r
 \r
 # ----- Commons Logging, version 1.0.1 or later -----\r
 commons-logging.home=${base.path}/commons-logging-1.0.4\r

diff --git a/build.xml b/build.xml
index b0b669b..4040aa1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -110,6 +110,7 @@
       <fileset dir="${tomcat.classes}">\r
         <include name="javax/annotation/*" />\r
         <include name="javax/annotation/security/*" />\r
+        <include name="javax/ejb/*" />\r
         <include name="javax/persistence/*" />\r
         <include name="javax/xml/ws/*" />\r
         <!-- Javadoc and i18n exclusions -->\r
@@ -163,6 +164,7 @@
         <include name="org/apache/catalina/loader/Extension.class" />\r
         <include name="org/apache/catalina/loader/Reloader.class" />\r
         <include name="org/apache/catalina/security/SecurityClassLoad.class" />\r
+        <include name="org/apache/juli/**" />\r
         <include name="org/apache/naming/JndiPermission.class" />\r
         <include name="org/apache/tomcat/util/compat/*" />\r
         <!-- Javadoc and i18n exclusions -->\r
@@ -255,7 +257,10 @@
 \r
     <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/bin" />\r
 \r
-    <!-- Copy static resource files -->\r
+    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"\r
+            file="${tomcat-native.tar.gz}" />\r
+\r
+       <!-- Copy static resource files -->\r
     <copy todir="${tomcat.build}/conf">\r
       <fileset dir="conf">\r
         <include name="*.xml"/>\r
@@ -267,6 +272,10 @@
     <copy todir="${tomcat.build}/webapps">\r
       <fileset dir="webapps">\r
         <include name="ROOT/**"/>\r
+        <include name="docs/**"/>\r
+        <include name="examples/**"/>\r
+        <include name="manager/**"/>\r
+        <include name="host-manager/**"/>\r
       </fileset>\r
     </copy>\r
 \r
@@ -310,6 +319,12 @@
     <delete file="${base.path}/file.zip"/>\r
   </target>\r
 \r
+  <target name="downloadfile" unless="exist" depends="setproxy,testexist">\r
+    <!-- Download extract the file -->\r
+    <mkdir dir="${destdir}" />\r
+    <get src="${sourcefile}" dest="${destfile}" />\r
+  </target>\r
+\r
   <target name="download"\r
           description="Builds and download dependent components">\r
 \r
@@ -318,6 +333,12 @@
       <param name="destfile" value="${commons-logging.jar}"/>\r
     </antcall>\r
 \r
+    <antcall target="downloadfile">\r
+      <param name="sourcefile" value="${tomcat-native.loc}"/>\r
+      <param name="destfile" value="${tomcat-native.tar.gz}"/>\r
+      <param name="destdir" value="${tomcat-native.home}"/>\r
+    </antcall>\r
+\r
     <!-- Build Tomcat DBCP bundle -->\r
     <antcall target="downloadgz">\r
       <param name="sourcefile" value="${commons-collections-src.loc}"/>\r