manveen 02/05/03 22:17:53 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourcesTreeBuilder.java Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources BaseForm.java EnvEntriesForm.java ListEnvEntriesAction.java ResourceUtils.java Log: Added classes to display list of environment entries. Added appropriate action from ResourcesTreeBuilder Revision Changes Path 1.2 +6 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java Index: ResourcesTreeBuilder.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ResourcesTreeBuilder.java 4 May 2002 01:58:39 -0000 1.1 +++ ResourcesTreeBuilder.java 4 May 2002 05:17:53 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.1 2002/05/04 01:58:39 manveen Exp $ - * $Revision: 1.1 $ - * $Date: 2002/05/04 01:58:39 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.2 2002/05/04 05:17:53 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/05/04 05:17:53 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * for administering the resources (data sources). * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/05/04 01:58:39 $ + * @version $Revision: 1.2 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ @@ -141,8 +141,8 @@ ("Global Administer Environment Entries", "EnvironmentEntries.gif", resources.getMessage("resources.env.entries"), - // FIX ME -- add URL once its implemented - null, + "resources/listEnvEntries.do?forward=" + + URLEncoder.encode("EnvEntries List Setup"), "content", false); root.addChild(subtree); 1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java Index: BaseForm.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java,v 1.1 2002/05/04 05:17:53 manveen Exp $ * $Revision: 1.1 $ * $Date: 2002/05/04 05:17:53 $ * * ==================================================================== * * 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 [EMAIL PROTECTED] * * 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 javax.management.ObjectName; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; /** * Base class for form beans for the resource administration. * * @author Manveen Kaur * @version $Revision: 1.1 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ public class BaseForm extends ActionForm { // ----------------------------------------------------- Instance Variables // ------------------------------------------------------------- Properties /** * The node label to be displayed in the user interface. */ private String nodeLabel = null; public String getNodeLabel() { return (this.nodeLabel); } public void setNodeLabel(String nodeLabel) { this.nodeLabel = nodeLabel; } /** * The MBean object name of this object. A null or zero-length * value indicates that this is a new object. */ private String objectName = null; public String getObjectName() { return (this.objectName); } public void setObjectName(String objectName) { if ((objectName != null) && (objectName.length() < 1)) { this.objectName = null; } else { this.objectName = objectName; } } // --------------------------------------------------------- Public Methods /** * Reset all properties to their default values. * * @param mapping The mapping used to select this instance * @param request The servlet request we are processing */ public void reset(ActionMapping mapping, HttpServletRequest request) { nodeLabel = null; objectName = null; } } 1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java Index: EnvEntriesForm.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java,v 1.1 2002/05/04 05:17:53 manveen Exp $ * $Revision: 1.1 $ * $Date: 2002/05/04 05:17:53 $ * * ==================================================================== * * 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 [EMAIL PROTECTED] * * 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 javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; /** * Form bean for the delete env entries page. * * @author Manveen Kaur * @version $Revision: 1.1 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ public final class EnvEntriesForm extends BaseForm { // ----------------------------------------------------- Instance Variables // ------------------------------------------------------------- Properties /** * The object names of the specified environment entries. */ private String envEntries[] = null; public String[] getEnvEntries() { return (this.envEntries); } public void setEnvEntries(String envEntries[]) { this.envEntries = envEntries; } // --------------------------------------------------------- Public Methods /** * Reset all properties to their default values. * * @param mapping The mapping used to select this instance * @param request The servlet request we are processing */ public void reset(ActionMapping mapping, HttpServletRequest request) { super.reset(mapping, request); this.envEntries = null; } } 1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java Index: ListEnvEntriesAction.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java,v 1.1 2002/05/04 05:17:53 manveen Exp $ * $Revision: 1.1 $ * $Date: 2002/05/04 05:17:53 $ * * ==================================================================== * * 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", "Tomcat", 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 [EMAIL PROTECTED] * * 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.Locale; import javax.management.MBeanServer; import javax.management.ObjectName; 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.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; /** * <p>Retrieve the set of MBean names for all currently defined environment entries, * and expose them in a request attribute named "enventriesForm". This action * requires the following request parameters to be set:</p> * <ul> * <li><strong>forward</strong> - Global forward to which we should * go after stashing the users list.</li> * </ul> * * @author Manveen Kaur * @version $Revision: 1.1 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ public class ListEnvEntriesAction extends Action { // ----------------------------------------------------- Instance Variables /** * The MBeanServer we will be interacting with. */ private MBeanServer mserver = null; /** * The MessageResources we will be retrieving messages from. */ private MessageResources resources = null; // --------------------------------------------------------- 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); // Create a form bean containing the requested MBean Names EnvEntriesForm envEntriesForm = null; try { envEntriesForm = ResourceUtils.getEnvEntriesForm(mserver); } catch (Exception e) { getServlet().log(resources.getMessage (locale, "users.error.attribute.get", "environments"), e); response.sendError (HttpServletResponse.SC_INTERNAL_SERVER_ERROR, resources.getMessage (locale, "users.error.attribute.get", "environments")); } // Stash the results in request scope request.setAttribute("envEntriesForm", envEntriesForm); saveToken(request); String forward = URLDecoder.decode(request.getParameter("forward")); return (mapping.findForward(forward)); } } 1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java Index: ResourceUtils.java =================================================================== /* * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v 1.1 2002/05/04 05:17:53 manveen Exp $ * $Revision: 1.1 $ * $Date: 2002/05/04 05:17:53 $ * * ==================================================================== * * 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-resource 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", "Tomcat", 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 [EMAIL PROTECTED] * * 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 Datasource. * * 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.util.Arrays; import javax.management.MBeanServer; import javax.management.ObjectName; /** * <p>Shared utility methods for the resource administration module.</p> * * @author Manveen Kaur * @version $Revision: 1.1 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ public class ResourceUtils { public final static String ENVIRONMENT_TYPE = "Catalina:type=Environment"; public final static String NAMINGRESOURCES_TYPE = "Catalina:type=NamingResources"; // --------------------------------------------------------- Public Methods /** * Construct and return a ResourcesForm identifying all currently defined * resources in the specified resource database. * * @param mserver MBeanServer to be consulted * @param databaseName MBean Name of the resource database to be consulted * * @exception Exception if an error occurs */ //public static EnvEntriesForm getEnvEntriesForm(MBeanServer mserver) public static EnvEntriesForm getEnvEntriesForm(MBeanServer mserver) throws Exception { ObjectName ename = new ObjectName( NAMINGRESOURCES_TYPE ); String results[] = (String[]) mserver.getAttribute(ename, "environments"); if (results == null) { results = new String[0]; } Arrays.sort(results); EnvEntriesForm envEntriesForm = new EnvEntriesForm(); envEntriesForm.setEnvEntries(results); return (envEntriesForm); } /** * Construct and return a DatasourcesForm identifying all currently defined * datasources in the specified resource database. * * @param mserver MBeanServer to be consulted * @param databaseName MBean Name of the resource database to be consulted * * @exception Exception if an error occurs */ /* public static DatasourcesForm getDatasourcesForm(MBeanServer mserver, String databaseName) throws Exception { ObjectName dname = new ObjectName(databaseName); String results[] = (String[]) mserver.getAttribute(dname, "datasources"); if (results == null) { results = new String[0]; } Arrays.sort(results); DatasourcesForm datasourcesForm = new DatasourcesForm(); datasourcesForm.setDatasources(results); return (datasourcesForm); } */ }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>