You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/07/28 18:07:31 UTC
svn commit: rev 30848 - in avalon/trunk/planet/facilities/http/impl/src: etc main/org/apache/avalon/http/impl
Author: niclas
Date: Wed Jul 28 09:07:30 2004
New Revision: 30848
Modified:
avalon/trunk/planet/facilities/http/impl/src/etc/default-server.xml
avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
Log:
Sequencing problem of the Realm/Authenticator vs the HttpContext. Also forgot to add the Mortbay Jaas support jar.
Modified: avalon/trunk/planet/facilities/http/impl/src/etc/default-server.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/etc/default-server.xml (original)
+++ avalon/trunk/planet/facilities/http/impl/src/etc/default-server.xml Wed Jul 28 09:07:30 2004
@@ -8,6 +8,7 @@
<artifact>jar:avalon/http/avalon-http-api#SNAPSHOT</artifact>
<artifact>jar:servletapi/servletapi#2.3</artifact>
<artifact>jar:jetty/org.mortbay.jetty#SNAPSHOT</artifact>
+ <artifact>jar:jetty/org.mortbay.jaas#5.0.RC0</artifact>
<artifact>jar:avalon/http/avalon-http-util#SNAPSHOT</artifact>
<artifact>jar:avalon/util/avalon-util-configuration#1.0.0</artifact>
<artifact>jar:avalon/framework/avalon-framework-api#SNAPSHOT</artifact>
Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java (original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java Wed Jul 28 09:07:30 2004
@@ -73,6 +73,8 @@
private ClassLoader m_ClassLoader;
private RequestLog m_RequestLog;
private MimeTypes m_MimeTypes;
+ private UserRealm m_UserRealm;
+ private Authenticator m_Authenticator;
public HttpContextImpl()
{
@@ -142,17 +144,10 @@
m_HttpServer = (HttpService) man.lookup( "server" );
if( man.hasService( "authenticator" ) )
- {
- Authenticator auth = (Authenticator) man.lookup( "authenticator" );
- m_HttpContext.setAuthenticator( auth );
- }
+ m_Authenticator = (Authenticator) man.lookup( "authenticator" );
if( man.hasService( "realm" ) )
- {
- UserRealm realm = (UserRealm) man.lookup( "realm" );
- m_HttpContext.setRealm( realm );
- m_HttpContext.setRealmName( realm.getName() ); // Is this necessary?
- }
+ m_UserRealm = (UserRealm) man.lookup( "realm" );
m_RequestLog = (RequestLog) man.lookup( "request-log" );
@@ -240,6 +235,10 @@
m_HttpContext.setTempDirectory( m_TemporaryDir );
m_HttpContext.setRequestLog( m_RequestLog );
m_HttpContext.setResourceBase( m_ResourceBase.getAbsolutePath() );
+ m_HttpContext.setAuthenticator( m_Authenticator );
+ m_HttpContext.setRealm( m_UserRealm );
+ m_HttpContext.setRealmName( m_UserRealm.getName() ); // Is this necessary?
+
if( m_MaxCacheSize > 0 )
m_HttpContext.setMaxCacheSize( m_MaxCacheSize );
if( m_MaxCachedFilesize > 0 )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org