Author: markt Date: Sun Apr 16 05:37:48 2006 New Revision: 394474 URL: http://svn.apache.org/viewcvs?rev=394474&view=rev Log: Reduce line length, made code consistent prior to a bigger change.
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java 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=394474&r1=394473&r2=394474&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 Sun Apr 16 05:37:48 2006 @@ -233,7 +233,8 @@ debug = 0; } mBServer.setAttribute(coname, - new Attribute("debug", new Integer(debug))); + new Attribute(attribute, new Integer(debug))); + attribute = "acceptCount"; int acceptCount = 60000; try { @@ -242,7 +243,8 @@ acceptCount = 60000; } mBServer.setAttribute(coname, - new Attribute("acceptCount", new Integer(acceptCount))); + new Attribute(attribute, new Integer(acceptCount))); + attribute = "connectionTimeout"; int connectionTimeout = 0; try { @@ -251,8 +253,9 @@ connectionTimeout = 0; } mBServer.setAttribute(coname, - new Attribute("connectionTimeout", new Integer(connectionTimeout))); - attribute = "bufferSize"; + new Attribute(attribute, new Integer(connectionTimeout))); + + attribute = "bufferSize"; int bufferSize = 2048; try { bufferSize = Integer.parseInt(cform.getBufferSizeText()); @@ -260,10 +263,12 @@ bufferSize = 2048; } mBServer.setAttribute(coname, - new Attribute("bufferSize", new Integer(bufferSize))); + new Attribute(attribute, new Integer(bufferSize))); + attribute = "enableLookups"; mBServer.setAttribute(coname, - new Attribute("enableLookups", new Boolean(cform.getEnableLookups()))); + new Attribute(attribute, + new Boolean(cform.getEnableLookups()))); attribute = "redirectPort"; int redirectPort = 0; @@ -273,7 +278,8 @@ redirectPort = 0; } mBServer.setAttribute(coname, - new Attribute("redirectPort", new Integer(redirectPort))); + new Attribute(attribute, new Integer(redirectPort))); + attribute = "minProcessors"; int minProcessors = 5; try { @@ -282,7 +288,8 @@ minProcessors = 5; } mBServer.setAttribute(coname, - new Attribute("minProcessors", new Integer(minProcessors))); + new Attribute(attribute, new Integer(minProcessors))); + attribute = "maxProcessors"; int maxProcessors = 20; try { @@ -291,20 +298,25 @@ maxProcessors = 20; } mBServer.setAttribute(coname, - new Attribute("maxProcessors", new Integer(maxProcessors))); + new Attribute(attribute, new Integer(maxProcessors))); + attribute = "URIEncoding"; String uriEnc = cform.getURIEncodingText(); if ((uriEnc != null) && (uriEnc.length()==0)) { uriEnc = null; } mBServer.setAttribute(coname, - new Attribute("URIEncoding", uriEnc)); + new Attribute(attribute, uriEnc)); + attribute = "useBodyEncodingForURI"; mBServer.setAttribute(coname, - new Attribute(attribute, new Boolean(cform.getUseBodyEncodingForURIText()))); + new Attribute(attribute, + new Boolean(cform.getUseBodyEncodingForURIText()))); + attribute = "allowTrace"; mBServer.setAttribute(coname, - new Attribute(attribute, new Boolean(cform.getAllowTraceText()))); + new Attribute(attribute, + new Boolean(cform.getAllowTraceText()))); // proxy name and port do not exist for AJP connector if (!("AJP".equalsIgnoreCase(connectorType))) { @@ -312,7 +324,7 @@ String proxyName = cform.getProxyName(); if ((proxyName != null) && (proxyName.length()>0)) { mBServer.setAttribute(coname, - new Attribute("proxyName", proxyName)); + new Attribute(attribute, proxyName)); } attribute = "proxyPort"; @@ -323,27 +335,27 @@ proxyPort = 0; } mBServer.setAttribute(coname, - new Attribute("proxyPort", new Integer(proxyPort))); + new Attribute(attribute, new Integer(proxyPort))); } // HTTPS specific properties if("HTTPS".equalsIgnoreCase(connectorType)) { attribute = "clientAuth"; mBServer.setAttribute(coname, - new Attribute("clientAuth", - cform.getClientAuthentication())); + new Attribute(attribute, + cform.getClientAuthentication())); attribute = "keystoreFile"; String keyFile = cform.getKeyStoreFileName(); if ((keyFile != null) && (keyFile.length()>0)) mBServer.setAttribute(coname, - new Attribute("keystoreFile", keyFile)); + new Attribute(attribute, keyFile)); attribute = "keystorePass"; String keyPass = cform.getKeyStorePassword(); if ((keyPass != null) && (keyPass.length()>0)) mBServer.setAttribute(coname, - new Attribute("keystorePass", keyPass)); + new Attribute(attribute, keyPass)); // request.setAttribute("warning", "connector.keyPass.warning"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]