You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2002/03/05 05:55:52 UTC
cvs commit: jakarta-struts/src/example/org/apache/struts/webapp/example EditRegistrationAction.java EditSubscriptionAction.java LogoffAction.java LogonAction.java SaveRegistrationAction.java SaveSubscriptionAction.java
craigmcc 02/03/04 20:55:52
Modified: src/example/org/apache/struts/webapp/example
EditRegistrationAction.java
EditSubscriptionAction.java LogoffAction.java
LogonAction.java SaveRegistrationAction.java
SaveSubscriptionAction.java
Log:
Finish converting the struts-example webapp to use commons logging APIs.
Revision Changes Path
1.6 +38 -20 jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
Index: EditRegistrationAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditRegistrationAction.java 5 Mar 2002 04:23:56 -0000 1.5
+++ EditRegistrationAction.java 5 Mar 2002 04:55:51 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v 1.5 2002/03/05 04:23:56 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/05 04:23:56 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v 1.6 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -73,6 +73,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -87,12 +89,22 @@
* User (if any).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/03/05 04:23:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
*/
public final class EditRegistrationAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -124,27 +136,30 @@
String action = request.getParameter("action");
if (action == null)
action = "Create";
- if (servlet.getDebug() >= 1)
- servlet.log("EditRegistrationAction: Processing " + action +
+ if (log.isDebugEnabled()) {
+ log.debug("EditRegistrationAction: Processing " + action +
" action");
+ }
// Is there a currently logged on user?
User user = null;
if (!"Create".equals(action)) {
user = (User) session.getAttribute(Constants.USER_KEY);
if (user == null) {
- if (servlet.getDebug() >= 1)
- servlet.log(" User is not logged on in session "
- + session.getId());
+ if (log.isDebugEnabled()) {
+ log.debug(" User is not logged on in session "
+ + session.getId());
+ }
return (mapping.findForward("logon"));
}
}
// Populate the user registration form
if (form == null) {
- if (servlet.getDebug() >= 1)
- servlet.log(" Creating new RegistrationForm bean under key "
- + mapping.getAttribute());
+ if (log.isTraceEnabled()) {
+ log.trace(" Creating new RegistrationForm bean under key "
+ + mapping.getAttribute());
+ }
form = new RegistrationForm();
if ("request".equals(mapping.getScope()))
request.setAttribute(mapping.getAttribute(), form);
@@ -153,8 +168,9 @@
}
RegistrationForm regform = (RegistrationForm) form;
if (user != null) {
- if (servlet.getDebug() >= 1)
- servlet.log(" Populating form from " + user);
+ if (log.isTraceEnabled()) {
+ log.trace(" Populating form from " + user);
+ }
try {
PropertyUtils.copyProperties(regform, user);
regform.setAction(action);
@@ -164,22 +180,24 @@
Throwable t = e.getTargetException();
if (t == null)
t = e;
- servlet.log("RegistrationForm.populate", t);
+ log.error("RegistrationForm.populate", t);
throw new ServletException("RegistrationForm.populate", t);
} catch (Throwable t) {
- servlet.log("RegistrationForm.populate", t);
+ log.error("RegistrationForm.populate", t);
throw new ServletException("RegistrationForm.populate", t);
}
}
// Set a transactional control token to prevent double posting
- if (servlet.getDebug() >= 1)
- servlet.log(" Setting transactional control token");
+ if (log.isTraceEnabled()) {
+ log.trace(" Setting transactional control token");
+ }
saveToken(request);
// Forward control to the edit user registration page
- if (servlet.getDebug() >= 1)
- servlet.log(" Forwarding to 'success' page");
+ if (log.isTraceEnabled()) {
+ log.trace(" Forwarding to 'success' page");
+ }
return (mapping.findForward("success"));
}
1.6 +34 -22 jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
Index: EditSubscriptionAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditSubscriptionAction.java 5 Mar 2002 04:23:56 -0000 1.5
+++ EditSubscriptionAction.java 5 Mar 2002 04:55:51 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v 1.5 2002/03/05 04:23:56 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/05 04:23:56 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v 1.6 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -73,6 +73,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -86,12 +88,22 @@
* <code>SubscriptionForm</code> from the currently specified subscription.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/03/05 04:23:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
*/
public final class EditSubscriptionAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -125,17 +137,17 @@
action = "Create";
}
String host = request.getParameter("host");
- if (servlet.getDebug() >= 1) {
- servlet.log("EditSubscriptionAction: Processing " + action +
- " action");
+ if (log.isDebugEnabled()) {
+ log.debug("EditSubscriptionAction: Processing " + action +
+ " action");
}
// Is there a currently logged on user?
User user = (User) session.getAttribute(Constants.USER_KEY);
if (user == null) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" User is not logged on in session "
- + session.getId());
+ if (log.isTraceEnabled()) {
+ log.trace(" User is not logged on in session "
+ + session.getId());
}
return (mapping.findForward("logon"));
}
@@ -144,9 +156,9 @@
Subscription subscription =
user.findSubscription(request.getParameter("host"));
if ((subscription == null) && !action.equals("Create")) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" No subscription for user " +
- user.getUsername() + " and host " + host);
+ if (log.isTraceEnabled()) {
+ log.trace(" No subscription for user " +
+ user.getUsername() + " and host " + host);
}
return (mapping.findForward("failure"));
}
@@ -156,9 +168,9 @@
// Populate the subscription form
if (form == null) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" Creating new SubscriptionForm bean under key "
- + mapping.getAttribute());
+ if (log.isTraceEnabled()) {
+ log.trace(" Creating new SubscriptionForm bean under key "
+ + mapping.getAttribute());
}
form = new SubscriptionForm();
if ("request".equals(mapping.getScope())) {
@@ -170,8 +182,8 @@
SubscriptionForm subform = (SubscriptionForm) form;
subform.setAction(action);
if (!action.equals("Create")) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" Populating form from " + subscription);
+ if (log.isTraceEnabled()) {
+ log.trace(" Populating form from " + subscription);
}
try {
PropertyUtils.copyProperties(subform, subscription);
@@ -180,17 +192,17 @@
Throwable t = e.getTargetException();
if (t == null)
t = e;
- servlet.log("SubscriptionForm.populate", t);
+ log.error("SubscriptionForm.populate", t);
throw new ServletException("SubscriptionForm.populate", t);
} catch (Throwable t) {
- servlet.log("SubscriptionForm.populate", t);
+ log.error("SubscriptionForm.populate", t);
throw new ServletException("SubscriptionForm.populate", t);
}
}
// Forward control to the edit subscription page
- if (servlet.getDebug() >= 1) {
- servlet.log(" Forwarding to 'success' page");
+ if (log.isTraceEnabled()) {
+ log.trace(" Forwarding to 'success' page");
}
return (mapping.findForward("success"));
1.3 +24 -10 jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java
Index: LogoffAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogoffAction.java 14 Apr 2001 12:53:08 -0000 1.2
+++ LogoffAction.java 5 Mar 2002 04:55:51 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v 1.2 2001/04/14 12:53:08 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:08 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v 1.3 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -72,6 +72,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -85,12 +87,22 @@
* user logoff.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:08 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/05 04:55:51 $
*/
public final class LogoffAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -123,13 +135,15 @@
// Process this user logoff
if (user != null) {
- if (servlet.getDebug() >= 1)
- servlet.log("LogoffAction: User '" + user.getUsername() +
- "' logged off in session " + session.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("LogoffAction: User '" + user.getUsername() +
+ "' logged off in session " + session.getId());
+ }
} else {
- if (servlet.getDebug() >= 1)
- servlet.log("LogoffActon: User logged off in session " +
- session.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("LogoffActon: User logged off in session " +
+ session.getId());
+ }
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
session.removeAttribute(Constants.USER_KEY);
1.6 +20 -7 jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogonAction.java 5 Mar 2002 04:23:56 -0000 1.5
+++ LogonAction.java 5 Mar 2002 04:55:51 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v 1.5 2002/03/05 04:23:56 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/05 04:23:56 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v 1.6 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -70,6 +70,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -86,12 +88,22 @@
* Implementation of <strong>Action</strong> that validates a user logon.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/03/05 04:23:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
*/
public final class LogonAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -149,9 +161,10 @@
// Save our logged-in user in the session
HttpSession session = request.getSession();
session.setAttribute(Constants.USER_KEY, user);
- if (servlet.getDebug() >= 1)
- servlet.log("LogonAction: User '" + user.getUsername() +
- "' logged on in session " + session.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("LogonAction: User '" + user.getUsername() +
+ "' logged on in session " + session.getId());
+ }
// Remove the obsolete form bean
if (mapping.getAttribute() != null) {
1.6 +37 -24 jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveRegistrationAction.java 5 Mar 2002 04:23:56 -0000 1.5
+++ SaveRegistrationAction.java 5 Mar 2002 04:55:51 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v 1.5 2002/03/05 04:23:56 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/05 04:23:56 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v 1.6 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -72,6 +72,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -88,12 +90,22 @@
* registration is created, the user is also implicitly logged on.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/03/05 04:23:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
*/
public final class SaveRegistrationAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -129,25 +141,26 @@
}
UserDatabase database = (UserDatabase)
servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
- if (servlet.getDebug() >= 1) {
- servlet.log("SaveRegistrationAction: Processing " + action +
- " action");
+ if (log.isDebugEnabled()) {
+ log.debug("SaveRegistrationAction: Processing " + action +
+ " action");
}
// Is there a currently logged on user (unless creating)?
User user = (User) session.getAttribute(Constants.USER_KEY);
if (!"Create".equals(action) && (user == null)) {
- if (servlet.getDebug() >= 1)
- servlet.log(" User is not logged on in session "
- + session.getId());
+ if (log.isTraceEnabled()) {
+ log.trace(" User is not logged on in session "
+ + session.getId());
+ }
return (mapping.findForward("logon"));
}
// Was this transaction cancelled?
if (isCancelled(request)) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" Transaction '" + action +
- "' was cancelled");
+ if (log.isTraceEnabled()) {
+ log.trace(" Transaction '" + action +
+ "' was cancelled");
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
return (mapping.findForward("success"));
@@ -155,8 +168,8 @@
// Validate the transactional control token
ActionErrors errors = new ActionErrors();
- if (servlet.getDebug() >= 1) {
- servlet.log(" Checking transactional control token");
+ if (log.isTraceEnabled()) {
+ log.trace(" Checking transactional control token");
}
if (!isTokenValid(request)) {
errors.add(ActionErrors.GLOBAL_ERROR,
@@ -165,8 +178,8 @@
resetToken(request);
// Validate the request parameters specified by the user
- if (servlet.getDebug() >= 1) {
- servlet.log(" Performing extra validations");
+ if (log.isTraceEnabled()) {
+ log.trace(" Performing extra validations");
}
String value = null;
value = regform.getUsername();
@@ -213,10 +226,10 @@
if (t == null) {
t = e;
}
- servlet.log("Registration.populate", t);
+ log.error("Registration.populate", t);
throw new ServletException("Registration.populate", t);
} catch (Throwable t) {
- servlet.log("Registration.populate", t);
+ log.error("Registration.populate", t);
throw new ServletException("Subscription.populate", t);
}
@@ -224,9 +237,9 @@
// Log the user in if appropriate
if ("Create".equals(action)) {
session.setAttribute(Constants.USER_KEY, user);
- if (servlet.getDebug() >= 1) {
- servlet.log(" User '" + user.getUsername() +
- "' logged on in session " + session.getId());
+ if (log.isTraceEnabled()) {
+ log.trace(" User '" + user.getUsername() +
+ "' logged on in session " + session.getId());
}
}
@@ -239,8 +252,8 @@
}
// Forward control to the specified success URI
- if (servlet.getDebug() >= 1) {
- servlet.log(" Forwarding to success page");
+ if (log.isTraceEnabled()) {
+ log.trace(" Forwarding to success page");
}
return (mapping.findForward("success"));
1.6 +40 -25 jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
Index: SaveSubscriptionAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveSubscriptionAction.java 5 Mar 2002 04:23:56 -0000 1.5
+++ SaveSubscriptionAction.java 5 Mar 2002 04:55:51 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v 1.5 2002/03/05 04:23:56 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/03/05 04:23:56 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v 1.6 2002/03/05 04:55:51 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 04:55:51 $
*
* ====================================================================
*
@@ -72,6 +72,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -87,12 +89,22 @@
* updates the mail subscription entered by the user.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/03/05 04:23:56 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
*/
public final class SaveSubscriptionAction extends Action {
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>Log</code> instance for this application.
+ */
+ private Log log =
+ LogFactory.getLog("org.apache.struts.webapp.Example");
+
+
// --------------------------------------------------------- Public Methods
@@ -126,25 +138,26 @@
if (action == null) {
action = "?";
}
- if (servlet.getDebug() >= 1) {
- servlet.log("SaveSubscriptionAction: Processing " + action +
- " action");
+ if (log.isDebugEnabled()) {
+ log.debug("SaveSubscriptionAction: Processing " + action +
+ " action");
}
// Is there a currently logged on user?
User user = (User) session.getAttribute(Constants.USER_KEY);
if (user == null) {
- if (servlet.getDebug() >= 1)
- servlet.log(" User is not logged on in session "
- + session.getId());
+ if (log.isTraceEnabled()) {
+ log.trace(" User is not logged on in session "
+ + session.getId());
+ }
return (mapping.findForward("logon"));
}
// Was this transaction cancelled?
if (isCancelled(request)) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" Transaction '" + action +
- "' was cancelled");
+ if (log.isTraceEnabled()) {
+ log.trace(" Transaction '" + action +
+ "' was cancelled");
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
return (mapping.findForward("success"));
@@ -158,8 +171,10 @@
user.createSubscription(request.getParameter("host"));
}
if (subscription == null) {
- servlet.log(" Missing subscription for user '" +
- user.getUsername() + "'");
+ if (log.isTraceEnabled()) {
+ log.trace(" Missing subscription for user '" +
+ user.getUsername() + "'");
+ }
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
messages.getMessage("error.noSubscription"));
return (null);
@@ -167,10 +182,10 @@
// Was this transaction a Delete?
if (action.equals("Delete")) {
- if (servlet.getDebug() >= 1) {
- servlet.log(" Deleting mail server '" +
- subscription.getHost() + "' for user '" +
- user.getUsername() + "'");
+ if (log.isTraceEnabled()) {
+ log.trace(" Deleting mail server '" +
+ subscription.getHost() + "' for user '" +
+ user.getUsername() + "'");
}
user.removeSubscription(subscription);
user.getDatabase().save();
@@ -181,8 +196,8 @@
// All required validations were done by the form itself
// Update the persistent subscription information
- if (servlet.getDebug() >= 1) {
- servlet.log(" Populating database from form bean");
+ if (log.isTraceEnabled()) {
+ log.trace(" Populating database from form bean");
}
try {
PropertyUtils.copyProperties(subscription, subform);
@@ -191,10 +206,10 @@
Throwable t = e.getTargetException();
if (t == null)
t = e;
- servlet.log("Subscription.populate", t);
+ log.error("Subscription.populate", t);
throw new ServletException("Subscription.populate", t);
} catch (Throwable t) {
- servlet.log("Subscription.populate", t);
+ log.error("Subscription.populate", t);
throw new ServletException("Subscription.populate", t);
}
@@ -208,8 +223,8 @@
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
// Forward control to the specified success URI
- if (servlet.getDebug() >= 1) {
- servlet.log(" Forwarding to success page");
+ if (log.isTraceEnabled()) {
+ log.trace(" Forwarding to success page");
}
return (mapping.findForward("success"));
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>