amyroh 2003/08/25 15:16:39 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java webapps/admin/connector connector.jsp Log: Update admin with the latest connector changes. Revision Changes Path 1.16 +12 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ApplicationResources_en.properties 24 Aug 2003 22:52:45 -0000 1.15 +++ ApplicationResources_en.properties 25 Aug 2003 22:16:38 -0000 1.16 @@ -114,20 +114,32 @@ connector.type=Type connector.scheme=Scheme connector.accept.count=Accept Count +connector.compression=Compression +connector.connection.linger=Connection Linger connector.connection.timeout=Connection Timeout +connector.connection.uploadTimeout=Connection Upload Timeout connector.default.buffer=Default Buffer Size +connector.connection.disableUploadTimeout=Disable Upload Timeout connector.enable.dns=Enable DNS Lookups connector.address.ip=IP Address connector.redirect.portnumber=Redirect Port Number connector.min=Minimum connector.milliseconds=milliseconds connector.max=Maximum +connector.maxkeepalive=Max KeepAlive Requests connector.proxy.name=Proxy Name connector.proxy.portnumber=Proxy Port Number +connector.algorithm=Algorithm +connector.ciphers=Ciphers connector.client.auth=Client Authentication connector.keystore.filename=Keystore Filename connector.keystore.password=Keystore Password +connector.keystore.type=Keystore Type +connector.sslProtocol=SSL Protocol connector.keyPass.warning=<li>Please use keytool to generate certificate.</li> +connector.secure=Secure +connector.tcpNoDelay=TCP No Delay +connector.xpoweredby=X Powered By host.properties=Host Properties host.name=Name host.base=Application Base 1.15 +12 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApplicationResources_es.properties 24 Aug 2003 22:52:45 -0000 1.14 +++ ApplicationResources_es.properties 25 Aug 2003 22:16:38 -0000 1.15 @@ -114,20 +114,32 @@ connector.type=Tipo connector.scheme=Esquema connector.accept.count=Accept Count +connector.compression=Compresión +connector.connection.linger=La Conexión Se rezaga connector.connection.timeout=Tiempo De Espera De La Conexi\u00f3n +connector.connection.uploadTimeout=Descanso Del Upload De la Conexión connector.default.buffer=Tama\u00f1o por defecto del "Buffer" +connector.connection.disableUploadTimeout=Inhabilite El Descanso Del Upload connector.enable.dns=Permitir Busquedas en el DNS connector.address.ip=Direcci\u00f3n IP connector.redirect.portnumber=N\u00fmero del puerto de redireccionamiento connector.min=M\u00ednimo connector.milliseconds=milisegundos connector.max=M\u00e1ximo +connector.maxkeepalive=Peticiones Máximas De KeepAlive connector.proxy.name=Nombre del Proxy connector.proxy.portnumber=N\u00fmero de Puerto del Proxy +connector.algorithm=Algoritmo +connector.ciphers=Cifras connector.client.auth=Client Authentication connector.keystore.filename=Keystore Filename connector.keystore.password=Keystore Password +connector.keystore.type=Keystore Type +connector.sslProtocol=SSL Protocol connector.keyPass.warning=<li>Utilice por favor el keytool para generar el certificado</li> +connector.secure=seguro +connector.tcpNoDelay=TCP No Delay +connector.xpoweredby=X Powered By host.properties=Propiedades del ordenador principal host.name=Nombre host.base=Base De la Aplicacion 1.4 +16 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java Index: AddConnectorAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/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 21 Mar 2003 08:19:13 -0000 1.3 +++ AddConnectorAction.java 25 Aug 2003 22:16:38 -0000 1.4 @@ -145,19 +145,31 @@ connectorFm.setScheme("http"); } connectorFm.setAcceptCountText("10"); + connectorFm.setCompression("off"); + connectorFm.setConnLingerText("-1"); connectorFm.setConnTimeOutText("60000"); + connectorFm.setConnUploadTimeOutText("300000"); connectorFm.setBufferSizeText("2048"); + connectorFm.setDisableUploadTimeout("false"); connectorFm.setEnableLookups("true"); connectorFm.setAddress(""); connectorFm.setPortText(""); connectorFm.setRedirectPortText("-1"); connectorFm.setMinProcessorsText("5"); connectorFm.setMaxProcessorsText("20"); + connectorFm.setMaxKeepAliveText("100"); + connectorFm.setSecure("false"); + connectorFm.setTcpNoDelay("true"); + connectorFm.setXpoweredBy("false"); //supported only by HTTPS + connectorFm.setAlgorithm("SunX509"); connectorFm.setClientAuthentication("false"); + connectorFm.setCiphers(""); connectorFm.setKeyStoreFileName(""); connectorFm.setKeyStorePassword(""); + connectorFm.setKeyStoreType("JKS"); + connectorFm.setSslProtocol("TLS"); // supported only by Coyote connectors connectorFm.setProxyName(""); 1.4 +296 -9 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java Index: ConnectorForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ConnectorForm.java 25 Mar 2003 08:29:04 -0000 1.3 +++ ConnectorForm.java 25 Aug 2003 22:16:38 -0000 1.4 @@ -112,17 +112,35 @@ */ private String nodeLabel = null; - /** * The text for the accept Count. */ private String acceptCountText = null; /** + * The text for the algorithm. + */ + private String algorithm = null; + + /** + * The text for the ciphers. + */ + private String ciphers = null; + + /** + * The text for the Connection Linger. + */ + private String connLingerText = null; + + /** * The text for the Connection Time Out. */ private String connTimeOutText = null; + /** + * The text for the Connection Upload Time Out. + */ + private String connUploadTimeOutText = null; /** * The text for the debug level. @@ -135,11 +153,21 @@ private String bufferSizeText = null; /** + * The value of disable upload timeout. + */ + private String disableUploadTimeout = "false"; + + /** * The value of enable Lookups. */ private String enableLookups = "false"; /** + * The value of compression. + */ + private String compression = "off"; + + /** * The text for the address. */ private String address = null; @@ -154,6 +182,10 @@ */ private String maxProcessorsText = null; + /** + * The text for the maxKeepAlive. + */ + private String maxKeepAliveText = null; /** * The text for the port. @@ -195,8 +227,18 @@ * The keyStore Password. */ private String keyStorePassword = null; + + /** + * The keyStore Type. + */ + private String keyStoreType = null; /** + * The text for the Ssl Protocol. + */ + private String sslProtocol= null; + + /** * Set of valid values for debug level. */ private List debugLvlVals = null; @@ -211,6 +253,20 @@ */ private List connectorTypeVals = null; + /** + * The value of secure. + */ + private String secure = "false"; + /** + * The value of tcpNoDelay. + */ + private String tcpNoDelay = "true"; + + /** + * The value of xpoweredBy. + */ + private String xpoweredBy = "false"; + // ------------------------------------------------------------- Properties /** @@ -345,6 +401,64 @@ } /** + * Return the algorithm. + */ + public String getAlgorithm() { + + return this.algorithm; + + } + + + /** + * Set the algorithm. + */ + + public void setAlgorithm(String algorithm) { + + this.algorithm = algorithm; + + } + + /** + * Return the ciphers. + */ + public String getCiphers() { + + return this.ciphers; + + } + + /** + * Set the ciphers. + */ + + public void setCiphers(String ciphers) { + + this.ciphers = ciphers; + + } + + /** + * Return the connLingerText. + */ + public String getConnLingerText() { + + return this.connLingerText; + + } + + /** + * Set the connLingerText. + */ + + public void setConnLingerText(String connLingerText) { + + this.connLingerText = connLingerText; + + } + + /** * Return the connTimeOutText. */ public String getConnTimeOutText() { @@ -364,6 +478,24 @@ } /** + * Return the connUploadTimeOutText. + */ + public String getConnUploadTimeOutText() { + + return this.connUploadTimeOutText; + + } + + /** + * Set the connUploadTimeOutText. + */ + + public void setConnUploadTimeOutText(String connUploadTimeOutText) { + + this.connUploadTimeOutText = connUploadTimeOutText; + + } + /** * Return the bufferSizeText. */ public String getBufferSizeText() { @@ -392,7 +524,7 @@ } /** - * Set the connTimeOutText. + * Set the address. */ public void setAddress(String address) { @@ -478,7 +610,7 @@ } - /** + /** * Return the object name of the service this connector belongs to. */ public String getKeyStorePassword() { @@ -498,6 +630,43 @@ } /** + * Return the keystore type. + */ + public String getKeyStoreType() { + + return this.keyStoreType; + + } + + + /** + * Set the keystore type. + */ + public void setKeyStoreType(String keyStoreType) { + + this.keyStoreType = keyStoreType; + + } + /** + * Return the sslProtocol + */ + public String getSslProtocol() { + + return this.sslProtocol; + + } + + + /** + * Set the sslProtocol. + */ + public void setSslProtocol(String sslProtocol) { + + this.sslProtocol = sslProtocol; + + } + + /** * Return the debugVals. */ public List getDebugLvlVals() { @@ -535,7 +704,6 @@ } - /** * Return the Enable lookup Text. */ @@ -556,6 +724,44 @@ } /** + * Return the disableUploadTimeout. + */ + + public String getDisableUploadTimeout() { + + return this.disableUploadTimeout; + + } + + /** + * Set the disableUploadTimeout. + */ + public void setDisableUploadTimeout(String disableUploadTimeout) { + + this.disableUploadTimeout = disableUploadTimeout; + + } + + /** + * Return the compression Text. + */ + + public String getCompression() { + + return this.compression; + + } + + /** + * Set the Compression Text. + */ + public void setCompression(String compression) { + + this.compression = compression; + + } + + /** * Return the booleanVals. */ public List getBooleanVals() { @@ -610,6 +816,26 @@ } /** + * Return the maxKeepAliveText. + */ + public String getMaxKeepAliveText() { + + return this.maxKeepAliveText; + + } + + + /** + * Set the maxKeepAliveText. + */ + + public void setMaxKeepAliveText(String maxKeepAliveText) { + + this.maxKeepAliveText = maxKeepAliveText; + + } + + /** * Return the port text. */ public String getPortText() { @@ -682,6 +908,60 @@ } + /** + * Return the secure Text. + */ + public String getSecure() { + + return this.secure; + + } + + /** + * Set the secure Text. + */ + public void setSecure(String secure) { + + this.secure = secure; + + } + + /** + * Return the tcpNoDelay Text. + */ + public String getTcpNoDelay() { + + return this.tcpNoDelay; + + } + + /** + * Set the tcpNoDelay Text. + */ + public void setTcpNoDelay(String tcpNoDelay) { + + this.tcpNoDelay = tcpNoDelay; + + } + + /** + * Return the xpoweredBy Text. + */ + public String getXpoweredBy() { + + return this.xpoweredBy; + + } + + /** + * Set the xpoweredBy Text. + */ + public void setXpoweredBy(String xpoweredBy) { + + this.xpoweredBy = xpoweredBy; + + } + // --------------------------------------------------------- Public Methods /** @@ -696,12 +976,16 @@ this.connectorType = null; this.portText = null; this.acceptCountText = null; + this.connLingerText = null; this.connTimeOutText = null; + this.connUploadTimeOutText = null; this.bufferSizeText = null; this.address = null; this.enableLookups = "false"; + this.compression = "off"; this.minProcessorsText = null; this.maxProcessorsText = null; + this.maxKeepAliveText = null; this.portText = null; this.redirectPortText = null; this.proxyName = null; @@ -709,6 +993,9 @@ this.keyStoreFileName = null; this.keyStorePassword = null; this.clientAuthentication = "false"; + this.secure = "false"; + this.tcpNoDelay = "false"; + this.xpoweredBy = "false"; } @@ -736,7 +1023,7 @@ /* general */ numberCheck("acceptCountText", acceptCountText, true, 0, 128); - numberCheck("connTimeOutText", connTimeOutText, true, -1, 60000); + //numberCheck("connTimeOutText", connTimeOutText, true, -1, 60000); numberCheck("bufferSizeText", bufferSizeText, true, 1, 8192); /* The IP address can also be null -- which means open the 1.2 +43 -7 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java Index: EditConnectorAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/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 18 Jul 2002 16:48:26 -0000 1.1 +++ EditConnectorAction.java 25 Aug 2003 22:16:38 -0000 1.2 @@ -198,10 +198,22 @@ attribute = "acceptCount"; connectorFm.setAcceptCountText + (((Integer) mBServer.getAttribute(cname, attribute)).toString()); + attribute = "compression"; + connectorFm.setCompression + ((String) mBServer.getAttribute(cname, attribute)); + attribute = "connectionLinger"; + connectorFm.setConnLingerText (((Integer) mBServer.getAttribute(cname, attribute)).toString()); attribute = "connectionTimeout"; connectorFm.setConnTimeOutText - (((Integer) mBServer.getAttribute(cname, attribute)).toString()); + (((Integer) mBServer.getAttribute(cname, attribute)).toString()); + attribute = "connectionUploadTimeout"; + connectorFm.setConnUploadTimeOutText + (((Integer) mBServer.getAttribute(cname, attribute)).toString()); + attribute = "disableUploadTimeout"; + connectorFm.setDisableUploadTimeout + (((Boolean) mBServer.getAttribute(cname, attribute)).toString()); attribute = "debug"; connectorFm.setDebugLvl (((Integer) mBServer.getAttribute(cname, attribute)).toString()); @@ -213,7 +225,19 @@ (((Boolean) mBServer.getAttribute(cname, attribute)).toString()); attribute = "address"; connectorFm.setAddress - ((String) mBServer.getAttribute(cname, attribute)); + ((String) mBServer.getAttribute(cname, attribute)); + attribute = "maxKeepAliveRequests"; + connectorFm.setMaxKeepAliveText + (((Integer) mBServer.getAttribute(cname, attribute)).toString()); + attribute = "secure"; + connectorFm.setSecure + (((Boolean) mBServer.getAttribute(cname, attribute)).toString());; + attribute = "tcpNoDelay"; + connectorFm.setTcpNoDelay + (((Boolean) mBServer.getAttribute(cname, attribute)).toString());; + attribute = "xpoweredBy"; + connectorFm.setXpoweredBy + (((Boolean) mBServer.getAttribute(cname, attribute)).toString());; // Ports attribute = "port"; @@ -244,15 +268,27 @@ if ("HTTPS".equalsIgnoreCase(connectorType)) { // Initialize rest of variables. // These are set only for SSL connectors. + attribute = "algorithm"; + connectorFm.setAlgorithm + ((String) mBServer.getAttribute(cname, attribute)); attribute = "clientAuth"; connectorFm.setClientAuthentication (((Boolean) mBServer.getAttribute(cname, attribute)).toString()); + attribute = "ciphers"; + connectorFm.setCiphers + ((String) mBServer.getAttribute(cname, attribute)); attribute = "keystoreFile"; connectorFm.setKeyStoreFileName ((String) mBServer.getAttribute(cname, attribute)); attribute = "keystorePass"; connectorFm.setKeyStorePassword - ((String) mBServer.getAttribute(cname, attribute)); + ((String) mBServer.getAttribute(cname, attribute)); + attribute = "keystoreType"; + connectorFm.setKeyStoreType + ((String) mBServer.getAttribute(cname, attribute)); + attribute = "sslProtocol"; + connectorFm.setSslProtocol + ((String) mBServer.getAttribute(cname, attribute)); } 1.7 +81 -10 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java Index: SaveConnectorAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/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 9 Apr 2003 22:24:36 -0000 1.6 +++ SaveConnectorAction.java 25 Aug 2003 22:16:38 -0000 1.7 @@ -291,7 +291,22 @@ acceptCount = 60000; } mBServer.setAttribute(coname, - new Attribute("acceptCount", new Integer(acceptCount))); + new Attribute("acceptCount", new Integer(acceptCount))); + attribute = "compression"; + String compression = cform.getCompression(); + if ((compression != null) && (compression.length()>0)) { + mBServer.setAttribute(coname, + new Attribute("compression", compression)); + } + attribute = "connectionLinger"; + int connectionLinger = -1; + try { + connectionLinger = Integer.parseInt(cform.getConnLingerText()); + } catch (Throwable t) { + connectionLinger = 0; + } + mBServer.setAttribute(coname, + new Attribute("connectionLinger", new Integer(connectionLinger))); attribute = "connectionTimeout"; int connectionTimeout = 0; try { @@ -301,7 +316,16 @@ } mBServer.setAttribute(coname, new Attribute("connectionTimeout", new Integer(connectionTimeout))); - attribute = "bufferSize"; + attribute = "connectionUploadTimeout"; + int connectionUploadTimeout = 0; + try { + connectionUploadTimeout = Integer.parseInt(cform.getConnUploadTimeOutText()); + } catch (Throwable t) { + connectionUploadTimeout = 0; + } + mBServer.setAttribute(coname, + new Attribute("connectionUploadTimeout", new Integer(connectionUploadTimeout))); + attribute = "bufferSize"; int bufferSize = 2048; try { bufferSize = Integer.parseInt(cform.getBufferSizeText()); @@ -309,7 +333,10 @@ bufferSize = 2048; } mBServer.setAttribute(coname, - new Attribute("bufferSize", new Integer(bufferSize))); + new Attribute("bufferSize", new Integer(bufferSize))); + attribute = "disableUploadTimeout"; + mBServer.setAttribute(coname, + new Attribute("disableUploadTimeout", new Boolean(cform.getDisableUploadTimeout()))); attribute = "enableLookups"; mBServer.setAttribute(coname, new Attribute("enableLookups", new Boolean(cform.getEnableLookups()))); @@ -341,7 +368,27 @@ } mBServer.setAttribute(coname, new Attribute("maxProcessors", new Integer(maxProcessors))); - + + attribute = "maxKeepAliveRequests"; + int maxKeepAliveRequests = 100; + try { + maxKeepAliveRequests = Integer.parseInt(cform.getMaxKeepAliveText()); + } catch (Throwable t) { + maxKeepAliveRequests = 100; + } + mBServer.setAttribute(coname, + new Attribute("maxKeepAliveRequests", new Integer(maxKeepAliveRequests))); + attribute = "secure"; + mBServer.setAttribute(coname, + new Attribute("secure", new Boolean(cform.getSecure()))); + attribute = "tcpNoDelay"; + mBServer.setAttribute(coname, + new Attribute("tcpNoDelay", new Boolean(cform.getTcpNoDelay()))); + + attribute = "xpoweredBy"; + mBServer.setAttribute(coname, + new Attribute("xpoweredBy", new Boolean(cform.getXpoweredBy()))); + // proxy name and port do not exist for AJP connector if (!("AJP".equalsIgnoreCase(connectorType))) { attribute = "proxyName"; @@ -364,10 +411,22 @@ // HTTPS specific properties if("HTTPS".equalsIgnoreCase(connectorType)) { + attribute = "algorithm"; + String algorithm = cform.getAlgorithm(); + if ((algorithm != null) && (algorithm.length()>0)) + mBServer.setAttribute(coname, + new Attribute("algorithm", algorithm)); + attribute = "clientAuth"; mBServer.setAttribute(coname, new Attribute("clientAuth", new Boolean( - cform.getClientAuthentication()))); + cform.getClientAuthentication()))); + + attribute = "ciphers"; + String ciphers = cform.getCiphers(); + if ((ciphers != null) && (ciphers.length()>0)) + mBServer.setAttribute(coname, + new Attribute("ciphers", ciphers)); attribute = "keystoreFile"; String keyFile = cform.getKeyStoreFileName(); @@ -380,7 +439,19 @@ if ((keyPass != null) && (keyPass.length()>0)) mBServer.setAttribute(coname, new Attribute("keystorePass", keyPass)); - // request.setAttribute("warning", "connector.keyPass.warning"); + // request.setAttribute("warning", "connector.keyPass.warning"); + + attribute = "keystoreType"; + String keyType = cform.getKeyStoreType(); + if ((keyType != null) && (keyType.length()>0)) + mBServer.setAttribute(coname, + new Attribute("keystoreType", keyType)); + + attribute = "sslProtocol"; + String sslProtocol = cform.getSslProtocol(); + if ((sslProtocol != null) && (sslProtocol.length()>0)) + mBServer.setAttribute(coname, + new Attribute("sslProtocol", sslProtocol)); } } catch (Exception e) { 1.5 +108 -0 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp Index: connector.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connector.jsp 23 Jan 2003 00:07:08 -0000 1.4 +++ connector.jsp 25 Aug 2003 22:16:39 -0000 1.5 @@ -103,6 +103,21 @@ </controls:data> </controls:row> + <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="linger"> + <controls:label><bean:message key="connector.connection.linger"/><br> + (<bean:message key="connector.milliseconds"/>) :</controls:label> + <controls:data> + <html:text property="connLingerText" size="10" styleId="linger"/> + </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> @@ -111,6 +126,14 @@ </controls:data> </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="upload"> + <controls:label><bean:message key="connector.connection.uploadTimeout"/><br> + (<bean:message key="connector.milliseconds"/>) :</controls:label> + <controls:data> + <html:text property="connUploadTimeOutText" size="10" styleId="upload"/> + </controls:data> + </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debuglevel"> <controls:label><bean:message key="server.debuglevel"/>:</controls:label> <controls:data> @@ -129,6 +152,17 @@ </controls:data> </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="disableUpload"> + <controls:label><bean:message key="connector.connection.disableUploadTimeout"/>:</controls:label> + <controls:data> + <html:select property="disableUploadTimeout" styleId="disableUpload"> + <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="enableDNS"> <controls:label><bean:message key="connector.enable.dns"/>:</controls:label> <controls:data> @@ -154,6 +188,46 @@ </controls:data> </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="maxkeepalive"> + <controls:label><bean:message key="connector.maxkeepalive"/>:</controls:label> + <controls:data> + <html:text property="maxKeepAliveText" size="5" maxlength="5" styleId="maxkeepalive"/> + </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> + <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> + + <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"/> + </html:select> + </controls:data> + </controls:row> + + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="xpoweredby"> + <controls:label><bean:message key="connector.xpoweredby"/>:</controls:label> + <controls:data> + <html:select property="xpoweredBy" styleId="xpoweredby"> + <bean:define id="booleanVals" name="connectorForm" property="booleanVals"/> + <html:options collection="booleanVals" property="value" + labelProperty="label"/> + </html:select> + </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> @@ -231,6 +305,20 @@ <controls:data> </controls:data> </controls:row> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="algorithm"> + <controls:label><bean:message key="connector.algorithm"/>:</controls:label> + <controls:data> + <html:text property="algorithm" size="10" styleId="algorithm"/> + </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="10" styleId="ciphers"/> + </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> @@ -269,6 +357,26 @@ </controls:data> </controls:row> </logic:equal> + + <%-- Input allowed only on create --%> + <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="keytype"> + <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="keytype"/> + </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="10" styleId="sslProtocol"/> + </controls:data> + </controls:row> </logic:equal> </controls:table>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]