manveen 02/04/03 15:35:36
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java EditConnectorAction.java
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java
Log:
Added implementation for addconnector.
"Add connector" operation brings up a pull down list of supported connector types.
Fields displayed depend on connector type.
Revision Changes Path
1.5 +34 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConnectorForm.java 3 Apr 2002 22:27:22 -0000 1.4
+++ ConnectorForm.java 3 Apr 2002 23:35:35 -0000 1.5
@@ -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.4 2002/04/03 22:27:22 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/03 22:27:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.5 2002/04/03 23:35:35 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/03 23:35:35 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/03 22:27:22 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/03 23:35:35 $
*/
public final class ConnectorForm extends ActionForm {
@@ -188,10 +188,14 @@
/*
* Represent boolean (true, false) values for enableLookups etc.
- */
-
+ */
private List booleanVals = null;
-
+
+ /*
+ * Represent supported connector types.
+ */
+ private List connectorTypeVals = null;
+
// ------------------------------------------------------------- Properties
/**
@@ -588,6 +592,24 @@
}
+ /**
+ * Return the connectorTypeVals.
+ */
+ public List getConnectorTypeVals() {
+
+ return this.connectorTypeVals;
+
+ }
+
+ /**
+ * Set the connectorTypeVals.
+ */
+ public void setConnectorTypeVals(List connectorTypeVals) {
+
+ this.connectorTypeVals = connectorTypeVals;
+
+ }
+
// --------------------------------------------------------- Public Methods
/**
@@ -675,9 +697,11 @@
} catch (Exception e) {
errors.add("proxyName", new
ActionError("error.proxyName.invalid"));
}
- }
- // FIXME - depends on Connector type
- // numberCheck("proxyPortText", proxyPortText, true, 0, 65535);
+ }
+
+ // not supported by all connector types
+ if ("CoyoteConnector".equalsIgnoreCase(connectorType))
+ numberCheck("proxyPortText", proxyPortText, true, 0, 65535);
}
return errors;
1.2 +5 -7
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditConnectorAction.java 3 Apr 2002 00:27:30 -0000 1.1
+++ EditConnectorAction.java 3 Apr 2002 23:35:35 -0000 1.2
@@ -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.1 2002/04/03 00:27:30 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/03 00:27:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.2 2002/04/03 23:35:35 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/03 23:35:35 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/03 00:27:30 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/03 23:35:35 $
*/
public class EditConnectorAction extends Action {
@@ -188,9 +188,7 @@
attribute = "scheme";
connectorFm.setScheme
- (connectorType + " (" +
- (String) mBServer.getAttribute(cname, attribute) +
- ")");
+ ((String) mBServer.getAttribute(cname, attribute));
attribute = "acceptCount";
connectorFm.setAcceptCountText
(((Integer) mBServer.getAttribute(cname, attribute)).toString());
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===================================================================
/*
* $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 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.webapp.admin.connector;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.Locale;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.LabelValueBean;
import org.apache.webapp.admin.Lists;
/**
* The <code>Action</code> that sets up <em>Add Connector</em> transactions.
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/04/03 23:35:35 $
*/
public class AddConnectorAction extends Action {
/**
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
// --------------------------------------------------------- Public Methods
/**
* Process the specified HTTP request, and create the corresponding HTTP
* response (or forward to another web component that will create it).
* Return an <code>ActionForward</code> instance describing where and how
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
// Acquire the resources that we need
HttpSession session = request.getSession();
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
if (resources == null) {
resources = getServlet().getResources();
}
// the service Name is needed to retrieve the engine mBean to
// which the new connector mBean will be added.
String serviceName = request.getParameter("serviceName");
// Fill in the form values for display and editing
ConnectorForm connectorFm = new ConnectorForm();
session.setAttribute("connectorForm", connectorFm);
connectorFm.setAdminAction("Create");
connectorFm.setObjectName("");
connectorFm.setConnectorName("");
String type = request.getParameter("type");
if (type == null)
type = "CoyoteConnector"; // default type is CoyoteConnector
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl("0");
connectorFm.setServiceName(serviceName);
connectorFm.setScheme("http");
connectorFm.setAcceptCountText("10");
connectorFm.setConnTimeOutText("60000");
connectorFm.setBufferSizeText("2048");
connectorFm.setEnableLookups("true");
connectorFm.setAddress("");
connectorFm.setPortText("");
connectorFm.setRedirectPortText("-1");
connectorFm.setMinProcessorsText("5");
connectorFm.setMaxProcessorsText("20");
// should be set only for Coyote, not supported by all connector types
if ("CoyoteConnector".equalsIgnoreCase(type)) {
connectorFm.setProxyName("");
connectorFm.setProxyPortText("0");
}
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
String connectorTypes[] = new String[2];
connectorTypes[0] = "CoyoteConnector";
connectorTypes[1] = "Ajp13Connector";
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++) {
if (!type.equalsIgnoreCase(connectorTypes[i])) {
types.add(new LabelValueBean(connectorTypes[i],
"/admin/AddConnector.do?serviceName=" +
URLEncoder.encode(serviceName)
+ "&type=" + connectorTypes[i]));
}
}
connectorFm.setConnectorTypeVals(types);
// Forward to the connector display page
return (mapping.findForward("Connector"));
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
