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 Changes Path
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 -0000 1.3
+++ AddConnectorAction.java 26 Apr 2002 07:04:14 -0000 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 <code>Action</code> that sets up <em>Add 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.java 25 Apr 2002 23:27:59 -0000 1.7
+++ ConnectorForm.java 26 Apr 2002 07:04:14 -0000 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);
}
return errors;
1.4 +19 -15
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Index: EditConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditConnectorAction.java 25 Apr 2002 23:27:59 -0000 1.3
+++ EditConnectorAction.java 26 Apr 2002 07:04:14 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.3 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/26 07:04:14 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
*/
public class EditConnectorAction extends Action {
@@ -173,6 +173,7 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+ String scheme = null;
String attribute = null;
try {
@@ -186,8 +187,8 @@
connectorFm.setConnectorType(connectorType);
attribute = "scheme";
- connectorFm.setScheme
- ((String) mBServer.getAttribute(cname, attribute));
+ scheme = (String) mBServer.getAttribute(cname, attribute);
+ connectorFm.setScheme(scheme);
attribute = "acceptCount";
connectorFm.setAcceptCountText
(((Integer) mBServer.getAttribute(cname, attribute)).toString());
@@ -223,15 +224,18 @@
connectorFm.setMaxProcessorsText
(((Integer) mBServer.getAttribute(cname, attribute)).toString());
- // Supported by Coyote and JK2 Connectors both.
- attribute = "proxyName";
- connectorFm.setProxyName
- ((String) mBServer.getAttribute(cname, attribute));
- attribute = "proxyPort";
- connectorFm.setProxyPortText
- (((Integer) mBServer.getAttribute(cname, attribute)).toString());
-
- if ("HTTPS".equalsIgnoreCase(connectorType)) {
+ // Supported by Coyote HTTP and HTTPS only
+ // FIX ME-- change this to use JK2 connector instead of Ajp13
+ if (!("Ajp13Connector".equalsIgnoreCase(connectorType))) {
+ attribute = "proxyName";
+ connectorFm.setProxyName
+ ((String) mBServer.getAttribute(cname, attribute));
+ attribute = "proxyPort";
+ connectorFm.setProxyPortText
+ (((Integer) mBServer.getAttribute(cname,
attribute)).toString());
+ }
+
+ if ("https".equalsIgnoreCase(scheme)) {
// Initialize rest of variables.
// These are set only for SSL connectors.
attribute = "clientAuth";
1.4 +27 -21
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveConnectorAction.java 25 Apr 2002 23:27:59 -0000 1.3
+++ SaveConnectorAction.java 26 Apr 2002 07:04:14 -0000 1.4
@@ -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.3 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/26 07:04:14 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
*/
public final class SaveConnectorAction extends Action {
@@ -203,10 +203,13 @@
values[1] = cform.getAddress();
values[2] = new Integer(cform.getPortText());
+ // FIX ME -- fix all create operations
if ("HTTP".equalsIgnoreCase(connectorType)) {
- operation = "createCoyoteConnector"; // HTTP
- } else {
- operation = "createJK2Connector"; // HTTPS
+ operation = "createHttp11Connector"; // HTTP
+ } else if ("HTTPS".equalsIgnoreCase(connectorType)) {
+ operation = "createCoyoteConnector"; // HTTPS
+ } else {
+ operation = "createAjp13Connector"; // HTTP (AJP)
}
cObjectName = (String)
@@ -334,21 +337,24 @@
mBServer.setAttribute(coname,
new Attribute("maxProcessors", new
Integer(maxProcessors)));
- // proxy name and port exist for both Coyote and JK2 Connectors.
- attribute = "proxyName";
- mBServer.setAttribute(coname,
- new Attribute("proxyName", cform.getProxyName()));
- attribute = "proxyPort";
- int proxyPort = 0;
- try {
- proxyPort = Integer.parseInt(cform.getProxyPortText());
- } catch (Throwable t) {
- proxyPort = 0;
- }
- mBServer.setAttribute(coname,
+ // proxy name and port exist only for Coyote Connectors.
+ // and not for AJP connector
+ if (!("HTTP(AJP)".equalsIgnoreCase(connectorType))) {
+ attribute = "proxyName";
+ mBServer.setAttribute(coname,
+ new Attribute("proxyName",
cform.getProxyName()));
+ attribute = "proxyPort";
+ int proxyPort = 0;
+ try {
+ proxyPort = Integer.parseInt(cform.getProxyPortText());
+ } catch (Throwable t) {
+ proxyPort = 0;
+ }
+ mBServer.setAttribute(coname,
new Attribute("proxyPort", new Integer(proxyPort)));
-
- // HTTPS (JK2 connector) specific properties
+ }
+
+ // HTTPS specific properties
if("HTTPS".equalsIgnoreCase(connectorType)) {
attribute = "clientAuth";
mBServer.setAttribute(coname,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
