Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java?rev=395417&r1=395416&r2=395417&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java (original) +++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java Wed Apr 19 15:47:14 2006 @@ -236,21 +236,21 @@ new Attribute(attribute, new Integer(debug))); attribute = "acceptCount"; - int acceptCount = 60000; + int acceptCount = 10; try { acceptCount = Integer.parseInt(cform.getAcceptCountText()); } catch (Throwable t) { - acceptCount = 60000; + acceptCount = 10; } mBServer.setAttribute(coname, new Attribute(attribute, new Integer(acceptCount))); attribute = "connectionTimeout"; - int connectionTimeout = 0; + int connectionTimeout = 60000; try { connectionTimeout = Integer.parseInt(cform.getConnTimeOutText()); } catch (Throwable t) { - connectionTimeout = 0; + connectionTimeout = 60000; } mBServer.setAttribute(coname, new Attribute(attribute, new Integer(connectionTimeout))); @@ -271,42 +271,52 @@ new Boolean(cform.getEnableLookups()))); attribute = "redirectPort"; - int redirectPort = 0; + int redirectPort = 443; try { redirectPort = Integer.parseInt(cform.getRedirectPortText()); } catch (Throwable t) { - redirectPort = 0; + redirectPort = 443; } mBServer.setAttribute(coname, new Attribute(attribute, new Integer(redirectPort))); attribute = "minProcessors"; - int minProcessors = 5; + int minProcessors = 4; try { minProcessors = Integer.parseInt(cform.getMinProcessorsText()); } catch (Throwable t) { - minProcessors = 5; + minProcessors = 4; } mBServer.setAttribute(coname, new Attribute(attribute, new Integer(minProcessors))); attribute = "maxProcessors"; - int maxProcessors = 20; + int maxProcessors = 200; try { maxProcessors = Integer.parseInt(cform.getMaxProcessorsText()); } catch (Throwable t) { - maxProcessors = 20; + maxProcessors = 200; } mBServer.setAttribute(coname, new Attribute(attribute, new Integer(maxProcessors))); + attribute = "maxSpareProcessors"; + int maxSpareProcessors = 50; + try { + maxSpareProcessors = + Integer.parseInt(cform.getMaxSpareProcessorsText()); + } catch (Throwable t) { + maxSpareProcessors = 50; + } + mBServer.setAttribute(coname, + new Attribute(attribute, new Integer(maxSpareProcessors))); + attribute = "URIEncoding"; String uriEnc = cform.getURIEncodingText(); if ((uriEnc != null) && (uriEnc.length()==0)) { uriEnc = null; } - mBServer.setAttribute(coname, - new Attribute(attribute, uriEnc)); + mBServer.setAttribute(coname, new Attribute(attribute, uriEnc)); attribute = "useBodyEncodingForURI"; mBServer.setAttribute(coname, @@ -318,8 +328,94 @@ new Attribute(attribute, new Boolean(cform.getAllowTraceText()))); - // proxy name and port do not exist for AJP connector - if (!("AJP".equalsIgnoreCase(connectorType))) { + attribute = "compressableMimeType"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getCompressableMimeType())); + + attribute = "compression"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getCompression())); + + attribute = "connectionLinger"; + int connectionLinger = -1; + try { + connectionLinger = Integer.parseInt(cform.getConnLingerText()); + } catch (Throwable t) { + connectionLinger = -1; + } + mBServer.setAttribute(coname, + new Attribute(attribute, new Integer(connectionLinger))); + + attribute = "disableUploadTimeout"; + mBServer.setAttribute(coname, + new Attribute(attribute, + new Boolean(cform.getDisableUploadTimeout()))); + + attribute = "maxHttpHeaderSize"; + int maxHttpHeaderSize = 4096; + try { + maxHttpHeaderSize = + Integer.parseInt(cform.getMaxHttpHeaderSizeText()); + } catch (Throwable t) { + maxHttpHeaderSize = 4096; + } + mBServer.setAttribute(coname, + new Attribute(attribute, new Integer(maxHttpHeaderSize))); + + attribute = "maxKeepAliveRequests"; + int maxKeepAliveRequests = 100; + try { + maxKeepAliveRequests = + Integer.parseInt(cform.getMaxKeepAliveReqsText()); + } catch (Throwable t) { + maxKeepAliveRequests = 100; + } + mBServer.setAttribute(coname, + new Attribute(attribute, new Integer(maxKeepAliveRequests))); + + attribute = "noCompressionUserAgents"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getNoCompressionUA())); + + attribute = "restrictedUserAgents"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getRestrictedUA())); + + attribute = "server"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getServer())); + + attribute = "socketBuffer"; + int socketBuffer = 9000; + try { + socketBuffer = Integer.parseInt(cform.getSocketBufferText()); + } catch (Throwable t) { + socketBuffer = 9000; + } + mBServer.setAttribute(coname, + new Attribute(attribute, new Integer(socketBuffer))); + + attribute = "strategy"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getStrategy())); + + attribute = "tcpNoDelay"; + mBServer.setAttribute(coname, + new Attribute(attribute, + new Boolean(cform.getTcpNoDelay()))); + + attribute = "threadPriority"; + mBServer.setAttribute(coname, + new Attribute(attribute, cform.getThreadPriorityText())); + + if (("AJP".equalsIgnoreCase(connectorType))) { + // tomcatAuthentication exists only for AJP connector + attribute = "tomcatAuthentication"; + mBServer.setAttribute(coname, + new Attribute(attribute, + new Boolean(cform.getTomcatAuthentication()))); + } else { + // proxy name and port do not exist for AJP connector attribute = "proxyName"; String proxyName = cform.getProxyName(); if ((proxyName != null) && (proxyName.length()>0)) { @@ -338,6 +434,11 @@ new Attribute(attribute, new Integer(proxyPort))); } + // Secure + attribute = "secure"; + mBServer.setAttribute(coname, + new Attribute(attribute, new Boolean(cform.getSecure()))); + // HTTPS specific properties if("HTTPS".equalsIgnoreCase(connectorType)) { attribute = "clientAuth"; @@ -357,7 +458,32 @@ mBServer.setAttribute(coname, new Attribute(attribute, keyPass)); // request.setAttribute("warning", "connector.keyPass.warning"); - } + + attribute = "algorithm"; + String algorithm = cform.getAlgorithm(); + if ((algorithm != null) && (algorithm.length()>0)) + mBServer.setAttribute(coname, + new Attribute(attribute, algorithm)); + + attribute = "ciphers"; + String ciphers = cform.getCiphers(); + if ((ciphers != null) && (ciphers.length()>0)) + mBServer.setAttribute(coname, + new Attribute(attribute, ciphers)); + + attribute = "keystoreType"; + String keystoreType = cform.getKeyStoreType(); + if ((keystoreType != null) && (keystoreType.length()>0)) + mBServer.setAttribute(coname, + new Attribute(attribute, keystoreType)); + + attribute = "sslProtocol"; + String sslProtocol = cform.getSslProtocol(); + if ((sslProtocol != null) && (sslProtocol.length()>0)) + mBServer.setAttribute(coname, + new Attribute(attribute, sslProtocol)); + + } } catch (Exception e) { @@ -370,6 +496,7 @@ attribute)); return (null); } + // Forward to the success reporting page session.removeAttribute(mapping.getAttribute()); return (mapping.findForward("Save Successful"));
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/connector/connector.jsp URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/connector/connector.jsp?rev=395417&r1=395416&r2=395417&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/webapps/admin/connector/connector.jsp (original) +++ tomcat/container/branches/tc4.1.x/webapps/admin/connector/connector.jsp Wed Apr 19 15:47:14 2006 @@ -86,15 +86,37 @@ </controls:data> </controls:row> - <%-- do not show scheme while creating a new connector --%> - <logic:notEqual name="connectorForm" property="adminAction" value="Create"> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> - <controls:label><bean:message key="connector.scheme"/>:</controls:label> + <%-- do not show scheme while creating a new connector --%> + <logic:notEqual name="connectorForm" property="adminAction" value="Create"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> + <controls:label><bean:message key="connector.scheme"/>:</controls:label> + <controls:data> + <bean:write name="connectorForm" property="scheme" scope="session"/> + </controls:data> + </controls:row> + </logic:notEqual> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="enableDNS"> + <controls:label><bean:message key="connector.enable.dns"/>:</controls:label> + <controls:data> + <html:select property="enableLookups" styleId="enableDNS"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="secure"> + <controls:label><bean:message key="connector.secure"/>:</controls:label> <controls:data> - <bean:write name="connectorForm" property="scheme" scope="session"/> + <html:select property="secure" styleId="secure"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> </controls:data> </controls:row> - </logic:notEqual> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="acceptCount"> <controls:label><bean:message key="connector.accept.count"/>:</controls:label> @@ -103,14 +125,54 @@ </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="timeout"> - <controls:label><bean:message key="connector.connection.timeout"/><br> - (<bean:message key="connector.milliseconds"/>) :</controls:label> + <%-- Input only allowed on create transaction --%> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="address"> + <controls:label><bean:message key="connector.address.ip"/>:</controls:label> <controls:data> - <html:text property="connTimeOutText" size="10" styleId="timeout"/> + <logic:equal name="connectorForm" property="adminAction" value="Create"> + <html:text property="address" size="20" styleId="address"/> + </logic:equal> + <logic:equal name="connectorForm" property="adminAction" value="Edit"> + <bean:write name="connectorForm" property="address"/> + <html:hidden property="address"/> + </logic:equal> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="allowTrace"> + <controls:label><bean:message key="connector.allowTrace"/>:</controls:label> + <controls:data> + <html:select property="allowTraceText" styleId="allowTrace"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> </controls:data> </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="buffersize"> + <controls:label><bean:message key="connector.default.buffer"/>:</controls:label> + <controls:data> + <html:text property="bufferSizeText" size="5" styleId="buffersize"/> + </controls:data> + </controls:row> + + <logic:notEqual name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="compression"> + <controls:label><bean:message key="connector.compression"/>:</controls:label> + <controls:data> + <html:text property="compression" size="10" styleId="compression"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="compressableMimeType"> + <controls:label><bean:message key="connector.compressableMimeType"/>:</controls:label> + <controls:data> + <html:text property="compressableMimeType" size="30" styleId="compressableMimeType"/> + </controls:data> + </controls:row> + </logic:notEqual> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel"> <controls:label><bean:message key="server.debuglevel"/>:</controls:label> <controls:data> @@ -122,17 +184,80 @@ </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="buffersize"> - <controls:label><bean:message key="connector.default.buffer"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="timeout"> + <controls:label><bean:message key="connector.connection.timeout"/><br> + (<bean:message key="connector.milliseconds"/>) :</controls:label> <controls:data> - <html:text property="bufferSizeText" size="5" styleId="buffersize"/> + <html:text property="connTimeOutText" size="10" styleId="timeout"/> </controls:data> - </controls:row> + </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="enableDNS"> - <controls:label><bean:message key="connector.enable.dns"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="linger"> + <controls:label><bean:message key="connector.connection.linger"/><br> + (<bean:message key="connector.milliseconds"/>) :</controls:label> <controls:data> - <html:select property="enableLookups" styleId="enableDNS"> + <html:text property="connLingerText" size="10" styleId="linger"/> + </controls:data> + </controls:row> + + <logic:notEqual name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="disableUploadTimeout"> + <controls:label><bean:message key="connector.disableUploadTimeout"/>:</controls:label> + <controls:data> + <html:select property="disableUploadTimeout" styleId="disableUploadTimeout"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> + </controls:data> + </controls:row> + </logic:notEqual> + + <logic:notEqual name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxHttpHeaderSize"> + <controls:label><bean:message key="connector.maxHttpHeaderSize"/>:</controls:label> + <controls:data> + <html:text property="maxHttpHeaderSizeText" size="10" styleId="linger"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxKeepAliveRequests"> + <controls:label><bean:message key="connector.maxKeepAliveRequests"/>:</controls:label> + <controls:data> + <html:text property="maxKeepAliveReqsText" size="10" styleId="linger"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="restrictedUA"> + <controls:label><bean:message key="connector.restrictedUA"/>:</controls:label> + <controls:data> + <html:text property="restrictedUA" size="30" styleId="restrictedUA"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="noCompressionUA"> + <controls:label><bean:message key="connector.noCompressionUA"/>:</controls:label> + <controls:data> + <html:text property="noCompressionUA" size="30" styleId="noCompressionUA"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="server"> + <controls:label><bean:message key="connector.server"/>:</controls:label> + <controls:data> + <html:text property="server" size="30" styleId="server"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="socketBuffer"> + <controls:label><bean:message key="connector.socketBuffer"/>:</controls:label> + <controls:data> + <html:text property="socketBufferText" size="10" styleId="socketBuffer"/> + </controls:data> + </controls:row> + </logic:notEqual> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="tcpNoDelay"> + <controls:label><bean:message key="connector.tcpNoDelay"/>:</controls:label> + <controls:data> + <html:select property="tcpNoDelay" styleId="tcpNoDelay"> <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> <html:options collection="booleanVals" property="value" labelProperty="label"/> @@ -140,6 +265,20 @@ </controls:data> </controls:row> + <logic:equal name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="tomcatAuthentication"> + <controls:label><bean:message key="connector.tomcatAuthentication"/>:</controls:label> + <controls:data> + <html:select property="tomcatAuthentication" styleId="tomcatAuthentication"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> + </controls:data> + </controls:row> + </logic:equal> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="uriencoding"> <controls:label><bean:message key="connector.uriencoding"/>:</controls:label> <controls:data> @@ -158,31 +297,6 @@ </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="allowTrace"> - <controls:label><bean:message key="connector.allowTrace"/>:</controls:label> - <controls:data> - <html:select property="allowTraceText" styleId="allowTrace"> - <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> - <html:options collection="booleanVals" property="value" - labelProperty="label"/> - </html:select> - </controls:data> - </controls:row> - - <%-- Input only allowed on create transaction --%> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="address"> - <controls:label><bean:message key="connector.address.ip"/>:</controls:label> - <controls:data> - <logic:equal name="connectorForm" property="adminAction" value="Create"> - <html:text property="address" size="20" styleId="address"/> - </logic:equal> - <logic:equal name="connectorForm" property="adminAction" value="Edit"> - <bean:write name="connectorForm" property="address"/> - <html:hidden property="address"/> - </logic:equal> - </controls:data> - </controls:row> - <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> <controls:label>Ports</controls:label> <controls:data> </controls:data> @@ -228,86 +342,147 @@ </controls:data> </controls:row> -<%-- The following properties are supported only for Coyote HTTP/S 1.1 Connectors --%> - <logic:notEqual name="connectorForm" property="connectorType" scope="session" - value="AJP"> - <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> - <controls:label>Proxy</controls:label> - <controls:data> </controls:data> - </controls:row> - - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="proxyName"> - <controls:label><bean:message key="connector.proxy.name"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxSpareProcessors"> + <controls:label><bean:message key="connector.maxSpare"/>:</controls:label> <controls:data> - <html:text property="proxyName" size="30" styleId="proxyName"/> + <html:text property="maxSpareProcessorsText" size="5" styleId="maxSpareProcessors"/> </controls:data> </controls:row> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="portNumber"> - <controls:label><bean:message key="connector.proxy.portnumber"/>:</controls:label> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="threadPriority"> + <controls:label><bean:message key="connector.threadPriority"/>:</controls:label> <controls:data> - <html:text property="proxyPortText" size="5" styleId="portNumber"/> - </controls:data> - </controls:row> - </logic:notEqual> - -<%-- The following properties are supported only on HTTPS Connector --%> - <logic:equal name="connectorForm" property="scheme" scope="session" - value="https"> - <br> - <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> - <controls:label>Factory Properties:</controls:label> - <controls:data> </controls:data> - </controls:row> - - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="clientauth"> - <controls:label><bean:message key="connector.client.auth"/>:</controls:label> - <controls:data> - <html:select property="clientAuthentication" styleId="clientauth"> - <bean:define id="clientAuthVals" name="connectorForm" property="clientAuthVals"/> - <html:options collection="clientAuthVals" property="value" + <html:select property="threadPriorityText" styleId="threadPriority"> + <bean:define id="threadPriorityVals" name="connectorForm" property="threadPriorityVals"/> + <html:options collection="threadPriorityVals" property="value" labelProperty="label"/> </html:select> </controls:data> </controls:row> - <%-- Input allowed only on create --%> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="keystore"> - <controls:label><bean:message key="connector.keystore.filename"/>:</controls:label> - <controls:data> - <logic:equal name="connectorForm" property="adminAction" value="Create"> - <html:text property="keyStoreFileName" size="30" styleId="keystore"/> - </logic:equal> - <logic:equal name="connectorForm" property="adminAction" value="Edit"> - <bean:write name="connectorForm" property="keyStoreFileName"/> - </logic:equal> - </controls:data> - </controls:row> + <logic:notEqual name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="strategy"> + <controls:label><bean:message key="connector.strategy"/>:</controls:label> + <controls:data> + <html:text property="strategy" size="5" styleId="strategy"/> + </controls:data> + </controls:row> + </logic:notEqual> - <%-- input password allowed only while creating connector --%> - <logic:equal name="connectorForm" property="adminAction" value="Create"> - <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="password"> - <controls:label><bean:message key="connector.keystore.password"/>:</controls:label> - <controls:data> - <html:password property="keyStorePassword" size="30" styleId="password"/> - <%-- - <logic:equal name="connectorForm" property="adminAction" value="Edit"> - <bean:write name="connectorForm" property="keyStorePassword"/> - </logic:equal> - --%> - </controls:data> - </controls:row> - </logic:equal> - - </logic:equal> - </controls:table> - - </td> - </tr> - </table> - <%@ include file="../buttons.jsp" %> - <br> - </html:form> -<p> </p> + <%-- The following properties are supported only for Coyote HTTP/S 1.1 Connectors --%> + <logic:notEqual name="connectorForm" property="connectorType" scope="session" + value="AJP"> + <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> + <controls:label>Proxy</controls:label> + <controls:data> </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="proxyName"> + <controls:label><bean:message key="connector.proxy.name"/>:</controls:label> + <controls:data> + <html:text property="proxyName" size="30" styleId="proxyName"/> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="portNumber"> + <controls:label><bean:message key="connector.proxy.portnumber"/>:</controls:label> + <controls:data> + <html:text property="proxyPortText" size="5" styleId="portNumber"/> + </controls:data> + </controls:row> + </logic:notEqual> + + <%-- The following properties are supported only on HTTPS Connector --%> + <logic:equal name="connectorForm" property="scheme" scope="session" + value="https"> + <br> + <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> + <controls:label>SSL Properties:</controls:label> + <controls:data> </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="algorithm"> + <controls:label><bean:message key="connector.cert.algorithm"/>:</controls:label> + <controls:data> + <html:text property="algorithm" size="5" styleId="algorithm"/> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="clientauth"> + <controls:label><bean:message key="connector.client.auth"/>:</controls:label> + <controls:data> + <html:select property="clientAuthentication" styleId="clientauth"> + <bean:define id="clientAuthVals" name="connectorForm" property="clientAuthVals"/> + <html:options collection="clientAuthVals" property="value" + labelProperty="label"/> + </html:select> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="ciphers"> + <controls:label><bean:message key="connector.ciphers"/>:</controls:label> + <controls:data> + <html:text property="ciphers" size="5" styleId="ciphers"/> + </controls:data> + </controls:row> + + <%-- Input allowed only on create --%> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="keystore"> + <controls:label><bean:message key="connector.keystore.filename"/>:</controls:label> + <controls:data> + <logic:equal name="connectorForm" property="adminAction" value="Create"> + <html:text property="keyStoreFileName" size="30" styleId="keystore"/> + </logic:equal> + <logic:equal name="connectorForm" property="adminAction" value="Edit"> + <bean:write name="connectorForm" property="keyStoreFileName"/> + </logic:equal> + </controls:data> + </controls:row> + + <%-- input password allowed only while creating connector --%> + <logic:equal name="connectorForm" property="adminAction" value="Create"> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="password"> + <controls:label><bean:message key="connector.keystore.password"/>:</controls:label> + <controls:data> + <html:password property="keyStorePassword" size="30" styleId="password"/> + <%-- + <logic:equal name="connectorForm" property="adminAction" value="Edit"> + <bean:write name="connectorForm" property="keyStorePassword"/> + </logic:equal> + --%> + </controls:data> + </controls:row> + </logic:equal> + + <%-- Input allowed only on create --%> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="keystoreType"> + <controls:label><bean:message key="connector.keystore.type"/>:</controls:label> + <controls:data> + <logic:equal name="connectorForm" property="adminAction" value="Create"> + <html:text property="keyStoreType" size="30" styleId="keystoreType"/> + </logic:equal> + <logic:equal name="connectorForm" property="adminAction" value="Edit"> + <bean:write name="connectorForm" property="keyStoreType"/> + </logic:equal> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="sslProtocol"> + <controls:label><bean:message key="connector.sslProtocol"/>:</controls:label> + <controls:data> + <html:text property="sslProtocol" size="5" styleId="sslProtocol"/> + </controls:data> + </controls:row> + + </logic:equal> + </controls:table> + </td> + </tr> + </table> + <%@ include file="../buttons.jsp" %> + <br> + </html:form> + <p> </p> </body> </html:html> Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyote.xml URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyote.xml?rev=395417&r1=395416&r2=395417&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyote.xml (original) +++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyote.xml Wed Apr 19 15:47:14 2006 @@ -61,11 +61,6 @@ You must specify the standard value defined below.</p> </attribute> - <attribute name="allowTrace" required="false"> - <p>A boolean value which can be used to enable or disable the TRACE - HTTP method. If not specified, this attribute is set to false.</p> - </attribute> - <attribute name="enableLookups" required="false"> <p>Set to <code>true</code> if you want calls to <code>request.getRemoteHost()</code> to perform DNS lookups in @@ -80,7 +75,7 @@ requests, and a request is received for which a matching <code><security-constraint></code> requires SSL transport, Catalina will automatically redirect the request to the port - number specified here.</p> + number specified here. The default value is 443.</p> </attribute> <attribute name="scheme" required="false"> @@ -98,20 +93,6 @@ SSL Connector). The default value is <code>false</code>.</p> </attribute> - <attribute name="URIEncoding" required="false"> - <p>This specifies the character encoding used to decode the URI bytes, - after %xx decoding the URL. If not specified, ISO-8859-1 will be used. - </p> - </attribute> - - <attribute name="useBodyEncodingForURI" required="false"> - <p>This specifies if the encoding specified in contentType should be used - for URI query parameters, instead of using the URIEncoding. This - setting is present for compatibility with Tomcat 4.1.27 and earlier. - The default value is <code>true</code>. - </p> - </attribute> - </attributes> </subsection> @@ -136,10 +117,15 @@ <attribute name="address" required="false"> <p>For servers with more than one IP address, this attribute specifies which address will be used for listening on the specified - port. By default, this port will be used on all IP addresses + port. By default, specified port will be used on all IP addresses associated with the server.</p> </attribute> + <attribute name="allowTrace" required="false"> + <p>A boolean value which can be used to enable or disable the TRACE + HTTP method. If not specified, this attribute is set to false.</p> + </attribute> + <attribute name="bufferSize" required="false"> <p>The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of @@ -208,21 +194,29 @@ <attribute name="maxSpareProcessors" required="false"> <p>The maximum number of unused request processing threads that will be allowed to exist until the thread pool starts stopping the - unnecessary threads. The default value is 5.</p> + unnecessary threads. The default value is 50.</p> </attribute> <attribute name="maxProcessors" required="false"> <p>The maximum number of request processing threads to be created by this <strong>Connector</strong>, which therefore determines the maximum number of simultaneous requests that can be handled. If - not specified, this attribute is set to 20.</p> + not specified, this attribute is set to 200.</p> </attribute> <attribute name="minProcessors" required="false"> <p>The number of request processing threads that will be created when this <strong>Connector</strong> is first started. This attribute should be set to a value smaller than that set for - <code>maxProcessors</code>. The default value is 5.</p> + <code>maxProcessors</code>. The default value is 4.</p> + </attribute> + + <attribute name="noCompressionUserAgents" required="false"> + <p>The value is a comma separated list of regular expressions matching + user-agents of HTTP clients for which compression should not be used, + because these clients, although they do advertise support for the + feature, have a broken implementation. + The default value is an empty String (regexp matching disabled).</p> </attribute> <attribute name="port" required="true"> @@ -232,6 +226,12 @@ to a particular port number on a particular IP address.</p> </attribute> + <attribute name="protocolHandlerClassName" required="false"> + <p>This attribute defaults to + <code>org.apache.coyote.http11.Http11Protocol</code> for the Coyote + HTTP/1.1 handler.</p> + </attribute> + <attribute name="proxyName" required="false"> <p>If this <strong>Connector</strong> is being used in a proxy configuration, configure this attribute to specify the server name @@ -248,12 +248,64 @@ information.</p> </attribute> + <attribute name="restrictedUserAgents" required="false"> + <p>The value is a comma separated list of regular expressions matching + user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive + should not be used, even if the clients advertise support for these + features. + The default value is an empty String (regexp matching disabled).</p> + </attribute> + + <attribute name="server" required="false"> + <p>The Server header for the http response. + Unless your paranoid, you won't need this feature. + </p> + </attribute> + + <attribute name="socketBuffer" required="false"> + <p>The size (in bytes) of the buffer to be provided for socket + output buffering. -1 can be specified to disable the use of a buffer. + By default, a buffers of 9000 bytes will be used.</p> + </attribute> + + <attribute name="strategy" required="false"> + <p>The thread pooling strategy which will be used. The default strategy does + not use a master thread, but a more conventional strategy using a + master listener thread can be used by setting "ms" as this attribute's value. + The master strategy will work significantly better using the threadPriority + attribute, which will apply only to the thread which listens on the server socket. + This is set to <code>lf</code> by default. + </p> + </attribute> + <attribute name="tcpNoDelay" required="false"> <p>If set to <code>true</code>, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances. This is set to <code>true</code> by default.</p> </attribute> + <attribute name="threadPriority" required="false"> + <p>The priority of the request processing threads within the JVM. + The default value is <code>java.lang.Thread#NORM_PRIORITY</code>. + See the JavaDoc for the java.lang.Thread class for more details on + what this priority means. + </p> + </attribute> + + <attribute name="URIEncoding" required="false"> + <p>This specifies the character encoding used to decode the URI bytes, + after %xx decoding the URL. If not specified, ISO-8859-1 will be used. + </p> + </attribute> + + <attribute name="useBodyEncodingForURI" required="false"> + <p>This specifies if the encoding specified in contentType should be used + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.27 and earlier. + The default value is <code>true</code>. + </p> + </attribute> + </attributes> </subsection> @@ -326,9 +378,10 @@ <subsection name="SSL Support"> <p>You can enable SSL support for a particular instance of this - <strong>Connector</strong> by nesting an appropriate - <code><Factory></code> element inside, to set up the required - SSL socket factory. This element supports the following attributes:</p> + <strong>Connector</strong> by setting the <code>secure</code> attribute to + <code>true</code>. Use of a nested <code><Factory></code> element + is deprecated. The attributes should now be set directly on the connector. + The attributes available to configure SSL support are:</p> <attributes> @@ -337,11 +390,10 @@ specified, the default value is <code>SunX509</code>.</p> </attribute> - <attribute name="className" required="true"> - <p>The fully qualified class name of the SSL server socket - factory implementation class. You must specify - <code>org.apache.coyote.tomcat4.CoyoteServerSocketFactory</code> here. - </p> + <attribute name="ciphers" required="false"> + <p>A comma seperated list of the encryption ciphers that may be used. + If not specified, then any available cipher may be used. The ciphers + are specified using the JSSE cipher naming convention.</p> </attribute> <attribute name="clientAuth" required="false"> @@ -371,7 +423,7 @@ If not specified, the default value is "<code>JKS</code>".</p> </attribute> - <attribute name="protocol" required="false"> + <attribute name="sslProtocol" required="false"> <p>The version of the SSL protocol to use. If not specified, the default is "<code>TLS</code>".</p> </attribute> Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyotejk.xml URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyotejk.xml?rev=395417&r1=395416&r2=395417&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyotejk.xml (original) +++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/config/coyotejk.xml Wed Apr 19 15:47:14 2006 @@ -51,11 +51,6 @@ You must specify the standard value defined below.</p> </attribute> - <attribute name="allowTrace" required="false"> - <p>A boolean value which can be used to enable or disable the TRACE - HTTP method. If not specified, this attribute is set to false.</p> - </attribute> - <attribute name="enableLookups" required="false"> <p>Set to <code>true</code> if you want calls to <code>request.getRemoteHost()</code> to perform DNS lookups in @@ -87,20 +82,6 @@ SSL Connector). The default value is <code>false</code>.</p> </attribute> - <attribute name="URIEncoding" required="false"> - <p>This specifies the character encoding used to decode the URI bytes, - after %xx decoding the URL. If not specified, ISO-8859-1 will be used. - </p> - </attribute> - - <attribute name="useBodyEncodingForURI" required="false"> - <p>This specifies if the encoding specified in contentType should be used - for URI query parameters, instead of using the URIEncoding. This - setting is present for compatibility with Tomcat 4.1.27 and earlier. - The default value is <code>true</code>. - </p> - </attribute> - </attributes> </subsection> @@ -125,6 +106,29 @@ value is 10.</p> </attribute> + <attribute name="allowTrace" required="false"> + <p>A boolean value which can be used to enable or disable the TRACE + HTTP method. If not specified, this attribute is set to false.</p> + </attribute> + + <attribute name="bufferSize" required="false"> + <p>The size of the output buffer to use. If less than or equal to zero, + then output buffering is disabled. The default value is -1 + (i.e. buffering disabled)</p> + </attribute> + + <attribute name="connectionLinger" required="false"> + <p>The number of milliseconds during which the sockets used by this + <strong>Connector</strong> will linger when they are closed. + The default value is -1 (socket linger is disabled).</p> + </attribute> + + <attribute name="connectionTimeout" required="false"> + <p>The number of milliseconds this <strong>Connector</strong> will wait, + after accepting a connection, for the request URI line to be + presented. The default value is 60000 (i.e. 60 seconds).</p> + </attribute> + <attribute name="debug" required="false"> <p>The debugging detail level of log messages generated by this component, with higher numbers creating more detailed output. @@ -156,6 +160,27 @@ <p>This attribute value must be <code>org.apache.jk.server.JkCoyoteHandler</code> to use the JK handler.</p> + </attribute> + + <attribute name="tomcatAuthentication" required="false"> + <p>If set to <code>true</code>, the authetication will be done in Tomcat. + Otherwise, the authenticated principal will be propagated from the native + webaserver and used for authorization in Tomcat. + The default value is <code>true</code>.</p> + </attribute> + + <attribute name="URIEncoding" required="false"> + <p>This specifies the character encoding used to decode the URI bytes, + after %xx decoding the URL. If not specified, ISO-8859-1 will be used. + </p> + </attribute> + + <attribute name="useBodyEncodingForURI" required="false"> + <p>This specifies if the encoding specified in contentType should be used + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.27 and earlier. + The default value is <code>true</code>. + </p> </attribute> </attributes> Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/ssl-howto.xml URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/ssl-howto.xml?rev=395417&r1=395416&r2=395417&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/ssl-howto.xml (original) +++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/ssl-howto.xml Wed Apr 19 15:47:14 2006 @@ -275,9 +275,8 @@ <Connector className="org.apache.catalina.connector.http.HttpConnector" port="8443" minProcessors="5" maxProcessors="75" enableLookups="true" - acceptCount="10" debug="0" scheme="https" secure="true"> - <Factory className="org.apache.catalina.net.SSLServerSocketFactory" - clientAuth="false" protocol="TLS"/> + acceptCount="10" debug="0" scheme="https" secure="true" + clientAuth="false" protocol="TLS" </Connector> --> </source> @@ -305,11 +304,8 @@ that SSL is required, as required by the Servlet 2.3 Specification.</p> </em></blockquote> -<p>You will notice a <code>Factory</code> element nested inside the -<code>Connector</code> element. This is where the "socket factory" used -by Tomcat, whenever it needs a socket on the corresponding port number, -is configured. You may need to add or change the following attribute -values, depending on how you configured your keystore earlier:</p> +<p>You may need to add or change the following attribute values, depending +on how you configured your keystore earlier:</p> <table border="1"> <tr> @@ -317,9 +313,15 @@ <th>Description</th> </tr> <tr> - <td><code>className</code></td> - <td>The fully qualified class name of the Java class that implements - this socket factory. Do not change the default value.</td> + <td><code>algorithm</code></td> + <td>The certificate encoding algorithm to be used. If not specified, the + default value is SunX509.</td> + </tr> + <tr> + <td><code>ciphers</code></td> + <td>A comma seperated list of the encryption ciphers that may be used. + If not specified, then any available cipher may be used. The ciphers + are specified using the JSSE cipher naming convention.</td> </tr> <tr> <td><code>clientAuth</code></td> @@ -344,9 +346,14 @@ password than the one Tomcat expects (<code>changeit</code>).</td> </tr> <tr> - <td><code>protocol</code></td> - <td>The encryption/decryption protocol to be used on this socket. - Do not change the default value.</td> + <td><code>keystoreFile</code></td> + <td>The type of keystore file to be used for the server certificate. If + not specified, the default value is "JKS".</td> + </tr> + <tr> + <td><code>sslProtocol</code></td> + <td>The version of the SSL protocol to use. If not specified, the + default is "TLS".</td> </tr> </table> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
