- Update JAR packaging.

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

diff --git a/.classpath b/.classpath
index e073d74..e3cae56 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry excluding="org/apache/tomcat/util/net/puretls/|org/apache/naming/factory/MailSessionFactory.java|org/apache/naming/factory/SendMailFactory.java" kind="src" path="java"/>\r
+       <classpathentry excluding="org/apache/tomcat/util/net/puretls/" kind="src" path="java"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar"/>\r
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>\r

diff --git a/build.xml b/build.xml
index d47de55..8b42942 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -54,23 +54,13 @@
     <pathelement location="${ant.jar}"/>\r
     <pathelement location="${jdt.jar}"/>\r
     <pathelement location="${commons-logging.jar}"/>\r
-    <pathelement location="${mail.jar}" />\r
-    <pathelement location="${activation.jar}" />\r
   </path>\r
 \r
   <!-- Just build Tomcat -->\r
   <target name="build-prepare">\r
 \r
     <available classname="junit.framework.TestCase" property="junit.present" />\r
-    <condition property="javamail.present">\r
-      <and>\r
-        <available classname="javax.activation.DataSource"\r
-         classpath="${activation.jar}" />\r
-        <available classname="javax.mail.Service"\r
-         classpath="${mail.jar}" />\r
-      </and>\r
-    </condition>\r
-    \r
+\r
     <mkdir dir="${tomcat.classes}"/>\r
     \r
     <mkdir dir="${tomcat.build}"/>\r
@@ -92,10 +82,6 @@
            excludes="**/CVS/**,**/.svn/**">\r
       <classpath refid="tomcat.classpath" />\r
       <exclude name="org/apache/tomcat/util/net/puretls/**" />\r
-      <exclude name="org/apache/naming/factory/MailSessionFactory.java"\r
-              unless="javamail.present" />\r
-      <exclude name="org/apache/naming/factory/SendMailFactory.java"\r
-              unless="javamail.present" />\r
     </javac>\r
     <!-- Copy static resource files -->\r
     <filter token="VERSION" value="${version}"/>\r
@@ -117,7 +103,10 @@
     <!-- Common Annotations 1.0 JAR File -->\r
     <jar  jarfile="${annotations-api.jar}">\r
       <fileset dir="${tomcat.classes}">\r
-        <include name="javax/annotation/**" />\r
+        <include name="javax/annotation/*" />\r
+        <include name="javax/annotation/security/*" />\r
+        <include name="javax/persistence/*" />\r
+        <include name="javax/xml/ws/*" />\r
         <!-- Javadoc and i18n exclusions -->\r
         <exclude name="**/package.html" />\r
         <exclude name="**/LocalStrings_*" />\r
@@ -149,7 +138,7 @@
     <!-- JSP 2.1 EL Implementation JAR File -->\r
     <jar  jarfile="${el-api.jar}">\r
       <fileset dir="${tomcat.classes}">\r
-        <include name="javax/el/**" />\r
+        <include name="javax/el/*" />\r
         <!-- Javadoc and i18n exclusions -->\r
         <exclude name="**/package.html" />\r
         <exclude name="**/LocalStrings_*" />\r
@@ -197,17 +186,8 @@
     <jar jarfile="${catalina-ant.jar}">\r
       <fileset dir="${tomcat.classes}">\r
        <include name="org/apache/catalina/ant/*" />\r
-        <include name="org/apache/catalina/util/Base64.class" />\r
-       <!-- Javadoc and i18n exclusions -->\r
-        <exclude name="**/package.html" />\r
-        <exclude name="**/LocalStrings_*" />\r
-      </fileset>\r
-    </jar>\r
-\r
-       <!-- Catalina JMX Accessor Ant Tasks JAR File -->\r
-    <jar jarfile="${catalina-ant-jmx.jar}">\r
-      <fileset dir="${tomcat.classes}">\r
        <include name="org/apache/catalina/ant/jmx/*" />\r
+        <include name="org/apache/catalina/util/Base64.class" />\r
        <!-- Javadoc and i18n exclusions -->\r
         <exclude name="**/package.html" />\r
         <exclude name="**/LocalStrings_*" />\r