You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2016/03/23 10:32:57 UTC
svn commit: r1736298 - in /tomcat/tc8.5.x/trunk: ./
webapps/docs/changelog.xml webapps/docs/config/jaspic.xml
Author: violetagg
Date: Wed Mar 23 09:32:57 2016
New Revision: 1736298
URL: http://svn.apache.org/viewvc?rev=1736298&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59218
Merged revision 1736297 from tomcat/trunk:
Correct the path to jaspic-providers.xml in Jaspic How-To. Patch is provided by Tatsuya Bessho.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 09:32:57 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1736298&r1=1736297&r2=1736298&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Mar 23 09:32:57 2016
@@ -87,6 +87,10 @@
<code>o.a.catalina.core.ApplicationPushBuilder</code>. Patch is
provided by Huxing Zhang. (violetagg)
</fix>
+ <fix>
+ <bug>59218</bug>: Correct the path to <code>jaspic-providers.xml</code>
+ in Jaspic How-To. Patch is provided by Tatsuya Bessho. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml?rev=1736298&r1=1736297&r2=1736298&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/jaspic.xml Wed Mar 23 09:32:57 2016
@@ -40,7 +40,7 @@
JASPIC authentication implementations with Tomcat.</p>
<p>JASPIC may be configured dynamically by an application or statically via
- the <code>$CATALINA_BASE/jaspic-providers.xml</code> configuration file.
+ the <code>$CATALINA_BASE/conf/jaspic-providers.xml</code> configuration file.
If present, a JASPIC configuration will over-ride any
<code><login-config></code> present in <code>web.xml</code>.</p>
@@ -54,7 +54,7 @@
<code>AuthConfigProvider</code> then a web application can be configured to
use it by nesting the following inside the
<code><jaspic-providers></code> element in
- <code>$CATALINA_BASE/jaspic-providers.xml</code>.</p>
+ <code>$CATALINA_BASE/conf/jaspic-providers.xml</code>.</p>
<source><![CDATA[<provider name="any"
className="fully.qualified.implementation.class.Name"
layer="HttpServlet"
@@ -102,7 +102,7 @@
<p>Tomcat's wrapper for <code>ServerAuthModule</code> can be configured
by nesting the following inside the
<code><jaspic-providers></code> element in
- <code>$CATALINA_BASE/jaspic-providers.xml</code>.</p>
+ <code>$CATALINA_BASE/conf/jaspic-providers.xml</code>.</p>
<source><![CDATA[<provider name="any"
className="org.apache.catalina.authenticator.jaspic.AuthConfigProviderImpl"
layer="HttpServlet"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org