From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 22 Jun 2006 10:11:41 +0000 (+0000)
Subject: - Add new files.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1aefd93a959da92fc24127a46d7e6ee38eba86b3;p=tomcat7.0

- 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 f8cd0cd50..6701496a0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -22,6 +22,7 @@ compile.target=1.5
 compile.debug=true
 
 base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-tomcat.loc=http://archive.apache.org/dist/tomcat
 
 # ----- Commons Logging, version 1.0.1 or later -----
 commons-logging.home=${base.path}/commons-logging-1.0.4
diff --git a/build.xml b/build.xml
index b0b669bbd..4040aa15d 100644
--- a/build.xml
+++ b/build.xml
@@ -110,6 +110,7 @@
       <fileset dir="${tomcat.classes}">
         <include name="javax/annotation/*" />
         <include name="javax/annotation/security/*" />
+        <include name="javax/ejb/*" />
         <include name="javax/persistence/*" />
         <include name="javax/xml/ws/*" />
         <!-- Javadoc and i18n exclusions -->
@@ -163,6 +164,7 @@
         <include name="org/apache/catalina/loader/Extension.class" />
         <include name="org/apache/catalina/loader/Reloader.class" />
         <include name="org/apache/catalina/security/SecurityClassLoad.class" />
+        <include name="org/apache/juli/**" />
         <include name="org/apache/naming/JndiPermission.class" />
         <include name="org/apache/tomcat/util/compat/*" />
         <!-- Javadoc and i18n exclusions -->
@@ -255,7 +257,10 @@
 
     <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/bin" />
 
-    <!-- Copy static resource files -->
+    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+            file="${tomcat-native.tar.gz}" />
+
+  	<!-- Copy static resource files -->
     <copy todir="${tomcat.build}/conf">
       <fileset dir="conf">
         <include name="*.xml"/>
@@ -267,6 +272,10 @@
     <copy todir="${tomcat.build}/webapps">
       <fileset dir="webapps">
         <include name="ROOT/**"/>
+        <include name="docs/**"/>
+        <include name="examples/**"/>
+        <include name="manager/**"/>
+        <include name="host-manager/**"/>
       </fileset>
     </copy>
 
@@ -310,6 +319,12 @@
     <delete file="${base.path}/file.zip"/>
   </target>
 
+  <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+    <!-- Download extract the file -->
+    <mkdir dir="${destdir}" />
+    <get src="${sourcefile}" dest="${destfile}" />
+  </target>
+
   <target name="download"
           description="Builds and download dependent components">
 
@@ -318,6 +333,12 @@
       <param name="destfile" value="${commons-logging.jar}"/>
     </antcall>
 
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.loc}"/>
+      <param name="destfile" value="${tomcat-native.tar.gz}"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
+    </antcall>
+
     <!-- Build Tomcat DBCP bundle -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-collections-src.loc}"/>