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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
