Author: kkolinko
Date: Tue Sep 4 13:36:33 2012
New Revision: 1380636
URL: http://svn.apache.org/viewvc?rev=1380636&view=rev
Log:
Merged revision 1380635 from tomcat/trunk:
Add one library from JDK 7 to the value of jarsToSkip
access-bridge.jar is from 32-bit JDK 7u7 on Windows
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:r1380635
Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1380636&r1=1380635&r2=1380636&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.properties Tue Sep 4 13:36:33 2012
@@ -109,7 +109,7 @@ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
-access-bridge-64.jar,dnsns.jar,jaccess.jar,ldapsec.jar,localedata.jar,\
+access-bridge.jar,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,\
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=1380636&r1=1380635&r2=1380636&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 4 13:36:33 2012
@@ -54,6 +54,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.31 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ Add one library from JDK 7 to the value of <code>jarsToSkip</code>
+ property in the <code>catalina.properties</code> file. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
