vmassol 01/08/19 08:40:25
Modified: cactus/src/framework/servlet22/org/apache/commons/cactus/server
ServletConfigWrapper.java
HttpServletRequestWrapper.java
ServletContextWrapper.java
RequestDispatcherWrapper.java
Log:
align with coding conventions
Revision Changes Path
1.2 +19 -16
jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/ServletConfigWrapper.java
Index: ServletConfigWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/ServletConfigWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletConfigWrapper.java 2001/04/09 11:52:35 1.1
+++ ServletConfigWrapper.java 2001/08/19 15:40:25 1.2
@@ -66,7 +66,9 @@
* <code>getServletContext()</code> method to return our own wrapper around
* <code>ServletContext</code>.
*
- * @version @version@
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
+ *
+ * @version $Id: ServletConfigWrapper.java,v 1.2 2001/08/19 15:40:25 vmassol Exp $
* @see ServletContext
*/
public class ServletConfigWrapper implements ServletConfig
@@ -74,25 +76,25 @@
/**
* The original servlet config object
*/
- private ServletConfig m_OriginalConfig;
+ private ServletConfig originalConfig;
/**
* List of parameters set using the <code>setInitParameter()</code> method.
*/
- private Hashtable m_InitParameters;
+ private Hashtable initParameters;
/**
* Simulated name of the servlet
*/
- private String m_ServletName;
+ private String servletName;
/**
* @param theOriginalConfig the original servlet config object
*/
public ServletConfigWrapper(ServletConfig theOriginalConfig)
{
- m_OriginalConfig = theOriginalConfig;
- m_InitParameters = new Hashtable();
+ this.originalConfig = theOriginalConfig;
+ this.initParameters = new Hashtable();
}
/**
@@ -103,7 +105,7 @@
*/
public void setInitParameter(String theName, String theValue)
{
- m_InitParameters.put(theName, theValue);
+ this.initParameters.put(theName, theValue);
}
/**
@@ -114,7 +116,7 @@
*/
public void setServletName(String theServletName)
{
- m_ServletName = theServletName;
+ this.servletName = theServletName;
}
//--Overridden methods -----------------------------------------------------
@@ -124,7 +126,8 @@
*/
public ServletContext getServletContext()
{
- return new ServletContextWrapper(m_OriginalConfig.getServletContext());
+ return new ServletContextWrapper(
+ this.originalConfig.getServletContext());
}
/**
@@ -137,9 +140,9 @@
{
// Look first in the list of parameters set using the
// setInitParameter() method.
- String value = (String)m_InitParameters.get(theName);
+ String value = (String)this.initParameters.get(theName);
if (value == null) {
- value = m_OriginalConfig.getInitParameter(theName);
+ value = this.originalConfig.getInitParameter(theName);
}
return value;
@@ -154,13 +157,13 @@
{
Vector names = new Vector();
- Enumeration enum = m_InitParameters.keys();
+ Enumeration enum = this.initParameters.keys();
while (enum.hasMoreElements()) {
String value = (String)enum.nextElement();
names.add(value);
}
- enum = m_OriginalConfig.getInitParameterNames();
+ enum = this.originalConfig.getInitParameterNames();
while (enum.hasMoreElements()) {
String value = (String)enum.nextElement();
names.add(value);
@@ -175,11 +178,11 @@
*/
public String getServletName()
{
- if (m_ServletName != null) {
- return m_ServletName;
+ if (this.servletName != null) {
+ return this.servletName;
}
- return m_OriginalConfig.getServletName();
+ return this.originalConfig.getServletName();
}
}
1.4 +104 -97
jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/HttpServletRequestWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpServletRequestWrapper.java 2001/07/04 09:17:21 1.3
+++ HttpServletRequestWrapper.java 2001/08/19 15:40:25 1.4
@@ -75,25 +75,28 @@
* server redirector servlet or JSP and not a URL that the test case want to
* simulate.
*
- * @version @version@
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
+ *
+ * @version $Id: HttpServletRequestWrapper.java,v 1.4 2001/08/19 15:40:25 vmassol
Exp $
*/
public class HttpServletRequestWrapper implements HttpServletRequest
{
/**
* The real HTTP request
*/
- private HttpServletRequest m_Request;
+ private HttpServletRequest request;
/**
* The URL to simulate
*/
- private ServletURL m_URL;
+ private ServletURL url;
/**
* The logger
*/
- private static Log m_Logger =
- LogService.getInstance().getLog(HttpServletRequestWrapper.class.getName());
+ private static Log logger =
+ LogService.getInstance().
+ getLog(HttpServletRequestWrapper.class.getName());
/**
* Construct an <code>HttpServletRequest</code> instance that delegates
@@ -104,30 +107,31 @@
* @param theRequest the real HTTP request
* @param theURL the URL to simulate or <code>null</code> if none
*/
- public HttpServletRequestWrapper(HttpServletRequest theRequest, ServletURL
theURL)
+ public HttpServletRequestWrapper(HttpServletRequest theRequest,
+ ServletURL theURL)
{
- m_Request = theRequest;
- m_URL = theURL;
+ this.request = theRequest;
+ this.url = theURL;
}
public HttpServletRequest getOriginalRequest()
{
- return m_Request;
+ return this.request;
}
public boolean isRequestedSessionIdFromURL()
{
- return m_Request.isRequestedSessionIdFromURL();
+ return this.request.isRequestedSessionIdFromURL();
}
public Enumeration getLocales()
{
- return m_Request.getLocales();
+ return this.request.getLocales();
}
public String getHeader(String theName)
{
- return m_Request.getHeader(theName);
+ return this.request.getHeader(theName);
}
/**
@@ -136,24 +140,24 @@
*/
public String getContextPath()
{
- m_Logger.entry("getContextPath()");
+ this.logger.entry("getContextPath()");
- String result = m_Request.getContextPath();
+ String result = this.request.getContextPath();
- if (m_URL != null) {
- if (m_URL.getContextPath() != null) {
- result = m_URL.getContextPath();
- m_Logger.debug("Using simulated context : [" + result + "]");
+ if (this.url != null) {
+ if (this.url.getContextPath() != null) {
+ result = this.url.getContextPath();
+ this.logger.debug("Using simulated context : [" + result + "]");
}
}
- m_Logger.exit("getContextPath");
+ this.logger.exit("getContextPath");
return result;
}
public String getScheme()
{
- return m_Request.getScheme();
+ return this.request.getScheme();
}
/**
@@ -162,22 +166,22 @@
*/
public String getPathInfo()
{
- m_Logger.entry("getPathInfo()");
+ this.logger.entry("getPathInfo()");
- String result = m_Request.getPathInfo();
+ String result = this.request.getPathInfo();
- if (m_URL != null) {
- result = m_URL.getPathInfo();
- m_Logger.debug("Using simulated PathInfo : [" + result + "]");
+ if (this.url != null) {
+ result = this.url.getPathInfo();
+ this.logger.debug("Using simulated PathInfo : [" + result + "]");
}
- m_Logger.exit("getPathInfo");
+ this.logger.exit("getPathInfo");
return result;
}
public String getAuthType()
{
- return m_Request.getAuthType();
+ return this.request.getAuthType();
}
/**
@@ -186,49 +190,50 @@
*/
public String getServerName()
{
- m_Logger.entry("getServerName()");
+ this.logger.entry("getServerName()");
- String result = m_Request.getServerName();
+ String result = this.request.getServerName();
- if (m_URL != null) {
- if (m_URL.getServerName() != null) {
- result = m_URL.getHost();
- m_Logger.debug("Using simulated server name : [" + result + "]");
+ if (this.url != null) {
+ if (this.url.getServerName() != null) {
+ result = this.url.getHost();
+ this.logger.debug("Using simulated server name : [" + result +
+ "]");
}
}
- m_Logger.exit("getServerName");
+ this.logger.exit("getServerName");
return result;
}
public String getRealPath(String thePath)
{
- return m_Request.getRealPath(thePath);
+ return this.request.getRealPath(thePath);
}
public HttpSession getSession()
{
- return m_Request.getSession();
+ return this.request.getSession();
}
public HttpSession getSession(boolean isCreate)
{
- return m_Request.getSession(isCreate);
+ return this.request.getSession(isCreate);
}
public String getRemoteHost()
{
- return m_Request.getRemoteHost();
+ return this.request.getRemoteHost();
}
public Enumeration getHeaderNames()
{
- return m_Request.getHeaderNames();
+ return this.request.getHeaderNames();
}
public boolean isUserInRole(String theRole)
{
- return m_Request.isUserInRole(theRole);
+ return this.request.isUserInRole(theRole);
}
/**
@@ -238,27 +243,27 @@
*/
public int getServerPort()
{
- m_Logger.entry("getServerPort()");
+ this.logger.entry("getServerPort()");
- int result = m_Request.getServerPort();
+ int result = this.request.getServerPort();
- if (m_URL != null) {
- result = (m_URL.getPort() == -1) ? 80 : m_URL.getPort();
- m_Logger.debug("Using simulated server port : [" + result + "]");
+ if (this.url != null) {
+ result = (this.url.getPort() == -1) ? 80 : this.url.getPort();
+ this.logger.debug("Using simulated server port : [" + result + "]");
}
- m_Logger.exit("getServerPort");
+ this.logger.exit("getServerPort");
return result;
}
public BufferedReader getReader() throws IOException
{
- return m_Request.getReader();
+ return this.request.getReader();
}
public int getContentLength()
{
- return m_Request.getContentLength();
+ return this.request.getContentLength();
}
/**
@@ -267,51 +272,51 @@
*/
public String getRequestURI()
{
- m_Logger.entry("getRequestURI()");
+ this.logger.entry("getRequestURI()");
- String result = m_Request.getRequestURI();
+ String result = this.request.getRequestURI();
- if (m_URL != null) {
+ if (this.url != null) {
result = getContextPath() +
((getServletPath() == null) ? "" : getServletPath()) +
((getPathInfo() == null) ? "" : getPathInfo());
- m_Logger.debug("Using simulated request URI : [" + result + "]");
+ this.logger.debug("Using simulated request URI : [" + result + "]");
}
- m_Logger.exit("getRequestURI");
+ this.logger.exit("getRequestURI");
return result;
}
public String[] getParameterValues(String theName)
{
- return m_Request.getParameterValues(theName);
+ return this.request.getParameterValues(theName);
}
public boolean isRequestedSessionIdFromUrl()
{
- return m_Request.isRequestedSessionIdFromUrl();
+ return this.request.isRequestedSessionIdFromUrl();
}
public String getContentType()
{
- return m_Request.getContentType();
+ return this.request.getContentType();
}
public Locale getLocale()
{
- return m_Request.getLocale();
+ return this.request.getLocale();
}
public void removeAttribute(String theName)
{
- m_Request.removeAttribute(theName);
+ this.request.removeAttribute(theName);
}
public String getParameter(String theName)
{
- return m_Request.getParameter(theName);
+ return this.request.getParameter(theName);
}
/**
@@ -320,82 +325,83 @@
*/
public String getServletPath()
{
- m_Logger.entry("getServletPath()");
+ this.logger.entry("getServletPath()");
- String result = m_Request.getServletPath();
+ String result = this.request.getServletPath();
- if (m_URL != null) {
- result = m_URL.getServletPath();
- m_Logger.debug("Using simulated servlet path : [" + result + "]");
+ if (this.url != null) {
+ result = this.url.getServletPath();
+ this.logger.debug("Using simulated servlet path : [" + result +
+ "]");
}
- m_Logger.exit("getServletPath");
+ this.logger.exit("getServletPath");
return result;
}
public boolean isRequestedSessionIdFromCookie()
{
- return m_Request.isRequestedSessionIdFromCookie();
+ return this.request.isRequestedSessionIdFromCookie();
}
public ServletInputStream getInputStream() throws IOException
{
- return m_Request.getInputStream();
+ return this.request.getInputStream();
}
public Principal getUserPrincipal()
{
- return m_Request.getUserPrincipal();
+ return this.request.getUserPrincipal();
}
public boolean isSecure()
{
- return m_Request.isSecure();
+ return this.request.isSecure();
}
public String getPathTranslated()
{
- return m_Request.getPathTranslated();
+ return this.request.getPathTranslated();
}
public String getRemoteAddr()
{
- return m_Request.getRemoteAddr();
+ return this.request.getRemoteAddr();
}
public String getCharacterEncoding()
{
- return m_Request.getCharacterEncoding();
+ return this.request.getCharacterEncoding();
}
public Enumeration getParameterNames()
{
- return m_Request.getParameterNames();
+ return this.request.getParameterNames();
}
public String getMethod()
{
- return m_Request.getMethod();
+ return this.request.getMethod();
}
public void setAttribute(String theName, Object theAttribute)
{
- m_Request.setAttribute(theName, theAttribute);
+ this.request.setAttribute(theName, theAttribute);
}
public Object getAttribute(String theName)
{
- return m_Request.getAttribute(theName);
+ return this.request.getAttribute(theName);
}
public int getIntHeader(String theName)
{
- return m_Request.getIntHeader(theName);
+ return this.request.getIntHeader(theName);
}
public boolean isRequestedSessionIdValid()
{
- return m_Request.isRequestedSessionIdValid();
+ return this.request.isRequestedSessionIdValid();
}
/**
@@ -404,47 +410,48 @@
*/
public String getQueryString()
{
- m_Logger.entry("getQueryString()");
+ this.logger.entry("getQueryString()");
- String result = m_Request.getQueryString();
+ String result = this.request.getQueryString();
- if (m_URL != null) {
- result = m_URL.getQueryString();
- m_Logger.debug("Using simulated query string : [" + result + "]");
+ if (this.url != null) {
+ result = this.url.getQueryString();
+ this.logger.debug("Using simulated query string : [" + result +
+ "]");
}
- m_Logger.exit("getQueryString");
+ this.logger.exit("getQueryString");
return result;
}
public long getDateHeader(String theName)
{
- return m_Request.getDateHeader(theName);
+ return this.request.getDateHeader(theName);
}
public Enumeration getAttributeNames()
{
- return m_Request.getAttributeNames();
+ return this.request.getAttributeNames();
}
public String getRemoteUser()
{
- return m_Request.getRemoteUser();
+ return this.request.getRemoteUser();
}
public String getProtocol()
{
- return m_Request.getProtocol();
+ return this.request.getProtocol();
}
public Enumeration getHeaders(String theName)
{
- return m_Request.getHeaders(theName);
+ return this.request.getHeaders(theName);
}
public String getRequestedSessionId()
{
- return m_Request.getRequestedSessionId();
+ return this.request.getRequestedSessionId();
}
/**
@@ -456,7 +463,7 @@
*/
public RequestDispatcher getRequestDispatcher(String thePath)
{
- m_Logger.entry("getRequestDispatcher([" + thePath + "])");
+ this.logger.entry("getRequestDispatcher([" + thePath + "])");
// I hate it, but we have to write some logic here ! Ideally we
// shouldn't have to do this as it is supposed to be done by the servlet
@@ -465,7 +472,7 @@
// (it has to mock some parts of the servlet engine) !
if (thePath == null) {
- m_Logger.exit("getRequestDispatcher");
+ this.logger.exit("getRequestDispatcher");
return null;
}
@@ -489,17 +496,17 @@
}
if (fullPath == null) {
- m_Logger.exit("getRequestDispatcher");
+ this.logger.exit("getRequestDispatcher");
return null;
}
}
- m_Logger.debug("Computed full path : [" + fullPath + "]");
+ this.logger.debug("Computed full path : [" + fullPath + "]");
dispatcher = new RequestDispatcherWrapper(
- m_Request.getRequestDispatcher(fullPath));
+ this.request.getRequestDispatcher(fullPath));
- m_Logger.exit("getRequestDispatcher");
+ this.logger.exit("getRequestDispatcher");
return dispatcher;
}
@@ -535,7 +542,7 @@
public Cookie[] getCookies()
{
- return m_Request.getCookies();
+ return this.request.getCookies();
}
}
1.2 +27 -25
jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/ServletContextWrapper.java
Index: ServletContextWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/ServletContextWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletContextWrapper.java 2001/04/09 11:52:35 1.1
+++ ServletContextWrapper.java 2001/08/19 15:40:25 1.2
@@ -66,7 +66,9 @@
* <code>getRequestDispatcher()</code> method to return our own wrapper around
* <code>RequestDispatcher</code>.
*
- * @version @version@
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
+ *
+ * @version $Id: ServletContextWrapper.java,v 1.2 2001/08/19 15:40:25 vmassol Exp $
* @see RequestDispatcherWrapper
*/
public class ServletContextWrapper implements ServletContext
@@ -74,29 +76,29 @@
/**
* The original servlet context object
*/
- private ServletContext m_OriginalContext;
+ private ServletContext originalContext;
/**
* @param theOriginalContext the original servlet context object
*/
public ServletContextWrapper(ServletContext theOriginalContext)
{
- m_OriginalContext = theOriginalContext;
+ this.originalContext = theOriginalContext;
}
public String getMimeType(String theFilename)
{
- return m_OriginalContext.getMimeType(theFilename);
+ return this.originalContext.getMimeType(theFilename);
}
public URL getResource(String thePath) throws MalformedURLException
{
- return m_OriginalContext.getResource(thePath);
+ return this.originalContext.getResource(thePath);
}
public InputStream getResourceAsStream(String thePath)
{
- return m_OriginalContext.getResourceAsStream(thePath);
+ return this.originalContext.getResourceAsStream(thePath);
}
/**
@@ -105,20 +107,20 @@
public RequestDispatcher getRequestDispatcher(String thePath)
{
RequestDispatcher dispatcher = new RequestDispatcherWrapper(
- m_OriginalContext.getRequestDispatcher(thePath));
+ this.originalContext.getRequestDispatcher(thePath));
return dispatcher;
}
public RequestDispatcher getNamedDispatcher(String theName)
{
RequestDispatcher dispatcher = new RequestDispatcherWrapper(
- m_OriginalContext.getNamedDispatcher(theName));
+ this.originalContext.getNamedDispatcher(theName));
return dispatcher;
}
public String getRealPath(String thePath)
{
- return m_OriginalContext.getRealPath(thePath);
+ return this.originalContext.getRealPath(thePath);
}
/**
@@ -127,85 +129,85 @@
public ServletContext getContext(String theUripath)
{
ServletContext context = new ServletContextWrapper(
- m_OriginalContext.getContext(theUripath));
+ this.originalContext.getContext(theUripath));
return context;
}
public String getServerInfo()
{
- return m_OriginalContext.getServerInfo();
+ return this.originalContext.getServerInfo();
}
public String getInitParameter(String theName)
{
- return m_OriginalContext.getInitParameter(theName);
+ return this.originalContext.getInitParameter(theName);
}
public Enumeration getInitParameterNames()
{
- return m_OriginalContext.getInitParameterNames();
+ return this.originalContext.getInitParameterNames();
}
public Object getAttribute(String theName)
{
- return m_OriginalContext.getAttribute(theName);
+ return this.originalContext.getAttribute(theName);
}
public Enumeration getAttributeNames()
{
- return m_OriginalContext.getAttributeNames();
+ return this.originalContext.getAttributeNames();
}
public void setAttribute(String theName, Object theAttribute)
{
- m_OriginalContext.setAttribute(theName, theAttribute);
+ this.originalContext.setAttribute(theName, theAttribute);
}
public void removeAttribute(String theName)
{
- m_OriginalContext.removeAttribute(theName);
+ this.originalContext.removeAttribute(theName);
}
public int getMajorVersion()
{
- return m_OriginalContext.getMajorVersion();
+ return this.originalContext.getMajorVersion();
}
public int getMinorVersion()
{
- return m_OriginalContext.getMinorVersion();
+ return this.originalContext.getMinorVersion();
}
public void log(String theMessage)
{
- m_OriginalContext.log(theMessage);
+ this.originalContext.log(theMessage);
}
public void log(String theMessage, Throwable theCause)
{
- m_OriginalContext.log(theMessage, theCause);
+ this.originalContext.log(theMessage, theCause);
}
// deprecated methods
public Servlet getServlet(String theName) throws ServletException
{
- return m_OriginalContext.getServlet(theName);
+ return this.originalContext.getServlet(theName);
}
public Enumeration getServlets()
{
- return m_OriginalContext.getServlets();
+ return this.originalContext.getServlets();
}
public Enumeration getServletNames()
{
- return m_OriginalContext.getServletNames();
+ return this.originalContext.getServletNames();
}
public void log(Exception theException, String theMessage)
{
- m_OriginalContext.log(theException, theMessage);
+ this.originalContext.log(theException, theMessage);
}
}
1.2 +17 -9
jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/RequestDispatcherWrapper.java
Index: RequestDispatcherWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/src/framework/servlet22/org/apache/commons/cactus/server/RequestDispatcherWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestDispatcherWrapper.java 2001/04/09 11:52:35 1.1
+++ RequestDispatcherWrapper.java 2001/08/19 15:40:25 1.2
@@ -63,21 +63,23 @@
* <code>forward()</code> and <code>include</code> methods to use the original
* HTTP request object instead of the simulated one used by Cactus.
*
- * @version @version@
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
+ *
+ * @version $Id: RequestDispatcherWrapper.java,v 1.2 2001/08/19 15:40:25 vmassol
Exp $
*/
public class RequestDispatcherWrapper implements RequestDispatcher
{
/**
* The original request dispatcher object
*/
- private RequestDispatcher m_OriginalDispatcher;
+ private RequestDispatcher originalDispatcher;
/**
* @param theOriginalDispatcher the original request dispatcher object
*/
public RequestDispatcherWrapper(RequestDispatcher theOriginalDispatcher)
{
- m_OriginalDispatcher = theOriginalDispatcher;
+ this.originalDispatcher = theOriginalDispatcher;
}
/**
@@ -88,10 +90,13 @@
* @param theRequest the simulation HTTP request
* @param theResponse the original HTTP response
*/
- public void forward(ServletRequest theRequest, ServletResponse theResponse)
throws IOException, ServletException
+ public void forward(ServletRequest theRequest, ServletResponse theResponse)
+ throws IOException, ServletException
{
- HttpServletRequestWrapper request = (HttpServletRequestWrapper)theRequest;
- m_OriginalDispatcher.forward(request.getOriginalRequest(), theResponse);
+ HttpServletRequestWrapper request =
+ (HttpServletRequestWrapper)theRequest;
+ this.originalDispatcher.forward(request.getOriginalRequest(),
+ theResponse);
}
/**
@@ -102,10 +107,13 @@
* @param theRequest the simulation HTTP request
* @param theResponse the original HTTP response
*/
- public void include(ServletRequest theRequest, ServletResponse theResponse)
throws IOException, ServletException
+ public void include(ServletRequest theRequest, ServletResponse theResponse)
+ throws IOException, ServletException
{
- HttpServletRequestWrapper request = (HttpServletRequestWrapper)theRequest;
- m_OriginalDispatcher.include(request.getOriginalRequest(), theResponse);
+ HttpServletRequestWrapper request =
+ (HttpServletRequestWrapper)theRequest;
+ this.originalDispatcher.include(request.getOriginalRequest(),
+ theResponse);
}
}
