manveen 02/02/10 22:39:56
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
MemoryRealmAction.java SetUpMemoryRealmAction.java
SetUpUserDBRealmAction.java UserDBRealmAction.java
Log:
Throw relevant (also localized) error messages back to the user in case there is an
exception, and also log the error.
Revision Changes Path
1.2 +26 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmAction.java
Index: MemoryRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemoryRealmAction.java 8 Feb 2002 21:33:02 -0000 1.1
+++ MemoryRealmAction.java 11 Feb 2002 06:39:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmAction.java,v
1.1 2002/02/08 21:33:02 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/08 21:33:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmAction.java,v
1.2 2002/02/11 06:39:55 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/11 06:39:55 $
*
* ====================================================================
*
@@ -67,6 +67,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
@@ -90,13 +91,22 @@
* actions on a Memory Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/02/08 21:33:02 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/11 06:39:55 $
*/
public final class MemoryRealmAction extends Action {
+ /**
+ * The MBeanServer we will be interacting with.
+ */
private static MBeanServer mBServer = null;
+ /**
+ * The MessageResources we will be retrieving messages from.
+ */
+ private MessageResources resources = null;
+
+
// --------------------------------------------------------- Public Methods
@@ -121,20 +131,22 @@
HttpServletResponse response)
throws IOException, ServletException {
+ if (resources == null) {
+ resources = getServlet().getResources();
+ }
+ HttpSession session = request.getSession();
+ Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
+
try{
// front end validation and checking.
// ===================================================
- MessageResources messages = getResources();
- Locale locale =
(Locale)request.getSession().getAttribute(Action.LOCALE_KEY);
-
// Validate the request parameters specified by the user
ActionErrors errors = new ActionErrors();
// Report any errors we have discovered back to the original form
if (!errors.empty()) {
saveErrors(request, errors);
- System.out.println("forward is to " + mapping.getInput());
return (new ActionForward(mapping.getInput()));
}
@@ -177,9 +189,14 @@
}
}catch(Throwable t){
- t.printStackTrace(System.out);
- //forward to error page
+ getServlet().log
+ (resources.getMessage(locale, "error.set.attributes"), t);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "error.set.attributes"));
+ return (null);
}
+
if (servlet.getDebug() >= 1)
servlet.log(" Forwarding to success page");
// Forward back to the test page
1.2 +45 -18
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpMemoryRealmAction.java
Index: SetUpMemoryRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpMemoryRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUpMemoryRealmAction.java 8 Feb 2002 21:33:02 -0000 1.1
+++ SetUpMemoryRealmAction.java 11 Feb 2002 06:39:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpMemoryRealmAction.java,v
1.1 2002/02/08 21:33:02 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/08 21:33:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpMemoryRealmAction.java,v
1.2 2002/02/11 06:39:55 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/11 06:39:55 $
*
* ====================================================================
*
@@ -63,7 +63,6 @@
import java.io.IOException;
import java.util.Iterator;
-//import java.util.List;
import java.util.Locale;
import java.util.ArrayList;
import javax.servlet.ServletException;
@@ -78,7 +77,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-//import javax.management.JMException;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.LabelValueBean;
@@ -90,18 +88,26 @@
* a Memory realm is chosen.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/02/08 21:33:02 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/11 06:39:55 $
*/
public class SetUpMemoryRealmAction extends Action {
+ /**
+ * The MBeanServer we will be interacting with.
+ */
private static MBeanServer mBServer = null;
-
+
public final static String DEBUG_PROP_NAME = "debug";
public final static String PATH_NAME_PROP_NAME = "pathname";
-
+
private ArrayList debugLvlList = null;
+ /**
+ * The MessageResources we will be retrieving messages from.
+ */
+ private MessageResources resources = null;
+
// --------------------------------------------------------- Public Methods
/**
@@ -125,13 +131,31 @@
HttpServletResponse response)
throws IOException, ServletException {
+ HttpSession session = request.getSession();
+ if (resources == null) {
+ resources = getServlet().getResources();
+ }
+ Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
+
+ if (form == null) {
+ getServlet().log(" Creating new MemoryRealmForm bean under key "
+ + mapping.getAttribute());
+
+ form = new UserDBRealmForm();
+ }
+
+ if ("request".equals(mapping.getScope()))
+ request.setAttribute(mapping.getAttribute(), form);
+ else
+ session.setAttribute(mapping.getAttribute(), form);
+
// Acquire a reference to the MBeanServer containing our MBeans
MBeanServer mBServer = null;
try {
mBServer = ((ApplicationServlet) getServlet()).getServer();
} catch (Throwable t) {
throw new ServletException
- ("Cannot acquire MBeanServer reference", t);
+ ("Cannot acquire MBeanServer reference", t);
}
String selectedName = request.getParameter("select");
@@ -157,11 +181,11 @@
String pathName = null;
try{
-
+
Iterator realmItr =
mBServer.queryMBeans(new
ObjectName(selectedName), null).iterator();
-
+
ObjectInstance objInstance = (ObjectInstance)realmItr.next();
ObjectName realmObjName = (objInstance).getObjectName();
@@ -173,18 +197,21 @@
realmFm.setDebugLvl(
((Integer) mBServer.getAttribute(realmObjName,
DEBUG_PROP_NAME)).toString());
-
- pathName =
+
+ pathName =
(String) mBServer.getAttribute(realmObjName, PATH_NAME_PROP_NAME);
-
+
} catch(Throwable t){
- throw new ServletException("Error in reading from mBean", t);
+ getServlet().log
+ (resources.getMessage(locale, "error.get.attributes"), t);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "error.get.attributes"));
+ return (null);
}
-
+
realmFm.setPathName(pathName);
- // Stash the form bean and forward to the display page
- request.setAttribute("memoryRealmForm", realmFm);
// Forward back to the appropriate Realm page
return (mapping.findForward("MemoryRealm"));
1.3 +32 -21
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java
Index: SetUpUserDBRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetUpUserDBRealmAction.java 8 Feb 2002 21:55:15 -0000 1.2
+++ SetUpUserDBRealmAction.java 11 Feb 2002 06:39:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
1.2 2002/02/08 21:55:15 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/08 21:55:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
1.3 2002/02/11 06:39:55 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/11 06:39:55 $
*
* ====================================================================
*
@@ -63,7 +63,6 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import java.util.ArrayList;
import javax.servlet.ServletException;
@@ -78,10 +77,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
+
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.LabelValueBean;
@@ -92,14 +88,21 @@
* a UserDatabase realm is chosen.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/02/08 21:55:15 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/11 06:39:55 $
*/
public class SetUpUserDBRealmAction extends Action {
- private static MBeanServer mBServer = null;
+ /**
+ * The MBeanServer we will be interacting with.
+ */
+ private MBeanServer mBServer = null;
+
+ /**
+ * The MessageResources we will be retrieving messages from.
+ */
+ private MessageResources resources = null;
-// public final static String CLASSNAME_PROP_NAME = "className";
public final static String DEBUG_PROP_NAME = "debug";
public final static String RESOURCE_PROP_NAME = "resourceName";
@@ -135,13 +138,22 @@
throws IOException, ServletException {
HttpSession session = request.getSession();
-
+
+ if(mBServer == null) {
+ ApplicationServlet servlet = (ApplicationServlet)getServlet();
+ mBServer = servlet.getServer();
+ }
+
if (form == null) {
- getServlet().log(" Creating new RealmForm bean under key "
+ getServlet().log(" Creating new Database RealmForm bean under key "
+ mapping.getAttribute());
form = new UserDBRealmForm();
}
+ if (resources == null) {
+ resources = getServlet().getResources();
+ }
+ Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
if ("request".equals(mapping.getScope()))
request.setAttribute(mapping.getAttribute(), form);
@@ -170,11 +182,6 @@
try{
- if(mBServer == null) {
- ApplicationServlet servlet = (ApplicationServlet)getServlet();
- mBServer = servlet.getServer();
- }
-
Iterator realmItr =
mBServer.queryMBeans(new
ObjectName(selectedName), null).iterator();
@@ -194,10 +201,14 @@
(String) mBServer.getAttribute(realmObjName, RESOURCE_PROP_NAME));
} catch(Throwable t){
- t.printStackTrace(System.out);
- //forward to error page
+ getServlet().log
+ (resources.getMessage(locale, "error.get.attributes"), t);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "error.get.attributes"));
+ return (null);
}
-
+
// Forward back to the appropriate Realm page
return (mapping.findForward("UserDBRealm"));
1.2 +24 -10
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmAction.java
Index: UserDBRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserDBRealmAction.java 7 Feb 2002 05:06:53 -0000 1.1
+++ UserDBRealmAction.java 11 Feb 2002 06:39:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmAction.java,v
1.1 2002/02/07 05:06:53 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/07 05:06:53 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmAction.java,v
1.2 2002/02/11 06:39:55 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/11 06:39:55 $
*
* ====================================================================
*
@@ -89,11 +89,19 @@
* actions on a user database Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/02/07 05:06:53 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/11 06:39:55 $
*/
public final class UserDBRealmAction extends Action {
+ /**
+ * The MessageResources we will be retrieving messages from.
+ */
+ private MessageResources resources = null;
+
+ /**
+ * The MBeanServer we will be interacting with.
+ */
private static MBeanServer mBServer = null;
// --------------------------------------------------------- Public Methods
@@ -120,13 +128,15 @@
HttpServletResponse response)
throws IOException, ServletException {
+ if (resources == null) {
+ resources = getServlet().getResources();
+ }
+ Locale locale =
(Locale)request.getSession().getAttribute(Action.LOCALE_KEY);
+
try{
// front end validation and checking.
// ===================================================
- MessageResources messages = getResources();
- Locale locale =
(Locale)request.getSession().getAttribute(Action.LOCALE_KEY);
-
// Validate the request parameters specified by the user
ActionErrors errors = new ActionErrors();
@@ -158,7 +168,7 @@
/**
* Extracting the values from the form and
* updating the MBean with the new values.
- */
+ */
String debugLvlText = request.getParameter("debugLvl");
if(debugLvlText != null) {
Integer debugLvl = new Integer(debugLvlText);
@@ -175,8 +185,12 @@
}
}catch(Throwable t){
- t.printStackTrace(System.out);
- //forward to error page
+ getServlet().log
+ (resources.getMessage(locale, "error.set.attributes"), t);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "error.set.attributes"));
+ return (null);
}
if (servlet.getDebug() >= 1)
servlet.log(" Forwarding to success page");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
