Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 17149 invoked from network); 13 Nov 2009 15:49:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Nov 2009 15:49:06 -0000 Received: (qmail 4988 invoked by uid 500); 13 Nov 2009 15:49:05 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 4923 invoked by uid 500); 13 Nov 2009 15:49:05 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 4912 invoked by uid 99); 13 Nov 2009 15:49:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Nov 2009 15:49:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Nov 2009 15:49:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D2DC23888E8; Fri, 13 Nov 2009 15:48:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r835886 - in /tomcat/trunk/java/org/apache: catalina/startup/ContextConfig.java jasper/compiler/TldLocationsCache.java Date: Fri, 13 Nov 2009 15:48:41 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091113154841.7D2DC23888E8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Nov 13 15:48:41 2009 New Revision: 835886 URL: http://svn.apache.org/viewvc?rev=835886&view=rev Log: Add Apple J2SE runtime jars to those we skip when scanning for TLDs and web fragments Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=835886&r1=835885&r2=835886&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Nov 13 15:48:41 2009 @@ -237,6 +237,19 @@ noFragmentJars.add("dnsns.jar"); noFragmentJars.add("tools.jar"); noFragmentJars.add("sunpkcs11.jar"); + // Apple J2SE runtime + noFragmentJars.add("apple_provider.jar"); + noFragmentJars.add("AppleScriptEngine.jar"); + noFragmentJars.add("CoreAudio.jar"); + noFragmentJars.add("dns_sd.jar"); + noFragmentJars.add("j3daudio.jar"); + noFragmentJars.add("j3dcore.jar"); + noFragmentJars.add("j3dutils.jar"); + noFragmentJars.add("jai_core.jar"); + noFragmentJars.add("jai_codec.jar"); + noFragmentJars.add("mlibwrapper_jai.jar"); + noFragmentJars.add("MRJToolkit.jar"); + noFragmentJars.add("vecmath.jar"); } // ------------------------------------------------------------- Properties Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=835886&r1=835885&r2=835886&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Fri Nov 13 15:48:41 2009 @@ -165,6 +165,19 @@ noTldJars.add("dnsns.jar"); noTldJars.add("tools.jar"); noTldJars.add("sunpkcs11.jar"); + // Apple J2SE runtime + noTldJars.add("apple_provider.jar"); + noTldJars.add("AppleScriptEngine.jar"); + noTldJars.add("CoreAudio.jar"); + noTldJars.add("dns_sd.jar"); + noTldJars.add("j3daudio.jar"); + noTldJars.add("j3dcore.jar"); + noTldJars.add("j3dutils.jar"); + noTldJars.add("jai_core.jar"); + noTldJars.add("jai_codec.jar"); + noTldJars.add("mlibwrapper_jai.jar"); + noTldJars.add("MRJToolkit.jar"); + noTldJars.add("vecmath.jar"); } /** Constructor. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org