manveen 02/04/30 14:38:20
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java EditConnectorAction.java
SaveConnectorAction.java
Log:
Integrating with new mBean create operations.
Revision Changes Path
1.10 +6 -6
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConnectorForm.java 26 Apr 2002 07:11:01 -0000 1.9
+++ ConnectorForm.java 30 Apr 2002 21:38:20 -0000 1.10
@@ -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.9 2002/04/26 07:11:01 manveen Exp $
- * $Revision: 1.9 $
- * $Date: 2002/04/26 07:11:01 $
+ * $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 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.9 $ $Date: 2002/04/26 07:11:01 $
+ * @version $Revision: 1.10 $ $Date: 2002/04/30 21:38:20 $
*/
public final class ConnectorForm extends ActionForm {
@@ -459,7 +459,7 @@
}
- /**
+ /**
* Return the object name of the service this connector belongs to.
*/
public String getKeyStoreFileName() {
@@ -777,7 +777,7 @@
}
/* supported only by Coyote HTTP/1.1 connectors */
- if (!("HTTP(AJP)".equalsIgnoreCase(connectorType)))
+ if (!("AJP".equalsIgnoreCase(connectorType)))
numberCheck("proxyPortText", proxyPortText, true, 0, 65535);
}
1.5 +22 -16
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditConnectorAction.java 26 Apr 2002 07:04:14 -0000 1.4
+++ EditConnectorAction.java 30 Apr 2002 21:38:20 -0000 1.5
@@ -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.4 2002/04/26 07:04:14 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 07:04:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.5 2002/04/30 21:38:20 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/30 21:38:20 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/30 21:38:20 $
*/
public class EditConnectorAction extends Action {
@@ -173,22 +173,29 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
- String scheme = null;
String attribute = null;
try {
// Copy scalar properties
// General properties
- attribute = "className";
- String className =
+ attribute = "scheme";
+ String scheme = (String) mBServer.getAttribute(cname, attribute);
+ connectorFm.setScheme(scheme);
+
+ attribute = "protocolHandlerClassName";
+ String handlerClassName =
(String) mBServer.getAttribute(cname, attribute);
- int period = className.lastIndexOf('.');
- String connectorType = className.substring(period + 1);
+ int period = handlerClassName.lastIndexOf('.');
+ String connType = handlerClassName.substring(period + 1);
+ String connectorType = "HTTPS";
+ if ("JkCoyoteHandler".equalsIgnoreCase(connType)) {
+ connectorType = "AJP";
+ } else if ("Http11Protocol".equalsIgnoreCase(connType) &&
+ ("http".equalsIgnoreCase(scheme))) {
+ connectorType = "HTTP";
+ }
connectorFm.setConnectorType(connectorType);
- attribute = "scheme";
- scheme = (String) mBServer.getAttribute(cname, attribute);
- connectorFm.setScheme(scheme);
attribute = "acceptCount";
connectorFm.setAcceptCountText
(((Integer) mBServer.getAttribute(cname, attribute)).toString());
@@ -224,9 +231,8 @@
connectorFm.setMaxProcessorsText
(((Integer) mBServer.getAttribute(cname, attribute)).toString());
- // Supported by Coyote HTTP and HTTPS only
- // FIX ME-- change this to use JK2 connector instead of Ajp13
- if (!("Ajp13Connector".equalsIgnoreCase(connectorType))) {
+ // Supported by HTTP and HTTPS only
+ if (!("AJP".equalsIgnoreCase(connectorType))) {
attribute = "proxyName";
connectorFm.setProxyName
((String) mBServer.getAttribute(cname, attribute));
@@ -235,7 +241,7 @@
(((Integer) mBServer.getAttribute(cname,
attribute)).toString());
}
- if ("https".equalsIgnoreCase(scheme)) {
+ if ("HTTPS".equalsIgnoreCase(connectorType)) {
// Initialize rest of variables.
// These are set only for SSL connectors.
attribute = "clientAuth";
1.7 +4 -6
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveConnectorAction.java 30 Apr 2002 18:10:47 -0000 1.6
+++ SaveConnectorAction.java 30 Apr 2002 21:38:20 -0000 1.7
@@ -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.6 2002/04/30 18:10:47 manveen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/04/30 18:10:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.7 2002/04/30 21:38:20 manveen Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/04/30 21:38:20 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.6 $ $Date: 2002/04/30 18:10:47 $
+ * @version $Revision: 1.7 $ $Date: 2002/04/30 21:38:20 $
*/
public final class SaveConnectorAction extends Action {
@@ -338,7 +338,6 @@
new Attribute("maxProcessors", new
Integer(maxProcessors)));
// proxy name and port do not exist for AJP connector
- /*
if (!("AJP".equalsIgnoreCase(connectorType))) {
attribute = "proxyName";
mBServer.setAttribute(coname,
@@ -353,7 +352,6 @@
mBServer.setAttribute(coname,
new Attribute("proxyPort", new Integer(proxyPort)));
}
- */
// HTTPS specific properties
if("HTTPS".equalsIgnoreCase(connectorType)) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
