Author: rich
Date: Fri Jan 21 14:18:36 2005
New Revision: 125970
URL: http://svn.apache.org/viewcvs?view=rev&rev=125970
Log:
Renamed:
ServerAdapter -> ServletContainerAdapter
DefaultServerAdapter -> DefaultServletContainerAdapter
TomcatServerAdapter -> TomcatServletContainerAdapter
ServerAdapterManager -> AdapterManager
DRT/BVT: netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
- copied, changed from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java
- copied, changed from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java
(contents, props changed)
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java
(contents, props changed)
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
- copied, changed from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
- copied, changed from r125953,
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
Removed:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
Modified:
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java
Modified: incubator/beehive/trunk/netui/ant/netui.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/ant/netui.properties&r1=125969&p2=incubator/beehive/trunk/netui/ant/netui.properties&r2=125970
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Fri Jan 21 14:18:36 2005
@@ -31,7 +31,7 @@
tomcat.lib.dir=${netui.home}/external/tomcat
#
-# Tomcat properties. These JARs are used to compile the Tomcat 5x
ServerAdapter.
+# Tomcat properties. These JARs are used to compile the Tomcat 5x
ServletContextAdapter.
#
catalina.5x.jar=${tomcat.lib.dir}/5x/catalina.jar
coyote.5x.jar=${tomcat.lib.dir}/5x/tomcat-coyote.jar
@@ -78,4 +78,4 @@
# runtime and compiler versions
pageflow.version.runtime=3
-pageflow.version.compiler=3
\ No newline at end of file
+pageflow.version.compiler=3
Deleted:
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java?view=auto&rev=125969
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
(from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java&r1=125953&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
Fri Jan 21 14:18:36 2005
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.pageflow;
import org.apache.beehive.netui.pageflow.internal.PageFlowBeanContext;
+import org.apache.beehive.netui.pageflow.internal.AdapterContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -27,7 +28,8 @@
import org.apache.beehive.controls.api.context.ControlBeanContext;
-public abstract class DefaultServerAdapter implements ServerAdapter
+public abstract class DefaultServletContainerAdapter
+ implements ServletContainerAdapter
{
private static boolean _productionMode = true;
@@ -51,7 +53,7 @@
}
}
- protected DefaultServerAdapter()
+ protected DefaultServletContainerAdapter()
{
}
@@ -95,12 +97,14 @@
public void login( String username, String password, HttpServletRequest
request, HttpServletResponse response )
throws LoginException
{
- throw new UnsupportedOperationException( "login is not supported by "
+ DefaultServerAdapter.class.getName() );
+ throw new UnsupportedOperationException( "login is not supported by "
+ +
DefaultServletContainerAdapter.class.getName() );
}
public void logout( boolean invalidateSessions, HttpServletRequest
request, HttpServletResponse response )
{
- throw new UnsupportedOperationException( "logout is not supported by "
+ DefaultServerAdapter.class.getName() );
+ throw new UnsupportedOperationException( "logout is not supported by "
+ +
DefaultServletContainerAdapter.class.getName() );
}
public String getFullContextPath( HttpServletRequest request )
@@ -133,9 +137,11 @@
return _servletContext;
}
- public void setServletContext( ServletContext servletContext )
+ public void setContext( AdapterContext context )
{
- _servletContext = servletContext;
+ Object servletContext = context.getExternalContext();
+ assert servletContext instanceof ServletContext : servletContext;
+ _servletContext = ( ServletContext ) servletContext;
}
public String getPlatformName()
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
Fri Jan 21 14:18:36 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.CachedFacesBackingInfo;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.internal.CachedSharedFlowRefInfo;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.util.cache.ClassLevelCache;
@@ -60,7 +60,7 @@
String attr =
ScopedServletUtils.getScopedSessionAttrName(
InternalConstants.FACES_BACKING_ATTR, unwrappedRequest );
ServletContext servletContext = InternalUtils.getServletContext(
request );
- ServerAdapterManager.getServerAdapter( servletContext
).ensureFailover( attr, this, unwrappedRequest );
+ AdapterManager.getServletContainerAdapter( servletContext
).ensureFailover( attr, this, unwrappedRequest );
}
public String getDisplayName()
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
Fri Jan 21 14:18:36 2005
@@ -37,7 +37,7 @@
import org.apache.beehive.netui.pageflow.config.PageFlowActionForward;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.ContextCache;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
@@ -586,7 +586,7 @@
{
PageFlowActionForward.ActionOutput[] actionOutputs =
fc.getActionOutputs();
boolean isInProductionMode =
- ServerAdapterManager.getServerAdapter( _servletContext
).isInProductionMode();
+ AdapterManager.getServletContainerAdapter( _servletContext
).isInProductionMode();
for ( int i = 0; i < actionOutputs.length; ++i )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextListener.java
Fri Jan 21 14:18:36 2005
@@ -22,7 +22,7 @@
//internal imports
import org.apache.beehive.netui.pageflow.internal.ContextCache;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.util.UrlTemplateDescriptor;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.ConfigInitializationException;
@@ -96,7 +96,7 @@
}
ContextCache.init( servletContext );
- ServerAdapterManager.init( servletContext );
+ AdapterManager.initServletContext( servletContext );
UrlTemplateDescriptor.getInstance().load( servletContext );
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Fri Jan 21 14:18:36 2005
@@ -37,7 +37,7 @@
import org.apache.beehive.netui.pageflow.internal.CachedPageFlowInfo;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.internal.CachedSharedFlowRefInfo;
import org.apache.beehive.netui.pageflow.internal.ViewRenderer;
import org.apache.beehive.netui.pageflow.internal.RequestValues;
@@ -212,7 +212,7 @@
if ( request.getAttribute( DELETING_PAGEFLOW_ATTR ) != this &&
request.getSession( false ) != null )
{
HttpServletRequest unwrappedRequest =
PageFlowUtils.unwrapMultipart( request );
- ServerAdapter serverAdapter =
ServerAdapterManager.getServerAdapter( getServletContext() );
+ ServletContainerAdapter servletContainerAdapter =
AdapterManager.getServletContainerAdapter( getServletContext() );
//
// If this is a long-lived page flow, there are two attributes to
deal with.
@@ -223,13 +223,13 @@
longLivedAttrName =
ScopedServletUtils.getScopedSessionAttrName( longLivedAttrName,
unwrappedRequest );
String currentLongLivedAttrName =
ScopedServletUtils.getScopedSessionAttrName(
CURRENT_LONGLIVED_ATTR, unwrappedRequest );
- serverAdapter.ensureFailover( longLivedAttrName, this,
unwrappedRequest );
- serverAdapter.ensureFailover( currentLongLivedAttrName,
getModulePath(), unwrappedRequest );
+ servletContainerAdapter.ensureFailover( longLivedAttrName,
this, unwrappedRequest );
+ servletContainerAdapter.ensureFailover(
currentLongLivedAttrName, getModulePath(), unwrappedRequest );
}
else
{
String attrName = ScopedServletUtils.getScopedSessionAttrName(
CURRENT_JPF_ATTR, unwrappedRequest );
- serverAdapter.ensureFailover( attrName, this, unwrappedRequest
);
+ servletContainerAdapter.ensureFailover( attrName, this,
unwrappedRequest );
}
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
Fri Jan 21 14:18:36 2005
@@ -48,7 +48,7 @@
import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
@@ -58,7 +58,7 @@
public abstract class PageFlowPageFilter implements Filter
{
private ServletContext _servletContext;
- private ServerAdapter _serverAdapter;
+ private ServletContainerAdapter _servletContainerAdapter;
private static final Logger _log = Logger.getInstance(
PageFlowPageFilter.class );
@@ -72,7 +72,7 @@
PageFlowPageFilter( ServletContext servletContext )
{
_servletContext = servletContext;
- _serverAdapter = ServerAdapterManager.getServerAdapter(
_servletContext );
+ _servletContainerAdapter = AdapterManager.getServletContainerAdapter(
_servletContext );
}
public void init( FilterConfig filterConfig ) throws ServletException
@@ -84,7 +84,7 @@
PageFlowContextListener.performInitializations( _servletContext );
}
- _serverAdapter = ServerAdapterManager.getServerAdapter(
_servletContext );
+ _servletContainerAdapter = AdapterManager.getServletContainerAdapter(
_servletContext );
}
protected abstract Set getValidFileExtensions();
@@ -150,7 +150,7 @@
//
// Callback to the server adapter.
//
- _serverAdapter.beginRequest( httpRequest, httpResponse );
+ _servletContainerAdapter.beginRequest( httpRequest, httpResponse );
//
// Initialize the ControlBeanContext in the session.
@@ -211,7 +211,7 @@
//
// Callback to the server adapter.
//
- _serverAdapter.endRequest( httpRequest, httpResponse );
+ _servletContainerAdapter.endRequest( httpRequest, httpResponse
);
}
}
else
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Fri Jan 21 14:18:36 2005
@@ -81,7 +81,7 @@
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
import org.apache.beehive.netui.pageflow.internal.FlowControllerAction;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.handler.ForwardRedirectHandler;
@@ -119,7 +119,7 @@
private Map< String, Class > _formBeanClasses = new HashMap< String, Class
>();
private Map< String, List< ActionMapping > > _overloadedActions = new
HashMap< String, List< ActionMapping > >();
- private ServerAdapter _serverAdapter;
+ private ServletContainerAdapter _servletContainerAdapter;
private ConcurrentHashMap< String, Class > _pageServletClasses = new
ConcurrentHashMap< String, Class >();
private PageFlowPageFilter _pageServletFilter;
@@ -450,7 +450,7 @@
// security check may not have been done for the request URI. In
this case, a redirect
// to https may happen during checkSecurity().
//
- if ( _serverAdapter.doSecurityRedirect( uri, request, response ) )
+ if ( _servletContainerAdapter.doSecurityRedirect( uri, request,
response ) )
{
if ( _log.isDebugEnabled() )
{
@@ -746,7 +746,7 @@
//
// Callback to the server adapter.
//
- _serverAdapter.beginRequest( request, response );
+ _servletContainerAdapter.beginRequest( request, response );
//
// Initialize the ControlBeanContext in the session.
@@ -772,7 +772,7 @@
//
// Callback to the server adapter.
//
- _serverAdapter.endRequest( request, response );
+ _servletContainerAdapter.endRequest( request, response );
}
if ( _log.isTraceEnabled() )
@@ -983,9 +983,9 @@
cacheFormClasses();
//
- // Cache a reference to the ServerAdapter.
+ // Cache a reference to the ServletContainerAdapter.
//
- _serverAdapter = ServerAdapterManager.getServerAdapter(
getServletContext() );
+ _servletContainerAdapter = AdapterManager.getServletContainerAdapter(
getServletContext() );
_pageServletFilter = new PageServletFilter();
@@ -1520,7 +1520,7 @@
if ( _log.isWarnEnabled() )
{
_log.warn( "Could not change the scheme to " + scheme + "
because the relevant port was not provided "
- + "by the ServerAdapter." );
+ + "by the ServletContainerAdapter." );
return false;
}
}
@@ -1603,7 +1603,7 @@
{
if ( sp.equals( SecurityProtocol.UNSECURE ) )
{
- int listenPort = _serverAdapter.getListenPort(
request );
+ int listenPort =
_servletContainerAdapter.getListenPort( request );
securityRedirected = changeScheme( uri,
SCHEME_UNSECURE, listenPort, request, response );
}
}
@@ -1611,7 +1611,7 @@
{
if ( sp.equals( SecurityProtocol.SECURE ) )
{
- int secureListenPort =
_serverAdapter.getSecureListenPort( request );
+ int secureListenPort =
_servletContainerAdapter.getSecureListenPort( request );
securityRedirected = changeScheme( uri,
SCHEME_SECURE, secureListenPort, request, response );
}
}
@@ -1638,7 +1638,7 @@
* implementation looks for a file on classpath called
* META-INF/pageflow-page-servlets/<i>path-to-page</i>.properties (e.g.,
* "/META-INF/pageflow-page-servlets/foo/bar/hello.jsp.properties"). This
file contains mappings from
- * <i>platform-name</i> (the value returned by [EMAIL PROTECTED]
ServerAdapter#getPlatformName}) to the name of a Servlet
+ * <i>platform-name</i> (the value returned by [EMAIL PROTECTED]
ServletContainerAdapter#getPlatformName}) to the name of a Servlet
* class that will process the page request. If the current platform name
is not found, the value "default" is
* tried. An example file might look like this:
* <pre>
@@ -1672,7 +1672,7 @@
{
Properties props = new Properties();
props.load( in );
- className = props.getProperty(
_serverAdapter.getPlatformName() );
+ className = props.getProperty(
_servletContainerAdapter.getPlatformName() );
if ( className == null ) className = props.getProperty(
"default" );
if ( className != null )
@@ -1789,7 +1789,7 @@
*/
protected void processNoCache( HttpServletRequest request,
HttpServletResponse response )
{
- if ( moduleConfig.getControllerConfig().getNocache() || !
_serverAdapter.isInProductionMode() )
+ if ( moduleConfig.getControllerConfig().getNocache() || !
_servletContainerAdapter.isInProductionMode() )
{
//
// The call to PageFlowJspFilter.preventCache() will cause caching
to be prevented
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
Fri Jan 21 14:18:36 2005
@@ -23,7 +23,7 @@
import org.apache.beehive.netui.pageflow.interceptor.ActionInterceptorChain;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionBindingEvent;
@@ -206,7 +206,7 @@
{
String name =
ScopedServletUtils.getScopedSessionAttrName( JPF_STACK_ATTR,
PageFlowUtils.unwrapMultipart( request ) );
- ServerAdapterManager.getServerAdapter( servletContext
).ensureFailover( name, this, request );
+ AdapterManager.getServletContainerAdapter( servletContext
).ensureFailover( name, this, request );
}
void save( HttpServletRequest request )
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Fri Jan 21 14:18:36 2005
@@ -25,7 +25,7 @@
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.RequestValues;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedResponse;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
@@ -716,7 +716,7 @@
public static SecurityProtocol getSecurityProtocol( String uri,
ServletContext servletContext,
HttpServletRequest
request )
{
- return ServerAdapterManager.getServerAdapter( servletContext
).getSecurityProtocol( uri, request );
+ return AdapterManager.getServletContainerAdapter( servletContext
).getSecurityProtocol( uri, request );
}
/**
@@ -724,7 +724,7 @@
*/
public static Boolean isSecureResource( String uri, ServletContext context
)
{
- // TODO: once DefaultServerAdapter has this functionality, delegate to
it.
+ // TODO: once DefaultServletContainerAdapter has this functionality,
delegate to it.
return null;
}
Deleted:
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java?view=auto&rev=125969
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java
(from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java&r1=125953&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ServletContainerAdapter.java
Fri Jan 21 14:18:36 2005
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.pageflow;
import org.apache.beehive.controls.api.context.ControlBeanContext;
+import org.apache.beehive.netui.pageflow.internal.Adapter;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -29,19 +30,9 @@
/**
* @exclude
*/
-public interface ServerAdapter
+public interface ServletContainerAdapter
+ extends Adapter
{
- /**
- * Called upon the initialization of the given ServletContext, to decide
whether this ServerAdapter instance
- * should become active.
- *
- * @param servletContext the ServletContext being initialized.
- * @return <code>true</code> if the environment is appropriate for this
ServerAdapter, and it should become active.
- */
- public boolean accept( ServletContext servletContext );
-
- public void setServletContext( ServletContext servletContext );
-
/**
* Tell whether the server is running in production mode. This is
server-dependent, but by default it should
* return <code>false</code> only if the System property
<code>pageflow:devmode</code> is set.
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
Fri Jan 21 14:18:36 2005
@@ -26,7 +26,7 @@
import javax.servlet.http.HttpSession;
import javax.servlet.ServletContext;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import static org.apache.beehive.netui.pageflow.internal.InternalConstants.*;
@@ -70,8 +70,8 @@
*/
public void ensureFailover( HttpServletRequest request )
{
- ServerAdapter serverAdapter = ServerAdapterManager.getServerAdapter(
getServletContext() );
- serverAdapter.ensureFailover( SHARED_FLOW_ATTR_PREFIX +
getClass().getName(), this, request );
+ ServletContainerAdapter servletContainerAdapter =
AdapterManager.getServletContainerAdapter( getServletContext() );
+ servletContainerAdapter.ensureFailover( SHARED_FLOW_ATTR_PREFIX +
getClass().getName(), this, request );
}
/**
Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java?view=auto&rev=125970
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/Adapter.java
Fri Jan 21 14:18:36 2005
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.pageflow.internal;
+
+// TODO: this class should go into a beehive-common area
+/**
+ * Base interface for all discoverable adapters.
+ */
+public interface Adapter
+{
+ /**
+ * Called upon the initialization, to decide whether this Adapter instance
should become active.
+ *
+ * @param context the context being initialized.
+ * @return <code>true</code> if the environment is appropriate for this
Adapter, and it should become active.
+ */
+ public boolean accept( AdapterContext context );
+
+ /**
+ * Set the generic AdapterContext.
+ */
+ public void setContext( AdapterContext context );
+}
Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java?view=auto&rev=125970
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterContext.java
Fri Jan 21 14:18:36 2005
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.pageflow.internal;
+
+// TODO: this class should go into a beehive-common area
+/**
+ * Generic context passed to [EMAIL PROTECTED] Adapter}.
+ */
+public class AdapterContext
+{
+ private Object _externalContext;
+
+ public AdapterContext( Object externalContext )
+ {
+ _externalContext = externalContext;
+ }
+
+ public Object getExternalContext()
+ {
+ return _externalContext;
+ }
+
+ public void setExternalContext( Object externalContext )
+ {
+ _externalContext = externalContext;
+ }
+}
Copied:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
(from r125953,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java&r1=125953&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
Fri Jan 21 14:18:36 2005
@@ -17,8 +17,8 @@
*/
package org.apache.beehive.netui.pageflow.internal;
-import org.apache.beehive.netui.pageflow.DefaultServerAdapter;
-import org.apache.beehive.netui.pageflow.ServerAdapter;
+import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
+import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.DiscoveryUtils;
@@ -28,16 +28,17 @@
/**
* @exclude
*/
-public class ServerAdapterManager
+public class AdapterManager
{
- private static final Logger _log = Logger.getInstance(
ServerAdapterManager.class );
+ private static final Logger _log = Logger.getInstance(
AdapterManager.class );
- private static final String SERVER_ADAPTER_ATTR = "_netui:_serverAdapter";
- private static final String SERVER_ADAPTER_PROP = "pageflow.serveradapter";
+ private static final String SERVLET_CONTAINER_ADAPTER_ATTR =
InternalConstants.ATTR_PREFIX + "servletAdapter";
+ private static final String SERVLET_CONTAINER_ADAPTER_PROP =
"beehive.servletcontaineradapter";
- public static ServerAdapter getServerAdapter( ServletContext
servletContext )
+ public static ServletContainerAdapter getServletContainerAdapter(
ServletContext servletContext )
{
- ServerAdapter adapter = ( ServerAdapter ) servletContext.getAttribute(
SERVER_ADAPTER_ATTR );
+ ServletContainerAdapter adapter =
+ ( ServletContainerAdapter ) servletContext.getAttribute(
SERVLET_CONTAINER_ADAPTER_ATTR );
if ( adapter == null )
{
@@ -50,102 +51,102 @@
// We can initialize it now, but it's not good because many
requests could conceivably be in this
// code at the same time.
//
- return init( servletContext );
+ return initServletContext( servletContext );
}
return adapter;
}
- public static ServerAdapter init( ServletContext servletContext )
+ public static ServletContainerAdapter initServletContext( ServletContext
servletContext )
{
- ServerAdapter serverAdapter = createServerAdapter( servletContext );
- servletContext.setAttribute( SERVER_ADAPTER_ATTR, serverAdapter );
- return serverAdapter;
+ ServletContainerAdapter servletContainerAdapter =
createServletContainerAdapter( servletContext );
+ servletContext.setAttribute( SERVLET_CONTAINER_ADAPTER_ATTR,
servletContainerAdapter );
+ return servletContainerAdapter;
}
- private static ServerAdapter tryServerAdapter( Class serverAdapterClass,
ServletContext servletContext )
+ // TODO: this method could move to a more general place.
+ private static Adapter tryAdapter( Class adapterClass, Object
externalContext )
{
try
{
- ServerAdapter sa = ( ServerAdapter )
serverAdapterClass.newInstance();
+ Adapter sa = ( Adapter ) adapterClass.newInstance();
try
{
- if ( sa.accept( servletContext ) )
+ AdapterContext context = new AdapterContext( externalContext );
+
+ if ( sa.accept( context ) )
{
- _log.info( "ServerAdapter " + serverAdapterClass.getName()
+ " accepted." );
- sa.setServletContext( servletContext );
+ _log.info( "Adapter " + adapterClass.getName() + "
accepted." );
+ sa.setContext( context );
return sa;
}
else
{
- _log.info( "ServerAdapter " + serverAdapterClass.getName()
+ " is present but did not accept." );
+ _log.info( "Adapter " + adapterClass.getName() + " is
present but did not accept." );
}
}
catch ( Exception e )
{
- _log.error( serverAdapterClass.getName() + ".accept() threw an
exception.", e );
+ _log.error( adapterClass.getName() + ".accept() threw an
exception.", e );
}
catch ( LinkageError e )
{
- _log.error( serverAdapterClass.getName() + ".accept() caused a
linkage error and may be out of date.", e );
+ _log.error( adapterClass.getName() + ".accept() caused a
linkage error and may be out of date.", e );
}
}
catch ( InstantiationException e )
{
- _log.error( "Could not create instance of ServerAdapter class " +
serverAdapterClass.getName(), e );
+ _log.error( "Could not create instance of Adapter class " +
adapterClass.getName(), e );
}
catch ( IllegalAccessException e )
{
- _log.error( "Could not create instance of ServerAdapter class " +
serverAdapterClass.getName(), e );
+ _log.error( "Could not create instance of Adapter class " +
adapterClass.getName(), e );
}
catch ( Exception e )
{
- _log.error( "Error creating instance of ServerAdapter class " +
serverAdapterClass.getName(), e );
+ _log.error( "Error creating instance of Adapter class " +
adapterClass.getName(), e );
}
return null;
}
- private static ServerAdapter createServerAdapter( ServletContext
servletContext )
+ private static ServletContainerAdapter createServletContainerAdapter(
ServletContext servletContext )
{
- String serverAdapterClassName = System.getProperty(
SERVER_ADAPTER_PROP );
+ String adapterClassName = System.getProperty(
SERVLET_CONTAINER_ADAPTER_PROP );
- if ( serverAdapterClassName != null )
+ if ( adapterClassName != null )
{
- Class serverAdapterClass = DiscoveryUtils.loadImplementorClass(
serverAdapterClassName, ServerAdapter.class );
+ Class adapterClass =
+ DiscoveryUtils.loadImplementorClass( adapterClassName,
ServletContainerAdapter.class );
- if ( serverAdapterClass != null )
+ if ( adapterClass != null )
{
- ServerAdapter sa = tryServerAdapter( serverAdapterClass,
servletContext );
- if ( sa != null )
- {
- return sa;
- }
+ ServletContainerAdapter sa =
+ ( ServletContainerAdapter ) tryAdapter( adapterClass,
servletContext );
+ if ( sa != null ) return sa;
}
}
- Class[] classes = DiscoveryUtils.getImplementorClasses(
ServerAdapter.class );
+ Class[] classes = DiscoveryUtils.getImplementorClasses(
ServletContainerAdapter.class );
for ( int i = 0; i < classes.length; i++ )
{
- ServerAdapter sa = tryServerAdapter( classes[i], servletContext );
- if ( sa != null )
- {
- return sa;
- }
+ ServletContainerAdapter sa =
+ ( ServletContainerAdapter ) tryAdapter( classes[i],
servletContext );
+ if ( sa != null ) return sa;
}
- _log.info( "No ServerAdapter specified or discovered; using " +
DefaultServerAdapter.class );
- ServerAdapter sa =
- new DefaultServerAdapter()
+ _log.info( "No ServletContainerAdapter specified or discovered; using
" + DefaultServletContainerAdapter.class );
+ ServletContainerAdapter sa =
+ new DefaultServletContainerAdapter()
{
- public boolean accept( ServletContext servletContext )
+ public boolean accept( AdapterContext context )
{
return true;
}
};
- sa.setServletContext( servletContext );
+ sa.setContext( new AdapterContext( servletContext ) );
return sa;
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Fri Jan 21 14:18:36 2005
@@ -367,7 +367,7 @@
//
// PageFlowExceptions know what to do in the unhandled case.
//
- boolean prodMode = ServerAdapterManager.getServerAdapter(
servletContext ).isInProductionMode();
+ boolean prodMode = AdapterManager.getServletContainerAdapter(
servletContext ).isInProductionMode();
if ( ! prodMode && ex instanceof PageFlowManagedObjectException )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultLoginHandler.java
Fri Jan 21 14:18:36 2005
@@ -41,12 +41,12 @@
public void login( String username, String password, HttpServletRequest
request, HttpServletResponse response )
throws LoginException
{
- ServerAdapterManager.getServerAdapter( getServletContext() ).login(
username, password, request, response );
+ AdapterManager.getServletContainerAdapter( getServletContext()
).login( username, password, request, response );
}
public void logout( boolean invalidateSessions, HttpServletRequest
request, HttpServletResponse response )
{
- ServerAdapterManager.getServerAdapter( getServletContext() ).logout(
invalidateSessions, request, response );
+ AdapterManager.getServletContainerAdapter( getServletContext()
).logout( invalidateSessions, request, response );
}
public boolean isUserInRole( String roleName, HttpServletRequest request )
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
Fri Jan 21 14:18:36 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.pageflow.internal;
import org.apache.beehive.netui.pageflow.AutoRegisterActionServlet;
-import org.apache.beehive.netui.pageflow.ServerAdapter;
+import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
import org.apache.beehive.netui.util.classloader.BouncyClassLoader;
import org.apache.beehive.netui.util.cache.ClassLevelCache;
@@ -53,7 +53,7 @@
if ( false )
{
ClassLoader contextClassLoader =
Thread.currentThread().getContextClassLoader();
- ServerAdapter serverAdapter =
ServerAdapterManager.getServerAdapter( servletContext );
+ ServletContainerAdapter servletContainerAdapter =
AdapterManager.getServletContainerAdapter( servletContext );
File[] classDirs = null;
// TODO: make this configurable in netui-config.xml. You should
be able to specify absolute files
@@ -68,7 +68,7 @@
}
}
- if ( classDirs != null && ! serverAdapter.isInProductionMode() )
+ if ( classDirs != null && !
servletContainerAdapter.isInProductionMode() )
{
_pageFlowClassLoader = new BouncyClassLoader( classDirs,
contextClassLoader );
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java
Fri Jan 21 14:18:36 2005
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.core.urls.MutableURI;
import org.apache.beehive.netui.core.urls.URLRewriter;
import org.apache.beehive.netui.core.urls.URLRewriter.URLType;
-import org.apache.beehive.netui.pageflow.ServerAdapter;
+import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.pageflow.util.TemplateHelper;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.util.logging.Logger;
@@ -45,7 +45,7 @@
public void rewriteURL( ServletContext servletContext, ServletRequest
request,
ServletResponse response, MutableURI url, URLType
type, boolean needsToBeSecure )
{
- ServerAdapter serverAdapter = ServerAdapterManager.getServerAdapter(
servletContext );
+ ServletContainerAdapter servletContainerAdapter =
AdapterManager.getServletContainerAdapter( servletContext );
// If url is not absolute, then do default secure/unsecure rewriting
if ( !url.isAbsolute() )
@@ -54,7 +54,7 @@
{
if ( !request.isSecure() )
{
- int securePort = serverAdapter.getSecureListenPort(
(HttpServletRequest) request );
+ int securePort =
servletContainerAdapter.getSecureListenPort( (HttpServletRequest) request );
if (securePort != -1)
{
@@ -65,7 +65,7 @@
if (_log.isWarnEnabled())
{
_log.warn("Could not rewrite URL " +
url.toString() + " to be secure because a secure port was" +
- " not provided by the ServerAdapter.");
+ " not provided by the
ServletContainerAdapter.");
}
}
}
@@ -74,7 +74,7 @@
{
if ( request.isSecure() )
{
- int listenPort =
serverAdapter.getListenPort((HttpServletRequest) request);
+ int listenPort =
servletContainerAdapter.getListenPort((HttpServletRequest) request);
if (listenPort != -1 )
{
@@ -85,7 +85,7 @@
if (_log.isWarnEnabled())
{
_log.warn("Could not rewrite URL " +
url.toString() + " to be non-secure because a secure port was" +
- " not provided by the ServerAdapter.");
+ " not provided by the
ServletContainerAdapter.");
}
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
Fri Jan 21 14:18:36 2005
@@ -95,7 +95,7 @@
HttpServletResponse response,
ServletContext servletContext )
throws IOException
{
- boolean prodMode = ServerAdapterManager.getServerAdapter(
servletContext ).isInProductionMode();
+ boolean prodMode = AdapterManager.getServletContainerAdapter(
servletContext ).isInProductionMode();
if ( prodMode && ! RequestValues.avoidDirectResponseOutput( request ) )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java
Fri Jan 21 14:18:36 2005
@@ -126,7 +126,7 @@
if ( createIfMissing )
{
beanContext =
- ServerAdapterManager.getServerAdapter( servletContext
).createControlBeanContext( request, response );
+ AdapterManager.getServletContainerAdapter( servletContext
).createControlBeanContext( request, response );
request.getSession().setAttribute( CONTROL_CONTEXT_CLASSNAME,
beanContext );
request.setAttribute( CONTROL_CONTEXT_CLASSNAME, beanContext );
}
Deleted:
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ServerAdapterManager.java?view=auto&rev=125969
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
Fri Jan 21 14:18:36 2005
@@ -18,9 +18,9 @@
package org.apache.beehive.netui.pageflow.util;
//internal imports
-import org.apache.beehive.netui.pageflow.ServerAdapter;
+import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.util.FileUtils;
import org.apache.beehive.netui.util.logging.Logger;
@@ -60,14 +60,14 @@
}
else
{
- ServerAdapter serverAdapter =
ServerAdapterManager.getServerAdapter(servletContext);
+ ServletContainerAdapter servletContainerAdapter =
AdapterManager.getServletContainerAdapter(servletContext);
//Need to do default secure/unsecure rewriting
if ((type.equals(URLRewriter.ACTION_SECURE) ||
(type.equals(URLRewriter.RESOURCE_SECURE))))
{
if (!request.isSecure())
{
- int securePort =
serverAdapter.getSecureListenPort((HttpServletRequest) request);
+ int securePort =
servletContainerAdapter.getSecureListenPort((HttpServletRequest) request);
if (securePort != -1)
{
@@ -78,7 +78,7 @@
if (_log.isWarnEnabled())
{
_log.warn("Could not rewrite URL " + url + " to be
secure because a secure port was" +
- " not provided by the ServerAdapter.");
+ " not provided by the
ServletContainerAdapter.");
}
}
}
@@ -87,7 +87,7 @@
{
if (request.isSecure())
{
- int listenPort =
serverAdapter.getListenPort((HttpServletRequest) request);
+ int listenPort =
servletContainerAdapter.getListenPort((HttpServletRequest) request);
if (listenPort != -1 )
{
@@ -98,7 +98,7 @@
if (_log.isWarnEnabled())
{
_log.warn("Could not rewrite URL " + url + " to be
secure because a secure port was" +
- " not provided by the ServerAdapter.");
+ " not provided by the
ServletContainerAdapter.");
}
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java&r1=125969&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java
Fri Jan 21 14:18:36 2005
@@ -28,7 +28,7 @@
import org.apache.beehive.netui.core.urltemplates.URLTemplate;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
/**
* Class for creating URLs from parameterized templates.
@@ -570,7 +570,7 @@
else {
// Append the webapp name
ServletContext servletContext =
InternalUtils.getServletContext(httpRequest);
- String webAppName =
ServerAdapterManager.getServerAdapter(servletContext).getFullContextPath(httpRequest);
+ String webAppName =
AdapterManager.getServletContainerAdapter(servletContext).getFullContextPath(httpRequest);
buf = appendEnsureSeparator(buf, webAppName);
// Append the servlet name (mapping)
@@ -656,7 +656,7 @@
else {
// Append the webapp name
ServletContext servletContext =
InternalUtils.getServletContext(httpRequest);
- String webAppName =
ServerAdapterManager.getServerAdapter(servletContext).getFullContextPath(httpRequest);
+ String webAppName =
AdapterManager.getServletContainerAdapter(servletContext).getFullContextPath(httpRequest);
buf.append(webAppName);
// Append the servlet name (mapping)
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java&r1=125969&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/BindingUpdateErrors.java
Fri Jan 21 14:18:36 2005
@@ -17,10 +17,10 @@
*/
package org.apache.beehive.netui.tags.html;
-import org.apache.beehive.netui.pageflow.ServerAdapter;
+import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.pageflow.internal.BindingUpdateError;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.util.Bundle;
@@ -116,7 +116,7 @@
}
PageContext pageContext = getPageContext();
- ServerAdapter sa =
ServerAdapterManager.getServerAdapter(pageContext.getServletContext());
+ ServletContainerAdapter sa =
AdapterManager.getServletContainerAdapter(pageContext.getServletContext());
ServletRequest request = pageContext.getRequest();
assert(sa != null);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java&r1=125969&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java
Fri Jan 21 14:18:36 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.tags.html;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.util.HtmlExceptionFormatter;
import org.apache.struts.Globals;
@@ -114,7 +114,7 @@
}
if (!_showStackTrace && _showDevModeStackTrace) {
- boolean devMode =
!ServerAdapterManager.getServerAdapter(pageContext.getServletContext()).isInProductionMode();
+ boolean devMode =
!AdapterManager.getServletContainerAdapter(pageContext.getServletContext()).isInProductionMode();
if (devMode)
_showStackTrace = true;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=125969&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Fri Jan 21 14:18:36 2005
@@ -20,7 +20,7 @@
import org.apache.beehive.netui.core.URLCodec;
import org.apache.beehive.netui.core.urls.MutableURI;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.internal.ServerAdapterManager;
+import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.script.ExpressionUpdateException;
import org.apache.beehive.netui.script.IllegalExpressionException;
@@ -784,7 +784,7 @@
// In devMode we will verify the structure of the tree. This will not
run in
// production mode.
ServletContext servletContext =
InternalUtils.getServletContext(request);
- boolean devMode =
!ServerAdapterManager.getServerAdapter(servletContext).isInProductionMode();
+ boolean devMode =
!AdapterManager.getServletContainerAdapter(servletContext).isInProductionMode();
if (devMode) {
boolean error = false;
StringBuilder errorText = new StringBuilder(64);
Modified:
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java&r1=125969&p2=incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowHelperImpl.java
Fri Jan 21 14:18:36 2005
@@ -209,8 +209,7 @@
*/
private SecurityConstraint findBestMatchSecurityConstraint( String uri,
Context ctx )
{
- // NOTE: this logic copied from WeblogicServerAdapter, modified to use
catalina classes instead of WLS mbeans
- //
org.apache.catalina.authenticator.AuthenticatorBase.findConstraint() has a
similar method but it only
+ // NOTE:
org.apache.catalina.authenticator.AuthenticatorBase.findConstraint() has a
similar method but it only
// finds the first SecurityConstraint that matches, not necessarily
the best match
SecurityConstraint[] securityConstraints = ctx.findConstraints();
Modified:
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java&r1=125969&p2=incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java
(original)
+++
incubator/beehive/trunk/netui/src/tomcat-server/5x/org/apache/beehive/netui/tomcat/PageflowValve.java
Fri Jan 21 14:18:36 2005
@@ -34,7 +34,7 @@
* Tomcat valve implementation to give the netui pageflow infrastructure
access to tomcat
* internal functionality. When this valve is configured in a context, an
instance of
* org.apache.beehive.netui.tomcat.PageflowHelper will be placed in the
session, which can
- * be used by the TomcatServerAdapter implementation of
org.apache.beehive.netui.pageflow.ServletAdapter.
+ * be used by the TomcatServletContainerAdapter implementation of
org.apache.beehive.netui.pageflow.ServletAdapter.
*/
public class PageflowValve extends BasicAuthenticator
{
Deleted:
/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java?view=auto&rev=125969
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
(from r125953,
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?view=diff&rev=125970&p1=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java&r1=125953&p2=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java&r2=125970
==============================================================================
---
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Fri Jan 21 14:18:36 2005
@@ -18,8 +18,9 @@
package org.apache.beehive.netui.tomcat;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.pageflow.DefaultServerAdapter;
+import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
import org.apache.beehive.netui.pageflow.SecurityProtocol;
+import org.apache.beehive.netui.pageflow.internal.AdapterContext;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.DiscoveryUtils;
@@ -28,15 +29,15 @@
import javax.servlet.ServletContext;
import javax.security.auth.login.LoginException;
-public class TomcatServerAdapter extends DefaultServerAdapter
+public class TomcatServletContainerAdapter extends
DefaultServletContainerAdapter
{
- private static final Logger _log = Logger.getInstance(
TomcatServerAdapter.class );
+ private static final Logger _log = Logger.getInstance(
TomcatServletContainerAdapter.class );
private static final String CATALINA_HOME_PROP = "catalina.home";
private static final String HELPER_INTERFACE_CLASSNAME =
"org.apache.beehive.netui.tomcat.PageflowHelper";
- public boolean accept( ServletContext servletContext )
+ public boolean accept( AdapterContext context )
{
if ( System.getProperty( CATALINA_HOME_PROP ) != null )
{
@@ -50,14 +51,14 @@
catch ( ClassNotFoundException e )
{
_log.error( "Could not load helper interface " +
HELPER_INTERFACE_CLASSNAME + "; cannot use "
- + TomcatServerAdapter.class.getName() + ". Make
sure that the netui tomcat common" +
+ + TomcatServletContainerAdapter.class.getName() +
". Make sure that the netui tomcat common" +
" and server jars are in Tomcat's common and
server lib directories, respectively.", e );
return false;
}
if ( _log.isInfoEnabled() )
{
- _log.info( "Using " + TomcatServerAdapter.class.getName() + "
as the ServerAdapter." );
+ _log.info( "Using " +
TomcatServletContainerAdapter.class.getName() + " as the
ServletContainerAdapter." );
}
return true;
@@ -67,7 +68,7 @@
if ( _log.isInfoEnabled() )
{
_log.info( "Not running in Tomcat (" + CATALINA_HOME_PROP + "
is not set); "
- + TomcatServerAdapter.class.getName() + " will not
be used." );
+ + TomcatServletContainerAdapter.class.getName() + "
will not be used." );
}
return false;
