You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2002/05/07 23:13:28 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveUserDatabaseAction.java SaveEnvEntryAction.java SetUpUserDatabaseAction.java UserDatabaseForm.java
manveen 02/05/07 14:13:27
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
SetUpUserDatabaseAction.java UserDatabaseForm.java
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveUserDatabaseAction.java
Log:
Implemented "save" operation on userdb
Revision Changes Path
1.6 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveEnvEntryAction.java 6 May 2002 22:50:10 -0000 1.5
+++ SaveEnvEntryAction.java 7 May 2002 21:13:27 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v 1.5 2002/05/06 22:50:10 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/06 22:50:10 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v 1.6 2002/05/07 21:13:27 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/07 21:13:27 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* updated Env Entry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/05/06 22:50:10 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/07 21:13:27 $
* @since 4.1
*/
@@ -198,7 +198,7 @@
response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, "users.error.invoke",
- "createUser"));
+ "addEnvironment"));
return (null);
}
1.2 +12 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
Index: SetUpUserDatabaseAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUpUserDatabaseAction.java 7 May 2002 07:31:21 -0000 1.1
+++ SetUpUserDatabaseAction.java 7 May 2002 21:13:27 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v 1.1 2002/05/07 07:31:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/07 07:31:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v 1.2 2002/05/07 21:13:27 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/07 21:13:27 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* being added, or a non-null value for an existing UserDatabase.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/07 07:31:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/07 21:13:27 $
* @since 4.1
*/
@@ -155,6 +155,11 @@
String objectName = request.getParameter("objectName");
UserDatabaseForm userDatabaseForm = new UserDatabaseForm();
+ userDatabaseForm.setFactory
+ (SaveUserDatabaseAction.USERDB_FACTORY);
+ userDatabaseForm.setType
+ (SaveUserDatabaseAction.USERDB_RESOURCE_TYPE);
+
if (objectName == null) {
userDatabaseForm.setNodeLabel
(resources.getMessage(locale, "resources.actions.userdb.create"));
@@ -170,9 +175,9 @@
attribute = "name";
userDatabaseForm.setName
((String) mserver.getAttribute(oname, attribute));
- attribute = "pathName";
- userDatabaseForm.setPath("FIX ME");
- // ((String) mserver.getAttribute(oname, attribute));
+ attribute = "pathname";
+ userDatabaseForm.setPath
+ ((String) mserver.getAttribute(oname, attribute));
attribute = "description";
userDatabaseForm.setDescription
((String) mserver.getAttribute(oname, attribute));
1.2 +32 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
Index: UserDatabaseForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserDatabaseForm.java 7 May 2002 07:24:37 -0000 1.1
+++ UserDatabaseForm.java 7 May 2002 21:13:27 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v 1.1 2002/05/07 07:24:37 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/07 07:24:37 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v 1.2 2002/05/07 21:13:27 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/07 21:13:27 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Form bean for the individual user database page.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/07 07:24:37 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/07 21:13:27 $
* @since 4.1
*/
@@ -117,6 +117,32 @@
}
/**
+ * The type of the resource.
+ */
+ private String type = null;
+
+ public String getType() {
+ return (this.type);
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * The factory that implements the user database entry.
+ */
+ private String factory = null;
+
+ public String getFactory() {
+ return (this.factory);
+ }
+
+ public void setFactory(String factory) {
+ this.factory = factory;
+ }
+
+ /**
* The description of the associated entry.
*/
private String description = null;
@@ -141,7 +167,9 @@
super.reset(mapping, request);
name = null;
+ type = null;
path = null;
+ factory = null;
description = null;
}
1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
Index: SaveUserDatabaseAction.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v 1.1 2002/05/07 21:13:27 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/07 21:13:27 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.webapp.admin.resources;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
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;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.QueryExp;
import javax.management.Query;
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.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
/**
* <p>Implementation of <strong>Action</strong> that saves a new or
* updated User database entry.</p>
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/07 21:13:27 $
* @since 4.1
*/
public final class SaveUserDatabaseAction extends Action {
// ----------------------------------------------------- Instance Variables
/**
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
/**
* The MBeanServer we will be interacting with.
*/
private MBeanServer mserver = null;
public static String USERDB_RESOURCE_TYPE = "org.apache.catalina.UserDatabase";
/*
* Only one implementation of factory allowed to start with.
*/
public static String USERDB_FACTORY = "org.apache.catalina.users.MemoryUserDatabaseFactory";
// --------------------------------------------------------- Public Methods
/**
* Process the specified HTTP request, and create the corresponding HTTP
* response (or forward to another web component that will create it).
* Return an <code>ActionForward</code> instance describing where and how
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
// Look up the components we will be using as needed
if (mserver == null) {
mserver = ((ApplicationServlet) getServlet()).getServer();
}
if (resources == null) {
resources = getServlet().getResources();
}
HttpSession session = request.getSession();
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
// Has this transaction been cancelled?
if (isCancelled(request)) {
return (mapping.findForward("List UserDatabases Setup"));
}
// Check the transaction token
if (!isTokenValid(request)) {
response.sendError
(HttpServletResponse.SC_BAD_REQUEST,
resources.getMessage(locale, "users.error.token"));
return (null);
}
// Perform any extra validation that is required
UserDatabaseForm userDatabaseForm = (UserDatabaseForm) form;
String objectName = userDatabaseForm.getObjectName();
// Perform an "Add UserDatabase" transaction
if (objectName == null) {
String signature[] = new String[2];
signature[0] = "java.lang.String";
signature[1] = "java.lang.String";
Object params[] = new Object[2];
params[0] = userDatabaseForm.getName();
params[1] = USERDB_RESOURCE_TYPE;
ObjectName oname = null;
try {
// Construct the MBean Name for the naming source
oname = new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE);
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResource",
params, signature);
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale, "users.error.invoke",
"addResource"), e);
response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, "users.error.invoke",
"addResource"));
return (null);
}
}
// Perform an "Update User database" transaction
String attribute = null;
try {
ObjectName oname = new ObjectName(objectName);
attribute = "pathname";
mserver.setAttribute
(oname,
new Attribute(attribute, userDatabaseForm.getPath()));
attribute = "factory";
mserver.setAttribute
(oname,
new Attribute(attribute, userDatabaseForm.getFactory()));
attribute = "description";
mserver.setAttribute
(oname,
new Attribute(attribute, userDatabaseForm.getDescription()));
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale, "users.error.set.attribute",
attribute), e);
response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, "users.error.set.attribute",
attribute));
return (null);
}
// Proceed to the list entries screen
return (mapping.findForward("UserDatabases List Setup"));
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>