From 781e3fa1e47a7bdc826b9a24a6181cbd01bc9eb9 Mon Sep 17 00:00:00 2001
From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 12 Apr 2006 13:34:17 +0000
Subject: [PATCH] - Update JAR packaging.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@393458 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath |  2 +-
 build.xml  | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

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