manveen 02/04/04 16:02:19 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java SaveConnectorAction.java webapps/admin/connector connector.jsp webapps/admin/server server.jsp webapps/admin/service service.jsp Log: Fix for add connector. Enabled add delete operations from service, and enabled "delete this connector" from the connector screen. Revision Changes Path 1.6 +7 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java Index: ConnectorForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ConnectorForm.java 3 Apr 2002 23:35:35 -0000 1.5 +++ ConnectorForm.java 5 Apr 2002 00:02:18 -0000 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v 1.5 2002/04/03 23:35:35 manveen Exp $ - * $Revision: 1.5 $ - * $Date: 2002/04/03 23:35:35 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v 1.6 2002/04/05 00:02:18 manveen Exp $ + * $Revision: 1.6 $ + * $Date: 2002/04/05 00:02:18 $ * * ==================================================================== * @@ -74,7 +74,7 @@ * Form bean for the connector page. * * @author Manveen Kaur - * @version $Revision: 1.5 $ $Date: 2002/04/03 23:35:35 $ + * @version $Revision: 1.6 $ $Date: 2002/04/05 00:02:18 $ */ public final class ConnectorForm extends ActionForm { @@ -664,7 +664,7 @@ numberCheck("acceptCountText", acceptCountText, true, 0, 128); numberCheck("connTimeOutText", connTimeOutText, true, -1, 60000); numberCheck("bufferSizeText", bufferSizeText, true, 1, 8192); - + /* The IP address can also be null -- which means open the server socket on *all* IP addresses for this host */ if (address.length() > 0) { @@ -673,6 +673,8 @@ } catch (Exception e) { errors.add("address", new ActionError("error.address.invalid")); } + } else { + address = " "; } /* ports */ 1.2 +9 -8 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java Index: SaveConnectorAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SaveConnectorAction.java 3 Apr 2002 22:25:43 -0000 1.1 +++ SaveConnectorAction.java 5 Apr 2002 00:02:18 -0000 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v 1.1 2002/04/03 22:25:43 manveen Exp $ - * $Revision: 1.1 $ - * $Date: 2002/04/03 22:25:43 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v 1.2 2002/04/05 00:02:18 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/04/05 00:02:18 $ * * ==================================================================== * @@ -61,7 +61,6 @@ package org.apache.webapp.admin.connector; - import java.net.URLEncoder; import java.util.Iterator; import java.util.Locale; @@ -96,7 +95,7 @@ * <em>Edit Connector</em> transactions. * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/04/03 22:25:43 $ + * @version $Revision: 1.2 $ $Date: 2002/04/05 00:02:18 $ */ public final class SaveConnectorAction extends Action { @@ -201,10 +200,10 @@ // Create a new Connector object values = new Object[3]; values[0] = // parent - TomcatTreeBuilder.ENGINE_TYPE + ",service=" + serviceName; + TomcatTreeBuilder.SERVICE_TYPE + ",name=" + serviceName; values[1] = cform.getAddress(); values[2] = new Integer(cform.getPortText()); - + operation = "create" + connectorType; cObjectName = (String) mBServer.invoke(fname, operation, @@ -218,7 +217,7 @@ TreeControlNode parentNode = control.findNode(parentName); if (parentNode != null) { String nodeLabel = - "Connector for " + parentNode.getLabel(); + "Connector (" + cform.getPortText() + ")"; String encodedName = URLEncoder.encode(cObjectName); TreeControlNode childNode = @@ -229,6 +228,8 @@ encodedName, "content", true); + // FIXME--the node should be next to the rest of + // the Connector nodes.. parentNode.addChild(childNode); // FIXME - force a redisplay } else { 1.4 +2 -2 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connector.jsp 4 Apr 2002 00:40:26 -0000 1.3 +++ connector.jsp 5 Apr 2002 00:02:19 -0000 1.4 @@ -44,12 +44,12 @@ <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> - <%-- + <logic:notEqual name="connectorForm" property="adminAction" value="Create"> <controls:action url='<%= "/DeleteConnector.do?select=" + URLEncoder.encode(thisObjectName) %>'> <bean:message key="actions.connectors.delete"/> </controls:action> - --%> + </logic:notEqual> </controls:actions> </div> </td> 1.2 +2 -2 jakarta-tomcat-4.0/webapps/admin/server/server.jsp Index: server.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/server/server.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- server.jsp 4 Apr 2002 21:52:25 -0000 1.1 +++ server.jsp 5 Apr 2002 00:02:19 -0000 1.2 @@ -72,7 +72,7 @@ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label><bean:message key="server.portnumber"/>:</controls:label> <controls:data> - <html:text property="portNumberText" size="20" maxlength="20"/> + <html:text property="portNumberText" size="24" maxlength="24"/> </controls:data> </controls:row> @@ -90,7 +90,7 @@ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label><bean:message key="server.shutdown"/>:</controls:label> <controls:data> - <html:text property="shutdownText" size="20" maxlength="20"/> + <html:text property="shutdownText" size="24" maxlength="24"/> </controls:data> </controls:row> </controls:table> 1.12 +1 -1 jakarta-tomcat-4.0/webapps/admin/service/service.jsp Index: service.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- service.jsp 4 Apr 2002 21:52:25 -0000 1.11 +++ service.jsp 5 Apr 2002 00:02:19 -0000 1.12 @@ -58,6 +58,7 @@ <controls:action> ------------------------------------- </controls:action> + --%> <controls:action url='<%= "/AddConnector.do?serviceName=" + serviceName %>'> <bean:message key="actions.connectors.create"/> @@ -69,7 +70,6 @@ <controls:action> ------------------------------------- </controls:action> - --%> <controls:action url='<%= "/AddHost.do?serviceName=" + serviceName %>'> <bean:message key="actions.hosts.create"/>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>