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 ChangesPath
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.java26 Apr 2002 07:11:01 - 1.9
+++ ConnectorForm.java30 Apr 2002 21:38:20 - 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 - 1.4
+++ EditConnectorAction.java 30 Apr 2002 21:38:20 - 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 codeAction/code that sets up emEdit 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