billbarker 2004/01/24 17:54:16
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Adding support for the new clientAuth values to the admin webapp.
Revision Changes Path
1.12 +24 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Lists.java 24 Apr 2003 07:56:33 -0000 1.11
+++ Lists.java 25 Jan 2004 01:54:15 -0000 1.12
@@ -137,7 +137,17 @@
booleanValues.add(new LabelValueBean("True", "true"));
booleanValues.add(new LabelValueBean("False", "false"));
}
-
+
+ /**
+ * Precomputed list of clientAuth lables and values.
+ */
+ private static List clientAuthValues = new ArrayList();
+
+ static {
+ clientAuthValues.add(new LabelValueBean("True","true"));
+ clientAuthValues.add(new LabelValueBean("False","false"));
+ clientAuthValues.add(new LabelValueBean("Want","want"));
+ }
// --------------------------------------------------------- Public Methods
@@ -169,6 +179,15 @@
public static List getBooleanValues() {
return (booleanValues);
+
+ }
+ /**
+ * Return a <code>List</code> of [EMAIL PROTECTED] LabelValueBean}s for the
legal
+ * settings for <code>clientAuth</code> properties.
+ */
+ public static List getClientAuthValues() {
+
+ return (clientAuthValues);
}
1.6 +5 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddConnectorAction.java 29 Aug 2003 02:40:51 -0000 1.5
+++ AddConnectorAction.java 25 Jan 2004 01:54:15 -0000 1.6
@@ -180,6 +180,7 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+ connectorFm.setClientAuthVals(Lists.getClientAuthValues());
String schemeTypes[]= new String[3];
schemeTypes[0] = "HTTP";
1.8 +22 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConnectorForm.java 24 Jan 2004 13:48:04 -0000 1.7
+++ ConnectorForm.java 25 Jan 2004 01:54:15 -0000 1.8
@@ -284,6 +284,11 @@
private List connectorTypeVals = null;
/**
+ * Represent supported clientAuth values.
+ */
+ private List clientAuthVals = null;
+
+ /**
* The value of secure.
*/
private String secure = "false";
@@ -807,6 +812,19 @@
this.booleanVals = booleanVals;
+ }
+
+ /**
+ * Return the clientAuth values.
+ */
+ public List getClientAuthVals() {
+ return clientAuthVals;
+ }
+ /**
+ * Set the clientAuth vaues.
+ */
+ public void setClientAuthVals(List clientAuthVals) {
+ this.clientAuthVals = clientAuthVals;
}
/**
1.6 +5 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Index: EditConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditConnectorAction.java 24 Jan 2004 05:59:47 -0000 1.5
+++ EditConnectorAction.java 25 Jan 2004 01:54:15 -0000 1.6
@@ -172,6 +172,7 @@
connectorFm.setNodeLabel(sb.toString());
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+ connectorFm.setClientAuthVals(Lists.getClientAuthValues());
String attribute = null;
try {
1.8 +2 -2 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp
Index: connector.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- connector.jsp 22 Jan 2004 02:05:05 -0000 1.7
+++ connector.jsp 25 Jan 2004 01:54:16 -0000 1.8
@@ -374,8 +374,8 @@
<controls:label><bean:message
key="connector.client.auth"/>:</controls:label>
<controls:data>
<html:select property="clientAuthentication" styleId="clientauth">
- <bean:define id="booleanVals" name="connectorForm"
property="booleanVals"/>
- <html:options collection="booleanVals" property="value"
+ <bean:define id="clientAuthVals" name="connectorForm"
property="clientAuthVals"/>
+ <html:options collection="clientAuthVals" property="value"
labelProperty="label"/>
</html:select>
</controls:data>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
