Author: ajaquith
Date: Mon Aug 11 21:56:51 2008
New Revision: 685037
URL: http://svn.apache.org/viewvc?rev=685037&view=rev
Log:
Removed reference to Stripes MockServletContext in WebContainerAuthorizer. It
should not have been there.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java?rev=685037&r1=685036&r2=685037&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizer.java
Mon Aug 11 21:56:51 2008
@@ -31,8 +31,6 @@
import javax.servlet.http.HttpServletRequest;
-import net.sourceforge.stripes.mock.MockServletContext;
-
import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
@@ -389,12 +387,6 @@
else
{
url = m_engine.getServletContext().getResource( "/WEB-INF/web.xml"
);
- // Hack in case we're using Stripes mock servlet context
- // See bug [STS-376] at
http://stripesframework.org/jira/browse/STS-376. Will be fixed in Stripes 1.5.
- if ( url == null && m_engine.getServletContext() instanceof
MockServletContext )
- {
- url = m_engine.getServletContext().getResource(
"WEB-INF/web.xml" );
- }
if( url != null )
log.info( "Examining " + url.toExternalForm() );
}