Author: niallp
Date: Sat Feb 11 11:39:19 2006
New Revision: 377024
URL: http://svn.apache.org/viewcvs?rev=377024&view=rev
Log:
Fix for Bug 37801 - change ModuleConfigVerifier to use Commons Logging -
reported by Martin Cooper
Modified:
struts/extras/trunk/src/java/org/apache/struts/plugins/ModuleConfigVerifier.java
Modified:
struts/extras/trunk/src/java/org/apache/struts/plugins/ModuleConfigVerifier.java
URL:
http://svn.apache.org/viewcvs/struts/extras/trunk/src/java/org/apache/struts/plugins/ModuleConfigVerifier.java?rev=377024&r1=377023&r2=377024&view=diff
==============================================================================
---
struts/extras/trunk/src/java/org/apache/struts/plugins/ModuleConfigVerifier.java
(original)
+++
struts/extras/trunk/src/java/org/apache/struts/plugins/ModuleConfigVerifier.java
Sat Feb 11 11:39:19 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -24,6 +24,8 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.PlugInConfig;
import org.apache.struts.util.RequestUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.servlet.ServletException;
@@ -36,14 +38,16 @@
* be thrown from the <code>init</code> method, which will ultimately cause
* the initialization of your Struts controller servlet to fail.</p>
*
- * <p>Under all circumstances, errors that are detected will be logged via
- * calls to <code>ServletContext.log</code>.</p>
- *
- * @version $Rev$ $Date: 2005-11-14 15:09:02 -0500 (Mon, 14 Nov 2005)
- * $
+ * @version $Rev$ $Date$
* @since Struts 1.1
*/
public class ModuleConfigVerifier implements PlugIn {
+
+ /**
+ * Commons Logging instance.
+ */
+ private static Log LOG = LogFactory.getLog(ModuleConfigVerifier.class);
+
// ----------------------------------------------------- Instance Variables
/**
@@ -96,7 +100,7 @@
boolean ok = true;
- log(servlet.getInternal().getMessage("configVerifying"));
+ LOG.info(servlet.getInternal().getMessage("configVerifying"));
// Perform detailed validations of each portion of ModuleConfig
// :TODO: Complete methods to verify Action, Controller, et al,
configurations.
@@ -134,7 +138,7 @@
}
// Throw an exception on a fatal error
- log(servlet.getInternal().getMessage("configCompleted"));
+ LOG.info(servlet.getInternal().getMessage("configCompleted"));
if (!ok && isFatal()) {
throw new
ServletException(servlet.getInternal().getMessage("configFatal"));
@@ -144,18 +148,6 @@
// ------------------------------------------------------ Protected Methods
/**
- * <p>Log the specified message to our servlet context log, after a header
- * including the module prefix.</p>
- *
- * @param message The message to be logged
- */
- protected void log(String message) {
- String output = "[" + config.getPrefix() + "]: " + message;
-
- servlet.log(output);
- }
-
- /**
* <p>Return <code>true</code> if information returned by
* <code>config.getActionMappingClass</code> is all valid; otherwise, log
* error messages and return <code>false</code>.</p>
@@ -164,7 +156,7 @@
String amcName = config.getActionMappingClass();
if (amcName == null) {
-
log(servlet.getInternal().getMessage("verifyActionMappingClass.missing"));
+
LOG.error(servlet.getInternal().getMessage("verifyActionMappingClass.missing"));
return (false);
}
@@ -172,7 +164,7 @@
try {
Class amcClass = RequestUtils.applicationClass(amcName);
} catch (ClassNotFoundException e) {
-
log(servlet.getInternal().getMessage("verifyActionMappingClass.invalid",
+
LOG.error(servlet.getInternal().getMessage("verifyActionMappingClass.invalid",
amcName));
return (false);
@@ -194,11 +186,11 @@
String path = fcs[i].getPath();
if (path == null) {
-
log(servlet.getInternal().getMessage("verifyForwardConfigs.missing",
+
LOG.error(servlet.getInternal().getMessage("verifyForwardConfigs.missing",
fcs[i].getName()));
ok = false;
} else if (!path.startsWith("/")) {
-
log(servlet.getInternal().getMessage("verifyForwardConfigs.invalid",
+
LOG.error(servlet.getInternal().getMessage("verifyForwardConfigs.invalid",
path, fcs[i].getName()));
}
}
@@ -219,13 +211,13 @@
String factory = mrcs[i].getFactory();
if (factory == null) {
-
log(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.missing"));
+
LOG.error(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.missing"));
ok = false;
} else {
try {
Class clazz = RequestUtils.applicationClass(factory);
} catch (ClassNotFoundException e) {
-
log(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.invalid",
+
LOG.error(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.invalid",
factory));
ok = false;
}
@@ -234,7 +226,7 @@
String key = mrcs[i].getKey();
if (key == null) {
-
log(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.key"));
+
LOG.error(servlet.getInternal().getMessage("verifyMessageResourcesConfigs.key"));
}
}
@@ -254,13 +246,13 @@
String className = pics[i].getClassName();
if (className == null) {
-
log(servlet.getInternal().getMessage("verifyPlugInConfigs.missing"));
+
LOG.error(servlet.getInternal().getMessage("verifyPlugInConfigs.missing"));
ok = false;
} else {
try {
Class clazz = RequestUtils.applicationClass(className);
} catch (ClassNotFoundException e) {
-
log(servlet.getInternal().getMessage("verifyPlugInConfigs.invalid",
+
LOG.error(servlet.getInternal().getMessage("verifyPlugInConfigs.invalid",
className));
ok = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
