Return-Path: 
 <tomcat-dev-return-19595-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 91562 invoked from network); 6 Oct 2002 23:43:02 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 6 Oct 2002 23:43:02 -0000
Received: (qmail 16434 invoked by uid 97); 6 Oct 2002 23:43:47 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 16394 invoked by uid 97); 6 Oct 2002 23:43:46 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 16382 invoked by uid 98); 6 Oct 2002 23:43:45 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Message-ID: <00c601c26d93$06d779c0$d2b32b04@dslverizon.net>
From: "Bill Barker" <wbarker@wilshire.com>
To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Subject: [PATCH]  Make JavaMail optional for building examples
Date: Sun, 6 Oct 2002 16:49:34 -0700
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_00C3_01C26D58.59B85F00"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4133.2400
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
X-Archived: msg.XX7hPiKa@sneezy
X-Scanned-By: MIMEDefang 2.11 (www dot roaringpenguin dot com slash
 mimedefang)
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

------=_NextPart_000_00C3_01C26D58.59B85F00
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

The attached patch to j-sapi-5/jsr152/build.xml makes compiling
SendMailServlet conditional on having JavaMail installed.

------=_NextPart_000_00C3_01C26D58.59B85F00
Content-Type: application/octet-stream;
	name="jsr152-build.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="jsr152-build.patch"

Index: build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/build.xml,v
retrieving revision 1.3
diff -c -r1.3 build.xml
*** build.xml	9 Sep 2002 18:01:20 -0000	1.3
--- build.xml	6 Oct 2002 23:35:48 -0000
***************
*** 108,113 ****
--- 108,121 ----
    <!-- =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =
Build JavaDoc =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D -->
    <target name=3D"examples" depends=3D"prepare">
 =20
+     <condition property=3D"javamail.present">
+       <and>
+         <available classname=3D"javax.activation.DataSource"
+          classpath=3D"${activation.jar}" />
+         <available classname=3D"javax.mail.Service"
+          classpath=3D"${mail.jar}" />
+       </and>
+     </condition>
      <copy todir=3D"${jsp-api.build}/examples">
        <fileset dir=3D"examples">
          <exclude name=3D"build.*"/>
***************
*** 120,125 ****
--- 128,134 ----
               optimize=3D"${compile.optimize}"
               excludes=3D"**/CVS/**">
        <classpath refid=3D"examples.classpath" />
+       <exclude name=3D"SendMailServlet.java"  =
unless=3D"javamail.present" />
      </javac>
 =20
      <javac   srcdir=3D"examples/plugin/applet"=20


------=_NextPart_000_00C3_01C26D58.59B85F00
Content-Type: text/plain; charset=us-ascii

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>
------=_NextPart_000_00C3_01C26D58.59B85F00--