MissingResourceException on ResourceBundle.getBundle()
Hi, I have a web-app that looks up a properties file. I'm getting a java.util.MissingResourceException on ResourceBundle.getBundle(..); The jar containg the properties file is in WEB-INF/lib. Is this a classpath issue? Is there a workaround? Any help would be greatly appreciated. thanks Manveen -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] New committer: Denis Benoit
+1 --Manveen On Tue, 21 May 2002, Remy Maucherat wrote: I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on the Tomcat project. Denis has contributed patches to Jasper 2 which brings an impressive performance improvement when using JSP pages which rely heavily on tags, such as the administration web application available in Tomcat 4.1.x. He appears willing to spend time to further improve Jasper 2 performance. He has my +1 as a committer. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Password and username for Tomcat Web Server Admin Tool???
Hi Bill, The admin tool allows users with the role admin to login in. You can edit conf/tomcat-users.xml, and add the role admin to a user and use this username and password to login. thanks Manveen Bill Blackmon wrote: I've just installed Tomcat and want to lookover the Admin Tool. What are the default username and password? What file are they kept in? Thanks, Bill -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] New committer: Christopher St John
+1 Manveen Remy Maucherat wrote: I'd like to propose Christopher St John cks at distributopia.com as a committer on Tomcat. Christopher has contributed ideas and code to do some improvements to the design of Catalina. More importantly, he seems very motivated and willing to contribute very significant time and effort on Tomcat. He has my +1. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, April 24, 2002 8:44 AM Subject: [VOTE] Release Plan for Apache Tomcat 4.1 I'd like to call for a vote on the Apache Tomcat 4.1 Release Plan. The vote will run until 04/26, and will be followed, if the Release Plan is accepted, by a vote for the release of Apache Tomcat 4.1 Beta 1. [X] +1 I approve this plan, and will help [ ] +0 I approve this plan, but can't help [ ] -0 I am not in favor of this plan [ ] -1 I am against this plan, because: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [4.0.2] [VOTE] Final release
ballot [X] +1 - I support this release and I will help [ ] +0 - I support this release [ ] -0 - I do not support this release, because: /ballot --Manveen -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] jakarta-tomcat-4.0/
Comments: Download latest struts binary 1.0.1. Latest struts needed for admin tool. Please post my patch to the head branch. thanks, --Manveen Index: BUILDING.txt === RCS file: /home/cvspublic/jakarta-tomcat-4.0/BUILDING.txt,v retrieving revision 1.17 diff -u -r1.17 BUILDING.txt --- BUILDING.txt5 Jan 2002 20:24:30 - 1.17 +++ BUILDING.txt14 Jan 2002 22:40:27 - @@ -284,19 +284,18 @@ (18) Download and Install the Struts Binary Distribution -* Download a binary distribution of Struts 1.0 from: +* Download a binary distribution of Struts 1.0.1 from: -http://jakarta.apache.org/builds/jakarta-struts/release/v1.0/ +http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.1/ On a Windows platform, you will need: -jakarta-struts-1.0.zip +jakarta-struts-1.0.1.zip On a Unix platform, you will need: -jakarta-struts-1.0.tar.gz +jakarta-struts-1.0.1.tar.gz * Unpack the binary distribution into a convenient location so that the distribution resides in its own directory. - (19) Download and Install the Tyrex Data Source Package Index: build.properties.sample === RCS file: /home/cvspublic/jakarta-tomcat-4.0/build.properties.sample,v retrieving revision 1.23 diff -u -r1.23 build.properties.sample --- build.properties.sample 5 Jan 2002 20:24:30 - 1.23 +++ build.properties.sample 14 Jan 2002 22:40:28 - @@ -139,8 +139,8 @@ junit.jar=${junit.lib}/junit.jar -# - Struts, version 1.0 or later - -struts.home=${base.path}/jakarta-struts-1.0 +# - Struts, version 1.0.1 or later - +struts.home=${base.path}/jakarta-struts-1.0.1 struts.lib=${struts.home}/lib struts.jar=${struts.lib}/struts.jar -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] jakarta-tomcat-4.0/webapps/admin
Hi, Encoded the node label names as they contain spaces and other reserved characters. Please commit my patch to the head branch. thanks, Manveen Index: WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v retrieving revision 1.5 diff -u -r1.5 TomcatTreeBuilder.java --- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 10 Jan 2002 03:41:13 - 1.5 +++ WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 10 Jan 2002 +19:01:55 - @@ -140,11 +140,13 @@ // because Tomcat does this automatically String encodedServerName = URLEncoder.encode(serverObjName); +String encodedNodeLabel = URLEncoder.encode(SERVER_LABEL); + TreeControlNode serverNode = new TreeControlNode(serverObjName, folder_16_pad.gif, SERVER_LABEL, setUpServer.do?select= + encodedServerName -+nodeLabel= + SERVER_LABEL, ++nodeLabel= + encodedNodeLabel, content, true); return serverNode; @@ -175,13 +177,14 @@ encodedServiceName = URLEncoder.encode(service.getObjectName().toString()); String nodeLabel = Service ( + serviceName + ); - +String encodedNodeLabel = URLEncoder.encode(nodeLabel); + TreeControlNode serviceNode = new TreeControlNode(service.getObjectName().toString(), folder_16_pad.gif, nodeLabel, setUpService.do?select= + encodedServiceName -+nodeLabel= + nodeLabel, ++nodeLabel= + encodedNodeLabel, content, true); serverNode.addChild(serviceNode); @@ -213,17 +216,19 @@ encodedConnectorName = URLEncoder.encode(connectorObj.getObjectName().toString()); +String nodeLabel = Connector ( + connectorName + ); +String encodedNodeLabel = URLEncoder.encode(nodeLabel); + // Do not display the connector node if it is a warp connector. // This is because warp connector doesn't conform to the // standard Engine/Host/Context hierarchy and we don't support it. if (!warp.equalsIgnoreCase(connectorName)) { -String nodeLabel = Connector ( + connectorName + ); connectorNode = new TreeControlNode(connectorObj.getObjectName().toString(), folder_16_pad.gif, nodeLabel, setUpConnector.do?select= + encodedConnectorName -+ nodeLabel=+nodeLabel, ++ nodeLabel=+ encodedNodeLabel, content, true); serviceNode.addChild(connectorNode); @@ -264,13 +269,14 @@ encodedHostName = URLEncoder.encode(hostObj.getObjectName().toString()); String nodeLabel=Host ( + hostName + ); - +String encodedNodeLabel = URLEncoder.encode(nodeLabel); + hostNode = new TreeControlNode(hostObj.getObjectName().toString(), folder_16_pad.gif, nodeLabel, setUpHost.do?select= + encodedHostName -+nodeLabel=+nodeLabel, ++nodeLabel=+ encodedNodeLabel, content, true); serviceNode.addChild(hostNode); cvs server: Diffing images -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] jakarta-tomcat-4.0/webapps/admin
, 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; 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; import java.net.InetAddress; import java.util.ArrayList; /** * Form bean for the host page. * * @author Manveen Kaur * @version $Revision: $ $Date: $ */ public final class HostForm extends ActionForm { // - Instance Variables /** * The text for the node label. */ private String nodeLabel = null; /** * The text for the hostName. */ private String name = null; /** * The text for the selected host name that is used to lookup the MBean info. * This contains all information including the service name to which this host belongs etc. */ private String hostName = null; /** * The directory for the appBase. */ private String appBase = null; /** * The text for the debug level. */ private String debugLvl = 0; /** * Boolean for unpack WARs. */ private String unpackWARs = false; /** * The text for the port. -- TBD */ private String findAliases = null; /** * Set of valid values for debug level. */ private ArrayList debugLvlVals = null; /* * Represent boolean (true, false) values for unpackWARs etc. */ private ArrayList booleanVals = null; /* * Represent aliases as a List. */ private ArrayList aliasVals = null; // - Properties /** * Return the label of the node that was clicked. */ public String getNodeLabel() { return this.nodeLabel; } /** * Set the node label. */ public void setNodeLabel(String nodeLabel) { this.nodeLabel = nodeLabel; } /** * Return the selected node host name to lookup mBean. */ public String getHostName() { return this.hostName; } /** * Set the selected node host name to lookup mBean. */ public void setHostName(String hostName) { this.hostName = hostName; } /** * Return the host name. */ public String getName() { return this.name; } /** * Set the host name. */ public void setName(String name) { this.name = name; } /** * Return the appBase. */ public String getAppBase() { return this.appBase; } /** * Set the appBase. */ public void setAppBase(String appBase) { this.appBase = appBase; } /** * Return the unpackWARs. */ public String getUnpackWARs() { return this.unpackWARs; } /** * Set the unpackWARs. */ public void setUnpackWARs(String unpackWARs) { this.unpackWARs = unpackWARs; } /** * Return the debugVals. */ public ArrayList getDebugLvlVals() { return this.debugLvlVals; } /** * Set the debugVals. */ public void setDebugLvlVals(ArrayList debugLvlVals) { this.debugLvlVals = debugLvlVals; } /** * Return the Debug Level Text. */ public String getDebugLvl() { return this.debugLvl; } /** * Set the Debug Level Text. */ public void setDebugLvl(String debugLvl) { this.debugLvl = debugLvl; } /** * Return the booleanVals. */ public ArrayList getBooleanVals() { return this.booleanVals; } /** * Set the booleanVals. */ public void setBooleanVals(ArrayList booleanVals) { this.booleanVals = booleanVals
[PATCH]jakarta-tomcat-4.0/webapps/admin
@@ * * @author Jazmin Jonson * @author Manveen Kaur - * @version + * @version $Revision: $ $Date: $ */ - public class TomcatTreeBuilder implements TreeBuilder{ // This SERVER_LABEL needs to be localized @@ -104,8 +103,8 @@ public final static String SERVER_TYPE = Catalina:type=Server; public final static String SERVICE_TYPE = Catalina:type=Service; public final static String ENGINE_TYPE = Catalina:type=Engine; -private final static String CONNECTOR_TYPE = Catalina:type=Connector; -public final static String HOST_TYPE = Catalina:type=Host; +public final static String CONNECTOR_TYPE = Catalina:type=Connector; +public final static String HOST_TYPE = Catalina:type=Host; public final static String WILDCARD = ,*; private static MBeanServer mBServer = null; @@ -149,8 +148,7 @@ return serverNode; -} - +} public void getServices(TreeControlNode serverNode) throws JMException, ServletException { @@ -185,15 +183,14 @@ serverNode.addChild(serviceNode); getConnectors(serviceNode, serviceName); + } } public void getConnectors(TreeControlNode serviceNode, String serviceName) - throws JMException{ - Iterator ConnectorItr = (mBServer.queryMBeans(new ObjectName(CONNECTOR_TYPE + WILDCARD + ,service= + serviceName), @@ -210,25 +207,22 @@ (String)mBServer.getAttribute(connectorObj.getObjectName(), scheme); -// HACK to take into account special characters like = and -// in the node name, could remove this code if encode URL -// and later request.getParameter() could deal with = and -// character in parameter values. Decoding name not needed -// because Tomcat does this automatically - encodedConnectorName = URLEncoder.encode(connectorObj.getObjectName().toString()); -connectorNode = -new TreeControlNode(connectorObj.getObjectName().toString(), -folder_16_pad.gif, -Connector( + connectorName + ), -treeControlTest.do?select= + -encodedConnectorName, -null, true); - -serviceNode.addChild(connectorNode); -} - +// Do not display the connector node if it is a warp connector. +// This is because warp connector doesn't conform to the +// standard Engine/Host/Context hierarchy and we don't support it. +if (!warp.equalsIgnoreCase(connectorName)) { +connectorNode = +new TreeControlNode(connectorObj.getObjectName().toString(), +folder_16_pad.gif, +Connector( + connectorName + ), +setUpConnector.do?select= + +encodedConnectorName, +content, true); + +serviceNode.addChild(connectorNode); +} +} } - } connector.jsp Description: application/unknown-content-type-jspfile /* * $Header: Exp $ * $Revision: $ * $Date: $ * * * * The Apache Software License, Version 1.1 * * Copyright (c) 2001 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
[PATCH] jakarta-tomcat-4.0/webapps/admin/
: $ * $Date: 2001/12/19 01:58:10 $ * * * * The Apache Software License, Version 1.1 * * Copyright (c) 2001 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; import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; /** * pNested tag that represents an individual data for a row. This tag * is valid strongonly/strong when nested within a RowTag tag. * * pIn addition, the body content of this tag is used as the user-visible * data for the action, so that it may be conveniently localized./p * * strongFIXME/strong - Internationalize the exception messages! * * @author Manveen Kaur * @version $Revision: $ */ public class DataTag extends BodyTagSupport { // - Instance Variables /** * The data that will be rendered for this table row. */ protected String data = null; // - Public Methods /** * Process the start of this tag. * * @exception JspException if a JSP exception has occurred */ public int doStartTag() throws JspException { // Initialize the holder for our data text this.data = null; // Do no further processing for now return (EVAL_BODY_TAG); } /** * Process the body text of this tag (if any). * * @exception JspException if a JSP exception has occurred */ public int doAfterBody() throws JspException { String data = bodyContent.getString(); if (data != null) { data = data.trim(); if (data.length() 0) this.data = data; } return (SKIP_BODY); } /** * Record this action with our surrounding ActionsTag instance. * * @exception JspException if a processing error occurs */ public int doEndTag() throws JspException { // Find our parent ActionsTag instance Tag parent = getParent(); if ((parent == null) || !(parent instanceof RowTag)) throw new JspException(Must be nested in a rowTag isntance); RowTag row = (RowTag) parent; // Register
[PATCH] jakarta-tomcat-4.0/webapps/admin
Hi, Please commit my patch to the Head branch. thanks, Manveen Comments: --- Modified server.jsp and service.jsp to use custom tags to generate the list of available actions from each page. Using these custom tags eliminates the need of setting ActionVals in SetUpServer and SetUpService.java Index: server.jsp === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/server.jsp,v retrieving revision 1.2 diff -u -r1.2 server.jsp --- server.jsp 2001/12/11 22:54:12 1.2 +++ server.jsp 2001/12/19 22:58:49 @@ -4,6 +4,7 @@ %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % +%@ taglib uri=/WEB-INF/controls.tld prefix=controls % html:html locale=true @@ -23,11 +24,13 @@ /td td align=right nowrap div class=page-title-text - html:select property=action - bean:define id=actionVals name=serverForm property=actionVals/ - html:options collection=actionVals -property=value labelProperty=label/ -/html:select +controls:actions +controls:action selected=true bean:message +key=actions.available.actions/ /controls:action +controls:action - /controls:action +!-- will add the urls later once those screens get implemented -- +controls:action url= bean:message key=actions.services.create/ +/controls:action +controls:action url= bean:message key=actions.services.delete/ +/controls:action +/controls:actions /div /td /tr Index: service.jsp === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/service.jsp,v retrieving revision 1.1 diff -u -r1.1 service.jsp --- service.jsp 2001/12/14 23:22:33 1.1 +++ service.jsp 2001/12/19 22:58:50 @@ -4,6 +4,7 @@ %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % +%@ taglib uri=/WEB-INF/controls.tld prefix=controls % html:html locale=true @@ -28,11 +29,33 @@ /td td width=19% div align=right - html:select property=action - bean:define id=actionVals name=serviceForm property=actionVals/ - html:options collection=actionVals - property=value labelProperty=label/ -/html:select +controls:actions +controls:action selected=true -bean:message +key=actions.available.actions/- /controls:action +controls:action - /controls:action +!-- will add the urls later once those screens get implemented -- +controls:action url= bean:message +key=actions.accesslogger.create/ /controls:action +controls:action url= bean:message +key=actions.accesslogger.delete/ /controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.connector.create/ +/controls:action +controls:action url= bean:message key=actions.connector.delete/ +/controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.host.create/ +/controls:action +controls:action url= bean:message key=actions.host.delete/ +/controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.logger.create/ +/controls:action +controls:action url= bean:message key=actions.logger.delete/ +/controls:action +controls:action - /controls:action +controls:action url= bean:message +key=actions.requestfilter.create/ /controls:action +controls:action url= bean:message +key=actions.requestfilter.delete/ /controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.userrealm.create/ +/controls:action +controls:action url= bean:message key=actions.userrealm.delete/ +/controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.valve.create/ +/controls:action +controls:action url= bean:message key=actions.valve.delete/ +/controls:action +controls:action - /controls:action +controls:action url= bean:message key=actions.service.delete/ +/controls:action +/controls:actions /div /td
[PATCH] jakarta-tomcat-4.0/webapps/admin
Hi, Please commit my patch to the HEAD branch. Sincerely, Manveen == Comments: - This is a fix for the bug: The selected node does not get highlighted when the node is selected. Made changes so that the tree also gets refreshed with each node selection, along with loading the appropriate content in the content frame. Index: WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v retrieving revision 1.5 diff -u -r1.5 TreeControlTag.java --- WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java 2001/12/16 19:38:02 1.5 +++ WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java 2001/12/18 20:10:38 @@ -397,6 +397,9 @@ String action = replace(getAction(), ${name}, encodedNodeName); +String updateTreeAction = +replace(getAction(), tree=${name}, select= + +encodedNodeName); + out.print(td); if ((action != null) !node.isLeaf()) { out.print(a href=\); @@ -448,6 +451,10 @@ out.print(target); out.print(\); } + // to refresh the tree in the same 'self' frame +out.print( onclick=\); +out.print(self.location.href=' + updateTreeAction + '); +out.print(\); out.print(); } out.print(img src=\); @@ -484,6 +491,10 @@ out.print(labelStyle); out.print(\); } + // to refresh the tree in the same 'self' frame +out.print( onclick=\); +out.print(self.location.href=' + updateTreeAction + '); +out.print(\); out.print(); } else if (labelStyle != null) { out.print(span class=\); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
[PATCH] jakarta-tomcat-4.0/webapps/admin/
+service.engine.props=Caracteristicas del motor +service.defaulthostname=Hostname del valor por defecto +service.properties=Mantenga Las Caracteristicas +service.property=Caracteristica +service.value=Valor Index: WEB-INF/classes/org/apache/webapp/admin/ServerAction.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ServerAction.java,v retrieving revision 1.2 diff -u -r1.2 ServerAction.java --- WEB-INF/classes/org/apache/webapp/admin/ServerAction.java 2001/12/11 22:54:12 1.2 +++ WEB-INF/classes/org/apache/webapp/admin/ServerAction.java 2001/12/14 18:38:11 @@ -121,8 +121,6 @@ HttpServletResponse response) throws IOException, ServletException { -System.out.println(mapping.getInput()); - try{ // front end validation and checking. Index: WEB-INF/classes/org/apache/webapp/admin/ServerForm.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ServerForm.java,v retrieving revision 1.2 diff -u -r1.2 ServerForm.java --- WEB-INF/classes/org/apache/webapp/admin/ServerForm.java 2001/12/11 22:54:12 1.2 +++ WEB-INF/classes/org/apache/webapp/admin/ServerForm.java 2001/12/14 18:38:11 @@ -59,7 +59,6 @@ * */ - package org.apache.webapp.admin; @@ -134,7 +133,7 @@ } /** - * Set the portNumberText. + * Set the ActionVals. */ public void setActionVals(ArrayList actionVals) { Index: WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v retrieving revision 1.2 diff -u -r1.2 TomcatTreeBuilder.java --- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 2001/12/06 22:57:54 1.2 +++ WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 2001/12/14 +18:38:11 @@ -84,34 +84,36 @@ import javax.management.JMException; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; - + /** - * p Implementation of TreeBuilder interface for Tomcat Tree Controller + * p Implementation of TreeBuilder interface for Tomcat Tree Controller * to build plugin components into the tree * * @author Jazmin Jonson - * @version + * @author Manveen Kaur + * @version */ public class TomcatTreeBuilder implements TreeBuilder{ - + // This SERVER_LABEL needs to be localized private final static String SERVER_LABEL = Tomcat Server; - + public final static String SERVER_TYPE = Catalina:type=Server; -private final static String SERVICE_TYPE = Catalina:type=Service; -private final static String ENGINE_TYPE = Engine; +public final static String SERVICE_TYPE = Catalina:type=Service; +public final static String ENGINE_TYPE = Catalina:type=Engine; private final static String CONNECTOR_TYPE = Catalina:type=Connector; +public final static String HOST_TYPE = Catalina:type=Host; public final static String WILDCARD = ,*; - + private static MBeanServer mBServer = null; - + public void buildTree(TreeControl treeControl, - ApplicationServlet servlet, - HttpServletRequest request) { - +ApplicationServlet servlet, +HttpServletRequest request) { + try { mBServer = servlet.getServer(); TreeControlNode root = treeControl.getRoot(); @@ -120,113 +122,113 @@ getServices(server); }catch(Throwable t){ t.printStackTrace(System.out); -} +} } - -public TreeControlNode getServer() -throws JMException, ServletException { - -Iterator serverItr = -mBServer.queryMBeans(new ObjectName(SERVER_TYPE + WILDCARD), - null).iterator(); - String serverObjName = -(((ObjectInstance)serverItr.next()).getObjectName()).toString(); - + +public TreeControlNode getServer() +throws JMException, ServletException { + +Iterator serverItr = +mBServer.queryMBeans(new ObjectName(SERVER_TYPE + WILDCARD), +null).iterator(); +String serverObjName = +(((ObjectInstance)serverItr.next()).getObjectName()).toString(); + // HACK to take into account special characters like = and // in the node name, could remove this code if encode URL // and later request.getParameter() could deal with = and // character in parameter values. Decoding name not needed // because Tomcat does this automatically - - String encodedServerName = URLEncoder.encode
[PATCH] jakarta-tomcat-4.0/webapps/admin/
/ /html:select /div /td @@ -80,6 +81,7 @@ td div class=table-normal-text html:select property=debugLvl + bean:define id=debugLvlVals name=serverForm +property=debugLvlVals/ html:options collection=debugLvlVals property=value labelProperty=label/ /html:select Index: tree-control-test.css === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/tree-control-test.css,v retrieving revision 1.1 diff -u -r1.1 tree-control-test.css --- tree-control-test.css 2001/11/06 20:40:13 1.1 +++ tree-control-test.css 2001/12/11 21:23:28 @@ -1,18 +1,18 @@ .tree-control { - font-family: verdana, geneva, helvetica, arial, sans-serif; + font-family: arial, verdana, geneva, helvetica, sans-serif; font-size: 80%; line-height: 1.0; } .tree-control-selected { - color: red; + color: black; font-weight: bold; text-decoration: none; } .tree-control-unselected { - color: green; - font-style: italic; + color: black; + font-style: normal; font-weight: normal; text-decoration: none; } cvs server: Diffing WEB-INF cvs server: Diffing WEB-INF/classes cvs server: Diffing WEB-INF/classes/org cvs server: Diffing WEB-INF/classes/org/apache cvs server: Diffing WEB-INF/classes/org/apache/webapp cvs server: Diffing WEB-INF/classes/org/apache/webapp/admin Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.5 diff -u -r1.5 ApplicationResources_en.properties --- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties 2001/12/06 22:57:54 1.5 +++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties +2001/12/11 21:23:28 @@ -26,3 +26,7 @@ server.portnumber=Port Number server.debuglevel=Debug Level server.shutdown=Shutdown +error.portNumberText.required=liPortNumber cannot be empty/li +error.shutdownText.length=liShutdown Text must be atleast 6 characters/li +error.portNumber.format=liPortNumber not a valid integer!/li +error.portNumber.range=liPortNumber seems out of range. Valid range is 1-65535. +/li Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.6 diff -u -r1.6 ApplicationResources_es.properties --- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties 2001/12/06 23:19:17 1.6 +++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties +2001/12/11 21:23:28 @@ -23,6 +23,10 @@ sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede ser vac\u00edo/li save.success=\u00a1Guardar tiene \u00e9xito! server.heading=Tomcat Servidor -server.portnumber=Número de acceso +server.portnumber=Numero de acceso server.debuglevel=Ponga a punto llano server.shutdown=Parada normal +error.portNumberText.required=liPortNumber no puede ser vacio./li +error.shutdownText.length=liEl texto de la parada normal debe ser caracteres del +atleast 6!/li +error.portNumber.format=liPortNumber no un numero entero valido! /li +error.portNumber.range=liPortNumber se parece fuera de rango. El rango valido es +1-65535./li Index: WEB-INF/classes/org/apache/webapp/admin/ServerAction.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ServerAction.java,v retrieving revision 1.1 diff -u -r1.1 ServerAction.java --- WEB-INF/classes/org/apache/webapp/admin/ServerAction.java 2001/12/06 22:55:57 1.1 +++ WEB-INF/classes/org/apache/webapp/admin/ServerAction.java 2001/12/11 21:23:28 @@ -83,20 +83,23 @@ import javax.management.MBeanAttributeInfo; import javax.management.MBeanOperationInfo; import javax.management.MBeanInfo; +import org.apache.struts.util.MessageResources; + /** * Implementation of strongAction/strong that validates a user logon. * * @author Jazmin Jonson + * @author Manveen Kaur * @version $Revision: 1.1 $ $Date: 2001/12/06 22:55:57 $ */ public final class ServerAction extends Action { - + private static MBeanServer mBServer = null; - + // - Public Methods - - + + /** * Process the specified HTTP request, and create the corresponding HTTP * response (or forward to another web component that will create it). @@ -113,58 +116,75 @@ * @exception
[PATCH] jakarta-tomcat-4.0/webapps/admin/
Enhanced the admin tool by adding a new server screen and its related backend functionality. Please add these files to the HEAD branch. ( *.java under jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ server.jsp under jakarta-tomcat-4.0/webapps/admin/ PaperTexture.gif under jakarta-tomcat-4.0/webapps/admin/images/) Thanks! /* * $Header: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v 1.1 2001/11/06 20:40:13 craigmcc Exp $ * $Revision: 1.1 $ * $Date: 2001/11/06 20:40:13 $ * * * * The Apache Software License, Version 1.1 * * Copyright (c) 2001 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; import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.ArrayList; 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.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 javax.management.modelmbean.ModelMBean; import javax.management.modelmbean.ModelMBeanInfo; /** * Test codeAction/code that handles events from the tree control test * page. * * @author Jazmin Jonson * @version $Revision: 1.1 $ $Date: 2001/11/06 20:40:13 $ */ public class SetUpServerAction extends Action { private static MBeanServer mBServer = null; public final static String PORT_PROP_NAME = port; public final static String SHUTDOWN_PROP_NAME = shutdown; public final static String DEBUG_PROP_NAME = debug; private ArrayList debugLvlList = null; private ArrayList actionList = null; // - Public Methods /** * Process the specified HTTP request, and create the corresponding HTTP * response (or forward to another
[PATCH] jakarta-tomcat-4.0/webapps/admin/
Please commit my patch in the HEAD branch. Made changes to struts-config, internationalization ApplicationResources.properties files, and tree builder for the new server screen. Index: ./WEB-INF/struts-config.xml === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v retrieving revision 1.8 diff -u -r1.8 struts-config.xml --- WEB-INF/struts-config.xml 2001/11/21 01:10:09 1.8 +++ WEB-INF/struts-config.xml 2001/12/06 21:10:42 @@ -19,6 +19,10 @@ form-bean name=sampleForm type=org.apache.webapp.admin.SampleForm/ +!-- Server form bean -- +form-bean name=serverForm +type=org.apache.webapp.admin.ServerForm/ + !-- Set Locale form bean -- form-bean name=setLocaleForm type=org.apache.webapp.admin.SetLocaleForm/ @@ -46,6 +50,10 @@ path=/tree-control-test.jsp redirect=false/ +forwardname=Server +path=/server.jsp +redirect=false/ + forwardname=Save Successful path=/saved.jsp redirect=false/ @@ -73,6 +81,16 @@ redirect=true/ /action +!-- Set up Tree datastructure -- +actionpath=/setUpServer + type=org.apache.webapp.admin.SetUpServerAction + name=serverForm + scope=session + forwardname=SetUpServer + path=/server.jsp + redirect=true/ +/action + !-- Log out of the application -- actionpath=/logOut type=org.apache.webapp.admin.LogOutAction @@ -87,6 +105,14 @@ name=sampleForm scope=session input=/sample.jsp +/action + +!-- Process a user server change -- +actionpath=/server + type=org.apache.webapp.admin.ServerAction + name=serverForm + scope=session + input=/server.jsp /action !-- Process a set-locale action -- Index: ./WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.4 diff -u -r1.4 ApplicationResources_en.properties --- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties 2001/11/18 17:17:08 1.4 +++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties +2001/12/06 21:10:42 @@ -8,6 +8,7 @@ button.reset=Reset button.save=Save button.change=Change +button.cancel=Cancel login.enter=Enter a username and password to start a new session login.changeLanguage=Change the language index.success=Login successful! @@ -21,3 +22,7 @@ sample.someText.required=liSome Text cannot be empty/li sample.moreText.required=liMore Text cannot be empty/li save.success=Save sucessful! +server.heading=Tomcat Server +server.portnumber=Port Number +server.debuglevel=Debug Level +server.shutdown=Shutdown Index: ./WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.4 diff -u -r1.4 ApplicationResources_es.properties --- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties 2001/11/18 17:17:08 1.4 +++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties +2001/12/06 21:10:42 @@ -8,6 +8,7 @@ button.reset=Reiniciar button.save=Guardar button.change=Cambiar +button.cancel=Cancelan login.enter=Introduzca un nombre de usuario y una contrase\u00f1a que empezar una sesi\u00f3n nueva login.changeLanguage=Cambie el idioma index.success=\u00a1Autenticaci\u00f3n tiene \u00e9xito! @@ -21,3 +22,7 @@ sample.someText.required=li\u00abAlg\u00fan Texto\u00bb no puede ser vac\u00edo/li sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede ser vac\u00edo/li save.success=\u00a1Guardar tiene \u00e9xito! +server.heading=Tomcat Servidor +server.portnumber=Número de acceso +server.debuglevel=Ponga a punto Llano +server.shutdown=Parada normal Index: ./WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java === RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v retrieving revision 1.1 diff -u -r1.1 TomcatTreeBuilder.java --- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java 2001/11/27 02:46:28 1.1 +++
[PATCH] jakarta-tomcat-4.0/webapps/admin/
Please add this file to the HEAD branch. (I'd forgotten to attach it in my last mail.) New Server screen added to admin tool. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Resend: [PATCH] jakarta-tomcat-4.0/webapps/admin/
Resending... On Thu, 6 Dec 2001, Manveen Kaur wrote: Please add this file to the HEAD branch. (I'd forgotten to attach it in my last mail.) New Server screen added to admin tool. !-- Standard Struts Entries -- %@ page language=java % %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % html:html locale=true %@ include file=header.jsp % !-- Body -- body bgcolor=white !--Form -- html:errors/ html:form method=POST action=/server focus=portNumberText table width=100% border=0 cellspacing=0 cellpadding=0 tr class=page-title-row td align=left nowrap div class=page-title-textbean:message key=server.heading//div /td td align=right nowrap div class=page-title-text html:select property=action html:options collection=actionVals property=value labelProperty=label/ /html:select /div /td /tr tr tdnbsp;/td /tr tr td colspan=2 align=right nowrap html:submit styleClass=button bean:message key=button.save/ /html:submit nbsp; html:reset styleClass=button bean:message key=button.cancel/ /html:reset /td /tr tr tdnbsp;/td /tr /table table class=back-table border=0 cellspacing=0 cellpadding=1 width=100% tr td table class=front-table border=0 cellspacing=0 cellpadding=0 width=100% tr class=header-row td width=27% div class=table-header-text align=leftProperties/div /td td width=73% div class=table-header-text align=leftnbsp;/div /td /tr tr td div class=table-label-textbean:message key=server.portnumber/:/div /td td div class=table-normal-text html:text property=portNumberText size=24 maxlength=24/ /div /td /tr tr td class=line-row colspan=2img src= alt= width=1 height=1 border=0/td /tr tr td div class=table-label-textbean:message key=server.debuglevel/:/div /td td div class=table-normal-text html:select property=debugLvl html:options collection=debugLvlVals property=value labelProperty=label/ /html:select /div /td /tr tr td class=line-row colspan=2img src= alt= width=1 height=1 border=0/td /tr tr td div class=table-label-textbean:message key=server.shutdown/:/div /td td div class=table-normal-text html:text property=shutdownText size=24 maxlength=24/ /div /td /tr /table /td /tr /table table width=100% border=0 cellspacing=0 cellpadding=0 tr tdnbsp;/td /tr tr td colspan=2 align=right nowrap html:submit styleClass=button bean:message key=button.save/ /html:submit nbsp; html:reset styleClass=button bean:message key=button.cancel/ /html:reset /td /tr /table /html:form !-- Standard Footer -- %@ include file=footer.jsp % /body /html:html -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]