vmassol 02/02/17 11:00:11
Modified: src/framework/servlet23/org/apache/cactus/server
FilterTestCaller.java FilterTestRedirector.java
src/framework/share/org/apache/cactus AbstractTestCase.java
ServletURL.java WebResponse.java
src/framework/share/org/apache/cactus/client
AbstractHttpClient.java
AutoReadHttpURLConnection.java
HttpClientHelper.java
src/framework/share/org/apache/cactus/server
AbstractHttpServletRequestWrapper.java
AbstractTestController.java JspTestRedirector.java
ServletTestRedirector.java ServletUtil.java
src/framework/share/org/apache/cactus/util/log
LogAspect.java
Log:
corrections of some of checkstyle-reported errors
Revision Changes Path
1.8 +1 -7
jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestCaller.java
Index: FilterTestCaller.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestCaller.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FilterTestCaller.java 17 Feb 2002 18:44:23 -0000 1.7
+++ FilterTestCaller.java 17 Feb 2002 19:00:10 -0000 1.8
@@ -68,16 +68,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: FilterTestCaller.java,v 1.7 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: FilterTestCaller.java,v 1.8 2002/02/17 19:00:10 vmassol Exp $
*/
public class FilterTestCaller extends AbstractTestCaller
{
- /**
- * The LOGGER
- */
- protected static Log logger =
- LogService.getInstance().getLog(FilterTestCaller.class.getName());
-
/**
* @param theObjects the implicit objects coming from the redirector
*/
1.9 +4 -4
jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestRedirector.java
Index: FilterTestRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/servlet23/org/apache/cactus/server/FilterTestRedirector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FilterTestRedirector.java 17 Feb 2002 18:44:23 -0000 1.8
+++ FilterTestRedirector.java 17 Feb 2002 19:00:10 -0000 1.9
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: FilterTestRedirector.java,v 1.8 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: FilterTestRedirector.java,v 1.9 2002/02/17 19:00:10 vmassol Exp $
* @see FilterTestCaller
*/
public class FilterTestRedirector implements Filter
@@ -87,9 +87,9 @@
}
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(FilterTestRedirector.class.getName());
/**
@@ -112,7 +112,7 @@
throws IOException, ServletException
{
// Mark beginning of test on server side
- logger.debug("------------- Start Filter service");
+ LOGGER.debug("------------- Start Filter service");
// Create implicit object holder
FilterImplicitObjects objects = new FilterImplicitObjects();
1.25 +4 -4
jakarta-cactus/src/framework/share/org/apache/cactus/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/AbstractTestCase.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractTestCase.java 17 Feb 2002 18:44:23 -0000 1.24
+++ AbstractTestCase.java 17 Feb 2002 19:00:10 -0000 1.25
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: AbstractTestCase.java,v 1.24 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: AbstractTestCase.java,v 1.25 2002/02/17 19:00:10 vmassol Exp $
*/
public abstract class AbstractTestCase extends TestCase
{
@@ -112,7 +112,7 @@
private String currentTestMethod;
/**
- * The LOGGER (only used on the client side).
+ * The logger (only used on the client side).
*/
private Log logger;
@@ -128,7 +128,7 @@
}
/**
- * @return the LOGGER used by the <code>TestCase</code> class and
+ * @return The logger used by the <code>TestCase</code> class and
* subclasses to perform logging.
*/
protected final Log getLogger()
@@ -386,7 +386,7 @@
ClientConfigurationChecker.getInstance().checkHttpClient();
ClientConfigurationChecker.getInstance().checkLog4j();
- // We make sure we reinitialize the LOGGER with the name of the
+ // We make sure we reinitialize The logger with the name of the
// current class (that's why the logged instance is not static).
this.logger =
LogService.getInstance().getLog(this.getClass().getName());
1.15 +4 -4
jakarta-cactus/src/framework/share/org/apache/cactus/ServletURL.java
Index: ServletURL.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/ServletURL.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ServletURL.java 17 Feb 2002 18:44:23 -0000 1.14
+++ ServletURL.java 17 Feb 2002 19:00:10 -0000 1.15
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: ServletURL.java,v 1.14 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: ServletURL.java,v 1.15 2002/02/17 19:00:10 vmassol Exp $
*/
public class ServletURL
{
@@ -148,9 +148,9 @@
private String queryString;
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(ServletURL.class.getName());
/**
@@ -351,7 +351,7 @@
ServletURL url = new ServletURL(serverName, contextPath,
servletPath, pathInfo, queryString);
- logger.debug("URL = [" + url + "]");
+ LOGGER.debug("URL = [" + url + "]");
return url;
}
1.17 +5 -5
jakarta-cactus/src/framework/share/org/apache/cactus/WebResponse.java
Index: WebResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/WebResponse.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebResponse.java 17 Feb 2002 18:44:23 -0000 1.16
+++ WebResponse.java 17 Feb 2002 19:00:10 -0000 1.17
@@ -80,14 +80,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: WebResponse.java,v 1.16 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: WebResponse.java,v 1.17 2002/02/17 19:00:10 vmassol Exp $
*/
public class WebResponse
{
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(WebResponse.class.getName());
/**
@@ -248,8 +248,8 @@
for (int i = 1; (headerName != null) || (headerValue != null); i++) {
- logger.debug("Header name = [" + headerName + "]");
- logger.debug("Header value = [" + headerValue + "]");
+ LOGGER.debug("Header name = [" + headerName + "]");
+ LOGGER.debug("Header value = [" + headerValue + "]");
if ((headerName != null) &&
(headerName.toLowerCase().equals("set-cookie") ||
1.19 +1 -7
jakarta-cactus/src/framework/share/org/apache/cactus/client/AbstractHttpClient.java
Index: AbstractHttpClient.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/AbstractHttpClient.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AbstractHttpClient.java 17 Feb 2002 18:44:23 -0000 1.18
+++ AbstractHttpClient.java 17 Feb 2002 19:00:11 -0000 1.19
@@ -77,16 +77,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Robertson</a>
*
- * @version $Id: AbstractHttpClient.java,v 1.18 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: AbstractHttpClient.java,v 1.19 2002/02/17 19:00:11 vmassol Exp $
*/
public abstract class AbstractHttpClient
{
- /**
- * The LOGGER
- */
- private static Log logger =
- LogService.getInstance().getLog(AbstractHttpClient.class.getName());
-
/**
* Name of the Cactus configuration file
*/
1.18 +2 -2
jakarta-cactus/src/framework/share/org/apache/cactus/client/AutoReadHttpURLConnection.java
Index: AutoReadHttpURLConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/AutoReadHttpURLConnection.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AutoReadHttpURLConnection.java 17 Feb 2002 18:44:23 -0000 1.17
+++ AutoReadHttpURLConnection.java 17 Feb 2002 19:00:11 -0000 1.18
@@ -86,12 +86,12 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Bob Davison</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: AutoReadHttpURLConnection.java,v 1.17 2002/02/17 18:44:23 vmassol
Exp $
+ * @version $Id: AutoReadHttpURLConnection.java,v 1.18 2002/02/17 19:00:11 vmassol
Exp $
*/
final class AutoReadHttpURLConnection extends HttpURLConnection
{
/**
- * The LOGGER
+ * The logger
*/
private static final Log LOGGER =
LogService.getInstance().
1.23 +2 -2
jakarta-cactus/src/framework/share/org/apache/cactus/client/HttpClientHelper.java
Index: HttpClientHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/client/HttpClientHelper.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- HttpClientHelper.java 17 Feb 2002 18:44:23 -0000 1.22
+++ HttpClientHelper.java 17 Feb 2002 19:00:11 -0000 1.23
@@ -84,12 +84,12 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Robertson</a>
*
- * @version $Id: HttpClientHelper.java,v 1.22 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: HttpClientHelper.java,v 1.23 2002/02/17 19:00:11 vmassol Exp $
*/
public class HttpClientHelper
{
/**
- * The LOGGER
+ * The logger
*/
private static final Log LOGGER =
LogService.getInstance().getLog(HttpClientHelper.class.getName());
1.9 +11 -11
jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java
Index: AbstractHttpServletRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractHttpServletRequestWrapper.java 17 Feb 2002 18:44:23 -0000 1.8
+++ AbstractHttpServletRequestWrapper.java 17 Feb 2002 19:00:11 -0000 1.9
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: AbstractHttpServletRequestWrapper.java,v 1.8 2002/02/17 18:44:23
vmassol Exp $
+ * @version $Id: AbstractHttpServletRequestWrapper.java,v 1.9 2002/02/17 19:00:11
vmassol Exp $
*/
public abstract class AbstractHttpServletRequestWrapper
implements HttpServletRequest
@@ -94,9 +94,9 @@
protected ServletURL url;
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().
getLog(AbstractHttpServletRequestWrapper.class.getName());
@@ -137,7 +137,7 @@
if (this.url != null) {
if (this.url.getContextPath() != null) {
result = this.url.getContextPath();
- logger.debug("Using simulated context : [" + result + "]");
+ LOGGER.debug("Using simulated context : [" + result + "]");
}
}
@@ -154,7 +154,7 @@
if (this.url != null) {
result = this.url.getPathInfo();
- logger.debug("Using simulated PathInfo : [" + result + "]");
+ LOGGER.debug("Using simulated PathInfo : [" + result + "]");
}
return result;
}
@@ -170,7 +170,7 @@
if (this.url != null) {
if (this.url.getServerName() != null) {
result = this.url.getHost();
- logger.debug("Using simulated server name : [" + result +
+ LOGGER.debug("Using simulated server name : [" + result +
"]");
}
}
@@ -188,7 +188,7 @@
if (this.url != null) {
result = (this.url.getPort() == -1) ? 80 : this.url.getPort();
- logger.debug("Using simulated server port : [" + result + "]");
+ LOGGER.debug("Using simulated server port : [" + result + "]");
}
return result;
@@ -208,7 +208,7 @@
((getServletPath() == null) ? "" : getServletPath()) +
((getPathInfo() == null) ? "" : getPathInfo());
- logger.debug("Using simulated request URI : [" + result + "]");
+ LOGGER.debug("Using simulated request URI : [" + result + "]");
}
return result;
@@ -224,7 +224,7 @@
if (this.url != null) {
result = this.url.getServletPath();
- logger.debug("Using simulated servlet path : [" + result +
+ LOGGER.debug("Using simulated servlet path : [" + result +
"]");
}
@@ -278,7 +278,7 @@
if (this.url != null) {
result = this.url.getQueryString();
- logger.debug("Using simulated query string : [" + result +
+ LOGGER.debug("Using simulated query string : [" + result +
"]");
}
return result;
@@ -329,7 +329,7 @@
}
}
- logger.debug("Computed full path : [" + fullPath + "]");
+ LOGGER.debug("Computed full path : [" + fullPath + "]");
dispatcher = new RequestDispatcherWrapper(
this.request.getRequestDispatcher(fullPath));
1.11 +8 -8
jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestController.java
Index: AbstractTestController.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/AbstractTestController.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractTestController.java 17 Feb 2002 18:44:23 -0000 1.10
+++ AbstractTestController.java 17 Feb 2002 19:00:11 -0000 1.11
@@ -69,14 +69,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: AbstractTestController.java,v 1.10 2002/02/17 18:44:23 vmassol Exp
$
+ * @version $Id: AbstractTestController.java,v 1.11 2002/02/17 19:00:11 vmassol Exp
$
*/
public abstract class AbstractTestController
{
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(AbstractTestController.class.getName());
/**
@@ -133,7 +133,7 @@
} else {
String message = "Unknown service [" + serviceName +
"] in HTTP request.";
- logger.error(message);
+ LOGGER.error(message);
throw new ServletException(message);
}
@@ -144,13 +144,13 @@
if (e.getMessage().startsWith("junit/framework")) {
String message = "You must put the JUnit jar in " +
"your server classpath (in WEB-INF/lib for example)";
- logger.error(message, e);
+ LOGGER.error(message, e);
throw new ServletException(message, e);
} else {
String message = "You are missing a jar in your " +
"classpath (class [" + e.getMessage() + "] could not " +
"be found";
- logger.error(message, e);
+ LOGGER.error(message, e);
throw new ServletException(message, e);
}
}
@@ -172,11 +172,11 @@
if (serviceName == null) {
String message = "Missing service name parameter [" +
ServiceDefinition.SERVICE_NAME_PARAM + "] in HTTP request.";
- logger.debug(message);
+ LOGGER.debug(message);
throw new ServletException(message);
}
- logger.debug("Service to call = " + serviceName);
+ LOGGER.debug("Service to call = " + serviceName);
return serviceName;
}
1.12 +4 -4
jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestRedirector.java
Index: JspTestRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/JspTestRedirector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspTestRedirector.java 17 Feb 2002 18:44:23 -0000 1.11
+++ JspTestRedirector.java 17 Feb 2002 19:00:11 -0000 1.12
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: JspTestRedirector.java,v 1.11 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: JspTestRedirector.java,v 1.12 2002/02/17 19:00:11 vmassol Exp $
*/
public class JspTestRedirector
{
@@ -80,9 +80,9 @@
}
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(JspTestRedirector.class.getName());
/**
@@ -93,7 +93,7 @@
public void doGet(JspImplicitObjects theObjects) throws ServletException
{
// Mark beginning of test on server side
- logger.debug("------------- Start JSP service");
+ LOGGER.debug("------------- Start JSP service");
JspTestController controller = new JspTestController();
controller.handleRequest(theObjects);
1.15 +4 -4
jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestRedirector.java
Index: ServletTestRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletTestRedirector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ServletTestRedirector.java 17 Feb 2002 18:44:23 -0000 1.14
+++ ServletTestRedirector.java 17 Feb 2002 19:00:11 -0000 1.15
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: ServletTestRedirector.java,v 1.14 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: ServletTestRedirector.java,v 1.15 2002/02/17 19:00:11 vmassol Exp $
* @see ServletTestCaller
*/
public class ServletTestRedirector extends HttpServlet
@@ -83,9 +83,9 @@
}
/**
- * The LOGGER
+ * The logger
*/
- private static Log logger =
+ private static final Log LOGGER =
LogService.getInstance().getLog(ServletTestRedirector.class.getName());
/**
@@ -117,7 +117,7 @@
HttpServletResponse theResponse) throws ServletException, IOException
{
// Mark beginning of test on server side
- logger.debug("------------- Start Servlet service");
+ LOGGER.debug("------------- Start Servlet service");
// Create implicit object holder
ServletImplicitObjects objects = new ServletImplicitObjects();
1.7 +1 -7
jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletUtil.java
Index: ServletUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/server/ServletUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletUtil.java 17 Feb 2002 18:44:23 -0000 1.6
+++ ServletUtil.java 17 Feb 2002 19:00:11 -0000 1.7
@@ -64,16 +64,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: ServletUtil.java,v 1.6 2002/02/17 18:44:23 vmassol Exp $
+ * @version $Id: ServletUtil.java,v 1.7 2002/02/17 19:00:11 vmassol Exp $
*/
public class ServletUtil
{
- /**
- * The LOGGER
- */
- private static Log logger =
- LogService.getInstance().getLog(ServletUtil.class.getName());
-
/**
* A substitute method for <code>HttpServletRequest.getParameter()</code>.
* Contrary to <code>getParameter()</code>, this method does not
1.6 +5 -5
jakarta-cactus/src/framework/share/org/apache/cactus/util/log/LogAspect.java
Index: LogAspect.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/src/framework/share/org/apache/cactus/util/log/LogAspect.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogAspect.java 17 Feb 2002 18:44:24 -0000 1.5
+++ LogAspect.java 17 Feb 2002 19:00:11 -0000 1.6
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Massol</a>
*
- * @version $Id: LogAspect.java,v 1.5 2002/02/17 18:44:24 vmassol Exp $
+ * @version $Id: LogAspect.java,v 1.6 2002/02/17 19:00:11 vmassol Exp $
*/
public aspect LogAspect
{
@@ -100,7 +100,7 @@
!logObjectCalls() && publicMethodsWithParameterCalls() &&
publicStaticMethodsWithParameterCalls() &&
!publicMethodsWithReturnValueCalls()
{
-// Get the LOGGER to perform logging
+ // Get The logger to perform logging
Log logger = LogService.getInstance().getLog(
thisJoinPoint.getSignature().getDeclaringType().getName());
@@ -129,7 +129,7 @@
// The class name that uses the method that has been called
final String targetName = thisJoinPoint.getTarget().getClass().getName();
-// Get the LOGGER to perform logging
+ // Get The logger to perform logging
Log logger = LogService.getInstance().getLog(targetName);
if (logger.isDebugEnabled()) {
@@ -154,7 +154,7 @@
!logObjectCalls() && publicMethodsWithParameterCalls() &&
publicMethodsWithReturnValueCalls() &&
publicStaticMethodsWithParameterCalls()
{
-// Get the LOGGER to perform logging
+ // Get The logger to perform logging
Log logger = LogService.getInstance().getLog(
thisJoinPoint.getSignature().getDeclaringType().getName());
@@ -193,7 +193,7 @@
// The class name that uses the method that has been called
final String targetName = thisJoinPoint.getTarget().getClass().getName();
-// Get the LOGGER to perform logging
+ // Get The logger to perform logging
Log logger = LogService.getInstance().getLog(targetName);
if (logger.isDebugEnabled()) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
