Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1377297 - in /tomcat/tc7.0.x/trunk: ./
 conf/catalina.properties
 webapps/docs/changelog.xml
Date: Sat, 25 Aug 2012 13:47:13 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
Message-Id: <20120825134714.2E69D23888EA@eris.apache.org>

Author: kkolinko
Date: Sat Aug 25 13:47:13 2012
New Revision: 1377297

URL: http://svn.apache.org/viewvc?rev=1377297&view=rev
Log:
Merged revision 1377292 from tomcat/trunk:
Add two files to the value of tomcat.util.scan.DefaultJarScanner.jarsToSkip property.

These are from OpenJDK 6 on Fedora Linux (java-1.6.0-openjdk-1.6.0.0-65.1.10.8)
They are audio library PulseAudio and GNOME Java Access Bridge.
........
Several jars were already added in r1377085, so I am including Mark in the credits.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/conf/catalina.properties
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1377292

Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1377297&r1=1377296&r2=1377297&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.properties Sat Aug 25 13:47:13 2012
@@ -88,6 +88,7 @@ shared.loader=
 # - Tomcat JARs
 # - Common non-Tomcat JARs
 # - Sun JDK JARs
+# - OpenJDK JARs
 # - Apple JDK JARs
 tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
 bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
@@ -111,6 +112,7 @@ xercesImpl.jar,xmlParserAPIs.jar,xml-api
 access-bridge-64.jar,dnsns.jar,jaccess.jar,ldapsec.jar,localedata.jar,\
 sunjce_provider.jar,sunmscapi.jar,sunpkcs11.jar,jhall.jar,tools.jar,\
 sunec.jar,zipfs.jar,\
+gnome-java-bridge.jar,pulse-java.jar,\
 apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
 j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
 mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1377297&r1=1377296&r2=1377297&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 25 13:47:13 2012
@@ -151,9 +151,13 @@
       <fix>
         <bug>53714</bug>: Provide separate system properties to control which
         JARs are excluded from which scans when using the JarScanner. This
-        allows JARs to be excluded from TLD scanning and/or Servlet 3.0
-        pluggability scanning. (markt)
-      </fix>      
+        allows JARs to be excluded from all scans or only from TLD scanning
+        and/or Servlet 3.0 pluggability scanning. (markt)
+      </fix>
+      <update>
+        Add several JDK libraries to the value of <code>jarsToSkip</code>
+        property in the <code>catalina.properties</code> file. (markt, kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org