cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp
manveen 02/04/30 19:37:22
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java
webapps/admin/connector connectors.jsp
Log:
Display the list of connectors to be deletd with their port numbers instead of calss
name attributes.
Revision ChangesPath
1.11 +8 -8
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConnectorForm.java30 Apr 2002 21:38:20 - 1.10
+++ ConnectorForm.java1 May 2002 02:37:22 - 1.11
@@ -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.10 2002/04/30 21:38:20 manveen Exp $
- * $Revision: 1.10 $
- * $Date: 2002/04/30 21:38:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.11 2002/05/01 02:37:22 manveen Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/05/01 02:37:22 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.10 $ $Date: 2002/04/30 21:38:20 $
+ * @version $Revision: 1.11 $ $Date: 2002/05/01 02:37:22 $
*/
public final class ConnectorForm extends ActionForm {
@@ -742,7 +742,7 @@
/* The IP address can also be null -- which means open the
server socket on *all* IP addresses for this host */
-if (address.length() 0) {
+if ((address.length() 0) !address.equalsIgnoreCase( )) {
try {
InetAddress.getByName(address);
} catch (Exception e) {
@@ -767,7 +767,7 @@
numberCheck(maxProcessorsText, maxProcessorsText, true, 1, 512);
}
-/* proxy*/
+// proxy
if ((proxyName!= null) (proxyName.length() 0)) {
try {
InetAddress.getByName(proxyName);
@@ -776,7 +776,7 @@
}
}
-/* supported only by Coyote HTTP/1.1 connectors */
+// supported only by Coyote HTTP and HTTPS connectors
if (!(AJP.equalsIgnoreCase(connectorType)))
numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
}
@@ -785,7 +785,7 @@
}
/*
- * Helper method to check that it is a reuired number and
+ * Helper method to check that it is a required number and
* is a valid integer within the given range. (min, max).
*
* @param field The field name in the form for which this error occured.
1.4 +1 -1 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp
Index: connectors.jsp
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- connectors.jsp26 Apr 2002 19:15:52 - 1.3
+++ connectors.jsp1 May 2002 02:37:22 - 1.4
@@ -77,7 +77,7 @@
tddiv align=left class=table-normal-textnbsp;
html:link page='%= /EditConnector.do?select= +
java.net.URLEncoder.encode(connector.toString()) %'
-controls:attribute name=connector attribute=className/
+Connector (controls:attribute name=connector attribute=port/)
/html:link
/div/td
/tr
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp
manveen 02/04/25 20:50:41 Modified:webapps/admin/connector connectors.jsp Log: Do not display a checkbox in front of the connector that the admin app runs on in order to prevent it from being deleted through the tool. Revision ChangesPath 1.2 +4 -0 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp Index: connectors.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- connectors.jsp4 Apr 2002 00:40:26 - 1.1 +++ connectors.jsp26 Apr 2002 03:50:41 - 1.2 @@ -64,8 +64,12 @@ logic:iterate name=connectorsList id=connector tr class=line-row tddiv align=left class=table-normal-textnbsp; +%-- the connector the admin app is running on cannot be deleted + through the tool --% +logic:notMatch name=connector value='%= Integer.toString(request.getServerPort()) %' html:multibox property=connectors value=%= connector.toString() %/ +/logic:notMatch /div/td tddiv align=left class=table-normal-textnbsp; html:link page='%= /EditConnector.do?select= + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp connector.jsp
manveen 02/04/03 16:40:26
Modified:webapps/admin/connector connector.jsp
Added: webapps/admin/connector connectors.jsp
Log:
Added jsp file that displays the list of connectors that can be deleted.
Added a pulldown menu to choose type of connector to be added from the connector
screen for a add new connector operation.
Revision ChangesPath
1.3 +21 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- connector.jsp 3 Apr 2002 22:37:07 - 1.2
+++ connector.jsp 4 Apr 2002 00:40:26 - 1.3
@@ -44,8 +44,11 @@
controls:actions
controls:action selected=true bean:message
key=actions.available.actions/ /controls:action
controls:action - /controls:action
- %--
-controls:action url= bean:message
key=actions.thisconnector.delete/ /controls:action
+%--
+controls:action url='%= /DeleteConnector.do?select= +
+URLEncoder.encode(thisObjectName) %'
+bean:message key=actions.connectors.delete/
+/controls:action
--%
/controls:actions
/div
@@ -68,8 +71,22 @@
controls:row labelStyle=table-label-text dataStyle=table-normal-text
controls:labelbean:message key=connector.type/:/controls:label
controls:data
- bean:write name=connectorForm property=scheme
-scope=session/
+ logic:equal name=connectorForm property=adminAction
value=Create
+html:select property=connectorType
onchange=IA_jumpMenu('self',this)
+ bean:define id=connectorTypeVals name=connectorForm
property=connectorTypeVals/
+ html:options collection=connectorTypeVals property=value
labelProperty=label/
+/html:select
+/logic:equal
+logic:equal name=connectorForm property=adminAction
value=Edit
+ bean:write name=connectorForm property=connectorType
scope=session/
+/logic:equal
+/controls:data
+/controls:row
+
+controls:row labelStyle=table-label-text dataStyle=table-normal-text
+controls:labelbean:message key=connector.scheme/:/controls:label
+controls:data
+ bean:write name=connectorForm property=scheme scope=session/
/controls:data
/controls:row
1.1 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp
Index: connectors.jsp
===
!-- 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 %
%@ taglib uri=/WEB-INF/controls.tld prefix=controls %
html:html locale=true
%@ include file=../users/header.jsp %
!-- Body --
body bgcolor=white
!--Form --
html:errors/
html:form method=post action=/DeleteConnectors
table width=100% border=0 cellspacing=0 cellpadding=0
tr bgcolor=7171A5
td width=81%
div class=page-title-text align=left
bean:message key=actions.connectors.delete/
/div
/td
td width=19%
div align=right
controls:actions
controls:action selected=true
bean:message key=actions.available.actions/
/controls:action
controls:action
-
/controls:action
/controls:actions
/div
/td
/tr
/table
%@ include file=../buttons.jsp %
br
%-- Connectors List --%
table class=back-table border=0 cellspacing=0 cellpadding=1
width=100%
trtd
table class=front-table border=1
cellspacing=0 cellpadding=0 width=100%
tr class=header-row
tddiv align=left class=table-header-text
bean:message key=actions.delete/
/div/td
tddiv align=left class=table-header-text
bean:message key=host.name/
/div/td
/tr
logic:iterate name=connectorsList id=connector
tr class=line-row
tddiv align=left class=table-normal-textnbsp;
html:multibox property=connectors
