Author: markt
Date: Thu Mar 3 16:17:12 2016
New Revision: 1733493
URL: http://svn.apache.org/viewvc?rev=1733493&view=rev
Log:
Handling parallel deployment looks possible but messy. Document it as a
limitation. We can always revisit it if there is user demand.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
tomcat/trunk/webapps/docs/config/jaspic.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1733493&r1=1733492&r2=1733493&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Thu Mar 3 16:17:12 2016
@@ -1078,8 +1078,6 @@ public abstract class AuthenticatorBase
*/
@Override
protected synchronized void startInternal() throws LifecycleException {
-
- // TODO: Handle JASPIC and parallel deployment
ServletContext servletContext = context.getServletContext();
jaspicAppContextID = servletContext.getVirtualServerName() + " " +
servletContext.getContextPath();
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1733493&r1=1733492&r2=1733493&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
Thu Mar 3 16:17:12 2016
@@ -55,8 +55,6 @@ public class AuthConfigFactoryImpl exten
private final Map<String,RegistrationContextImpl> registrations = new
ConcurrentHashMap<>();
- // TODO: Handle parallel deployment. Can this be done if web application is
- // not aware it is being deployed in parallel?
public AuthConfigFactoryImpl() {
loadPersistentRegistrations();
}
Modified: tomcat/trunk/webapps/docs/config/jaspic.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/jaspic.xml?rev=1733493&r1=1733492&r2=1733493&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/jaspic.xml (original)
+++ tomcat/trunk/webapps/docs/config/jaspic.xml Thu Mar 3 16:17:12 2016
@@ -130,6 +130,20 @@
</section>
+<section name="Dynamic configuration">
+
+ <p>JASPIC modules and configuration can be packaged within a WAR file with
the
+ web application. The web application can then register the required JASPIC
+ configuration when it starts using the standard JASPIC APIs.</p>
+
+ <p>If parallel deployment is being used then dynamic configuration should not
+ be used. The JASPIC API assumes that a context path is unique for any given
+ host which is not the case when using parallel deployment. When using
parallel
+ deployment, static JASPIC configuration should be used. This will require
that
+ all versions of the application use the same JASPIC configuration.</p>
+
+</section>
+
<section name="3rd party modules">
<p>This is not an exhaustive list. The Tomcat community welcomes
contributions
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
