cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/26 00:04:14
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
Log:
Support through admin tool for:
HTTP - Coyote Http/1.1
HTTPS - Coyote Http/1.1
AJP (HTTP) connectors
Revision ChangesPath
1.4 +11 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddConnectorAction.java 26 Apr 2002 02:13:48 - 1.3
+++ AddConnectorAction.java 26 Apr 2002 07:04:14 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.3 2002/04/26 02:13:48 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/26 02:13:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/26 07:04:14 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/26 02:13:48 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
*/
public class AddConnectorAction extends Action {
@@ -149,21 +149,24 @@
connectorFm.setRedirectPortText(-1);
connectorFm.setMinProcessorsText(5);
connectorFm.setMaxProcessorsText(20);
+
+//supported only by HTTPS
connectorFm.setClientAuthentication(false);
connectorFm.setKeyStoreFileName();
connectorFm.setKeyStorePassword();
-// supported by both JK2 and Coyote
+// supported only by Coyote connectors
connectorFm.setProxyName();
connectorFm.setProxyPortText(0);
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
-String schemeTypes[]= new String[2];
+String schemeTypes[]= new String[3];
schemeTypes[0] = HTTP;
-schemeTypes[1] = HTTPS;
-
+schemeTypes[1] = HTTPS;
+schemeTypes[2] = HTTP(AJP);
+
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
1.8 +7 -7
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConnectorForm.java25 Apr 2002 23:27:59 - 1.7
+++ ConnectorForm.java26 Apr 2002 07:04:14 - 1.8
@@ -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.7 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.7 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.8 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/26 07:04:14 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.7 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/26 07:04:14 $
*/
public final class ConnectorForm extends ActionForm {
@@ -776,9 +776,9 @@
}
}
-// supported by both Coyote and JK2 connectors
-numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
-
+// supported by only HTTP and HTTPS connectors
+if (!(HTTP(AJP).equalsIgnoreCase(connectorType)))
+numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
}
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/25 16:28:00
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
Log:
Added support for SSL.
Revision ChangesPath
1.2 +27 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddConnectorAction.java 3 Apr 2002 23:35:35 - 1.1
+++ AddConnectorAction.java 25 Apr 2002 23:27:59 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.1 2002/04/03 23:35:35 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/03 23:35:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.2 2002/04/25 23:27:59 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/25 23:27:59 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/03 23:35:35 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/25 23:27:59 $
*/
public class AddConnectorAction extends Action {
@@ -135,7 +135,8 @@
connectorFm.setConnectorName();
String type = request.getParameter(type);
if (type == null)
-type = CoyoteConnector;// default type is CoyoteConnector
+//type = CoyoteConnector;// default type is CoyoteConnector
+type = HTTP;// default type is HTTP
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl(0);
connectorFm.setServiceName(serviceName);
@@ -149,7 +150,10 @@
connectorFm.setRedirectPortText(-1);
connectorFm.setMinProcessorsText(5);
connectorFm.setMaxProcessorsText(20);
-
+connectorFm.setClientAuthentication(false);
+connectorFm.setKeyStoreFileName();
+connectorFm.setKeyStorePassword();
+
// should be set only for Coyote, not supported by all connector types
if (CoyoteConnector.equalsIgnoreCase(type)) {
connectorFm.setProxyName();
@@ -159,21 +163,36 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+/*
String connectorTypes[] = new String[2];
connectorTypes[0] = CoyoteConnector;
connectorTypes[1] = Ajp13Connector;
+*/
+String schemeTypes[]= new String[2];
+schemeTypes[0] = HTTP;
+schemeTypes[1] = HTTPS;
+
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + type));
-for (int i=0; i connectorTypes.length; i++) {
+ for (int i=0; i schemeTypes.length; i++) {
+if (!type.equalsIgnoreCase(schemeTypes[i])) {
+types.add(new LabelValueBean(schemeTypes[i],
+/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
++ type= + schemeTypes[i]));
+}
+/*
+ for (int i=0; i connectorTypes.length; i++) {
if (!type.equalsIgnoreCase(connectorTypes[i])) {
-types.add(new LabelValueBean(connectorTypes[i],
+types.add(new LabelValueBean(schemeTypes[i],
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + connectorTypes[i]));
}
+ */
+
}
connectorFm.setConnectorTypeVals(types);
1.7 +85 -10
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.6
retrieving revision 1.7
diff -u
