From c9cebc52e40512b41b0388a961680fa5ad6bb3ea Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 13 Nov 2009 15:48:41 +0000
Subject: [PATCH] Add Apple J2SE runtime jars to those we skip when scanning
 for TLDs and web fragments

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835886 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/ContextConfig.java    | 13 +++++++++++++
 java/org/apache/jasper/compiler/TldLocationsCache.java | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 2a1378c6d..7724f3914 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -237,6 +237,19 @@ public class ContextConfig
         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
diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java
index aee1f4455..2dd5ca801 100644
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -165,6 +165,19 @@ public class TldLocationsCache {
         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. 
-- 
2.11.0