Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 47618 invoked from network); 7 Sep 2009 15:37:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Sep 2009 15:37:19 -0000 Received: (qmail 67301 invoked by uid 500); 7 Sep 2009 15:37:19 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 67228 invoked by uid 500); 7 Sep 2009 15:37:19 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 67219 invoked by uid 99); 7 Sep 2009 15:37:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 15:37:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 15:37:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 397EB238887A; Mon, 7 Sep 2009 15:36:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r812199 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ Date: Mon, 07 Sep 2009 15:36:53 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090907153653.397EB238887A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: genspring Date: Mon Sep 7 15:36:52 2009 New Revision: 812199 URL: http://svn.apache.org/viewvc?rev=812199&view=rev Log: GERONIMO-4853 Can't define tomcat connector with GBean. Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java (contents, props changed) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java (contents, props changed) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (contents, props changed) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java (contents, props changed) geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java (contents, props changed) Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -30,6 +30,7 @@ import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; import org.apache.geronimo.management.StatisticsProvider; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; @@ -188,59 +189,73 @@ Object value = connector.getAttribute("tomcatAuthentication"); return value == null ? true : new Boolean(value.toString()).booleanValue(); } - + + @Persistent public void setAddress(String address) { connector.setAttribute("address", address); } - + + @Persistent public void setBacklog(int backlog) { connector.setAttribute("backlog", new Integer(backlog)); } - + + @Persistent public void setBufferSize(int bufferSize) { connector.setAttribute("bufferSize", new Integer(bufferSize)); } - + + @Persistent public void setConnectionTimeout(int connectionTimeout) { connector.setAttribute("connectionTimeout", new Integer(connectionTimeout)); } - + + @Persistent public void setExecutor(String executor) { connector.setAttribute("executor", executor); } + @Persistent public void setHost(String host) { setAddress(host); } - + + @Persistent public void setKeepAliveTimeout(int keepAliveTimeout) { connector.setAttribute("keepAliveTimeout", keepAliveTimeout); } - + + @Persistent public void setMaxThreads(int maxThreads) { connector.setAttribute("maxThreads", maxThreads); } + @Persistent public void setMaxSpareThreads(int maxSpareThreads) { connector.setAttribute("maxSpareThreads", new Integer(maxSpareThreads)); } + @Persistent public void setMinSpareThreads(int minSpareThreads) { connector.setAttribute("minSpareThreads", new Integer(minSpareThreads)); } - + + @Persistent public void setNoCompressionUserAgents(String noCompressionUserAgents) { connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents); } - + + @Persistent public void setPort(int port) { connector.setPort(port); } - + + @Persistent public void setTcpNoDelay(boolean tcpNoDelay) { connector.setAttribute("tcpNoDelay", new Boolean(tcpNoDelay)); } - + + @Persistent public void setTomcatAuthentication(boolean tomcatAuthentication) { connector.setAttribute("tomcatAuthentication", new Boolean(tomcatAuthentication)); } Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -26,6 +26,7 @@ import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; @@ -106,6 +107,7 @@ return (String) connector.getAttribute("keystorePass"); } + @Persistent public void setAlgorithm(String algorithm) { this.algorithm = algorithm; if ("default".equalsIgnoreCase(algorithm)) { @@ -114,20 +116,24 @@ connector.setAttribute("algorithm", algorithm); } + @Persistent public void setCiphers(String ciphers) { connector.setAttribute("ciphers", ciphers); } - + + @Persistent public void setClientAuth(boolean clientAuth) { connector.setAttribute("clientAuth", new Boolean(clientAuth)); } + @Persistent public void setKeyAlias(String keyAlias) { if (keyAlias.equals("")) keyAlias = null; connector.setAttribute("keyAlias", keyAlias); } + @Persistent public void setKeystoreFile(String keystoreFile) { if (keystoreFile!= null && keystoreFile.equals("")) keystoreFile = null; @@ -138,24 +144,28 @@ connector.setAttribute("keystoreFile", serverInfo.resolveServerPath(keystoreFileName)); } + @Persistent public void setKeystorePass(String keystorePass) { if (keystorePass!= null && keystorePass.equals("")) keystorePass = null; connector.setAttribute("keystorePass", keystorePass); } + @Persistent public void setKeystoreType(String keystoreType) { if (keystoreType!= null && keystoreType.equals("")) keystoreType = null; connector.setAttribute("keystoreType", keystoreType); } + @Persistent public void setSslProtocol(String sslProtocol) { if (sslProtocol!= null && sslProtocol.equals("")) sslProtocol = null; connector.setAttribute("sslProtocol", sslProtocol); } + @Persistent public void setTruststoreFile(String truststoreFile) { if (truststoreFile!= null && truststoreFile.equals("")) truststoreFile = null; @@ -165,13 +175,15 @@ else connector.setAttribute("truststoreFile", serverInfo.resolveServerPath(truststoreFileName)); } - + + @Persistent public void setTruststorePass(String truststorePass) { if (truststorePass!= null && truststorePass.equals("")) truststorePass = null; connector.setAttribute("truststorePass", truststorePass); } - + + @Persistent public void setTruststoreType(String truststoreType) { if (truststoreType!= null && truststoreType.equals("")) truststoreType = null; Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -1,348 +1,371 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.geronimo.tomcat.connector; - -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.Map; - -import javax.management.j2ee.statistics.Stats; - -import org.apache.catalina.Executor; -import org.apache.catalina.connector.Connector; -import org.apache.geronimo.gbean.annotation.GBean; -import org.apache.geronimo.gbean.annotation.ParamAttribute; -import org.apache.geronimo.gbean.annotation.ParamReference; -import org.apache.geronimo.management.StatisticsProvider; -import org.apache.geronimo.system.serverinfo.ServerInfo; -import org.apache.geronimo.tomcat.TomcatContainer; -import org.apache.geronimo.tomcat.stats.ConnectorStats; - -@GBean(name="Tomcat Connector") -public abstract class BaseHttp11ConnectorGBean extends ConnectorGBean implements BaseHttp11Protocol, StatisticsProvider { - - protected String connectHost; - - // JSR77 stats - private ConnectorStats connStatsProvider = new ConnectorStats(); - - private boolean reset = true; - - public BaseHttp11ConnectorGBean(@ParamAttribute(name = "name") String name, - @ParamAttribute(name = "initParams") Map initParams, - @ParamAttribute(name = "protocol") String tomcatProtocol, - @ParamAttribute(name = "host") String host, - @ParamAttribute(name = "port") int port, - @ParamReference(name = "TomcatContainer") TomcatContainer container, - @ParamReference(name = "ServerInfo") ServerInfo serverInfo, - @ParamAttribute(name = "connector") Connector conn) throws Exception { - - super(name, initParams, tomcatProtocol, container, serverInfo, conn); - - // Default the host to listen on all address is one was not specified - if (host == null) { - host = "0.0.0.0"; - } - - // Must have a port - if (port == 0) { - throw new IllegalArgumentException("Must declare a port."); - } - - connector.setAttribute("address", host); - connector.setPort(port); - - } - - protected void initProtocol() {} - - public String getConnectUrl() { - if(connectHost == null) { - String host = getAddress(); - if(host == null || host.equals("0.0.0.0") || host.equals("0:0:0:0:0:0:0:1")) { - InetAddress address = null; - try { - address = InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - host = "unknown-host"; - } - if(address != null) { - host = address.getCanonicalHostName(); - if(host == null || host.equals("")) { - host = address.getHostAddress(); - } - } - } - // this host address could be in IPv6 format, - // which means we need to wrap it in brackets - if (host.indexOf(":") >= 0) { - host = "[" + host + "]"; - } - connectHost = host; - } - return getScheme().toLowerCase()+"://"+connectHost+(getPort() == getDefaultPort() ? "" : ":"+getPort()); - } - - public abstract int getDefaultPort(); - - - // Generic HTTP - public int getAcceptCount() { - Object value = connector.getAttribute("acceptCount"); - return value == null ? 10 : Integer.parseInt(value.toString()); - } - - public String getAddress() { - Object value = connector.getAttribute("address"); - if (value == null) { - return "0.0.0.0"; - } else if (value instanceof InetAddress) { - return ((InetAddress) value).getHostAddress(); - } else - return value.toString(); - } - - public int getBufferSize() { - Object value = connector.getAttribute("bufferSize"); - return value == null ? 2048 : Integer.parseInt(value.toString()); - } - - public String getCompressableMimeType() { - return (String) connector.getAttribute("compressableMimeType"); - } - - public String getCompression() { - return (String) connector.getAttribute("compression"); - } - - public int getConnectionLinger() { - Object value = connector.getAttribute("connectionLinger"); - return value == null ? -1 : Integer.parseInt(value.toString()); - } - - public int getConnectionTimeout() { - Object value = connector.getAttribute("connectionTimeout"); - return value == null ? 60000 : Integer.parseInt(value.toString()); - } - - public boolean getDisableUploadTimeout() { - Object value = connector.getAttribute("disableUploadTimeout"); - return value == null ? true : new Boolean(value.toString()).booleanValue(); - } - - public String getExecutor() { - Object value = connector.getAttribute("executor"); - if (value == null) - return null; - - if (value instanceof String) - return (String)value; - - if(value instanceof Executor){ - return ((Executor) value).getName(); - } - - return (String) value.getClass().getName(); - } - - public String getHost() { - return getAddress(); - } - - public InetSocketAddress getListenAddress() { - return new InetSocketAddress(getHost(), getPort()); - } - - public int getKeepAliveTimeout() { - Object value = connector.getAttribute("keepAliveTimeout"); - return value == null ? getConnectionTimeout() : Integer.parseInt(value.toString()); - } - - public int getMaxHttpHeaderSize() { - Object value = connector.getAttribute("maxHttpHeaderSize"); - return value == null ? 4096 : Integer.parseInt(value.toString()); - } - - public int getMaxKeepAliveRequests() { - Object value = connector.getAttribute("maxKeepAliveRequests"); - return value == null ? 100 : Integer.parseInt(value.toString()); - } - - public int getMaxThreads() { - Object value = connector.getAttribute("maxThreads"); - return value == null ? 200 : Integer.parseInt(value.toString()); - } - - public int getMaxSpareThreads() { - Object value = connector.getAttribute("maxSpareThreads"); - return value == null ? 100 : Integer.parseInt(value.toString()); - } - - public int getMinSpareThreads() { - Object value = connector.getAttribute("minSpareThreads"); - return value == null ? 10 : Integer.parseInt(value.toString()); - } - - public String getNoCompressionUserAgents() { - return (String) connector.getAttribute("noCompressionUserAgents"); - } - - public int getPort() { - return connector.getPort(); - } - - public String getRestrictedUserAgents() { - return (String) connector.getAttribute("restrictedUserAgents"); - } - - public String getServer() { - return (String) connector.getAttribute("server"); - } - - public int getSocketBuffer() { - Object value = connector.getAttribute("socketBuffer"); - return value == null ? 9000 : Integer.parseInt(value.toString()); - } - - public boolean getTcpNoDelay() { - Object value = connector.getAttribute("tcpNoDelay"); - return value == null ? true : new Boolean(value.toString()).booleanValue(); - } - - public int getThreadPriority() { - Object value = connector.getAttribute("threadPriority"); - return value == null ? Thread.NORM_PRIORITY : Integer.parseInt(value.toString()); - } - - public void setAcceptCount(int acceptCount) { - connector.setAttribute("acceptCount", new Integer(acceptCount)); - } - - public void setAddress(String address) { - connector.setAttribute("address", address); - } - - public void setBufferSize(int bufferSize) { - connector.setAttribute("bufferSize", new Integer(bufferSize)); - } - - public void setCompressableMimeType(String compressableMimeType) { - connector.setAttribute("compressableMimeType", compressableMimeType); - } - - public void setCompression(String compression) { - connector.setAttribute("compression", compression); - } - - public void setConnectionLinger(int connectionLinger) { - connector.setAttribute("connectionLinger", new Integer(connectionLinger)); - } - - public void setConnectionTimeout(int connectionTimeout) { - connector.setAttribute("connectionTimeout", new Integer(connectionTimeout)); - } - - public void setDisableUploadTimeout(boolean disableUploadTimeout) { - connector.setAttribute("disableUploadTimeout", new Boolean(disableUploadTimeout)); - } - - public void setExecutor(String executor) { - connector.setAttribute("executor", executor); - } - - public void setHost(String host) { - setAddress(host); - } - - public void setKeepAliveTimeout(int keepAliveTimeout) { - connector.setAttribute("keepAliveTimeout", keepAliveTimeout); - } - - public void setMaxHttpHeaderSize(int maxHttpHeaderSize) { - connector.setAttribute("maxHttpHeaderSize", new Integer(maxHttpHeaderSize)); - } - - public void setMaxKeepAliveRequests(int maxKeepAliveRequests) { - connector.setAttribute("maxKeepAliveRequests", new Integer(maxKeepAliveRequests)); - } - - public void setMaxThreads(int maxThreads) { - connector.setAttribute("maxThreads", new Integer(maxThreads)); - } - - public void setMaxSpareThreads(int maxSpareThreads) { - connector.setAttribute("maxSpareThreads", new Integer(maxSpareThreads)); - } - - public void setMinSpareThreads(int minSpareThreads) { - connector.setAttribute("minSpareThreads", new Integer(minSpareThreads)); - } - - public void setNoCompressionUserAgents(String noCompressionUserAgents) { - connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents); - } - - public void setPort(int port) { - connector.setPort(port); - } - - public void setRestrictedUserAgents(String restrictedUserAgents) { - connector.setAttribute("restrictedUserAgents", restrictedUserAgents); - } - - public void setServer(String server) { - if (server.equals("")) - server = null; - connector.setAttribute("server", server); - } - - public void setSocketBuffer(int socketBuffer) { - connector.setAttribute("socketBuffer", new Integer(socketBuffer)); - } - - public void setTcpNoDelay(boolean tcpNoDelay) { - connector.setAttribute("tcpNoDelay", new Boolean(tcpNoDelay)); - } - - public void setThreadPriority(int threadPriority) { - connector.setAttribute("threadPriority", new Integer(threadPriority)); - } - - // Statistics Provider - - public boolean isStatisticsProvider() { - return true; - } - - public Stats getStats() { - String port = String.valueOf(getPort()); - if (reset) { - reset = false; - return connStatsProvider.getStats(port); - } else - return connStatsProvider.updateStats(port); - } - - public void resetStats() { - reset = true; - } - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.geronimo.tomcat.connector; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.Map; + +import javax.management.j2ee.statistics.Stats; + +import org.apache.catalina.Executor; +import org.apache.catalina.connector.Connector; +import org.apache.geronimo.gbean.annotation.GBean; +import org.apache.geronimo.gbean.annotation.ParamAttribute; +import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; +import org.apache.geronimo.management.StatisticsProvider; +import org.apache.geronimo.system.serverinfo.ServerInfo; +import org.apache.geronimo.tomcat.TomcatContainer; +import org.apache.geronimo.tomcat.stats.ConnectorStats; + +@GBean(name="Tomcat Connector") +public abstract class BaseHttp11ConnectorGBean extends ConnectorGBean implements BaseHttp11Protocol, StatisticsProvider { + + protected String connectHost; + + // JSR77 stats + private ConnectorStats connStatsProvider = new ConnectorStats(); + + private boolean reset = true; + + public BaseHttp11ConnectorGBean(@ParamAttribute(name = "name") String name, + @ParamAttribute(name = "initParams") Map initParams, + @ParamAttribute(name = "protocol") String tomcatProtocol, + @ParamAttribute(name = "host") String host, + @ParamAttribute(name = "port") int port, + @ParamReference(name = "TomcatContainer") TomcatContainer container, + @ParamReference(name = "ServerInfo") ServerInfo serverInfo, + @ParamAttribute(name = "connector") Connector conn) throws Exception { + + super(name, initParams, tomcatProtocol, container, serverInfo, conn); + + // Default the host to listen on all address is one was not specified + if (host == null) { + host = "0.0.0.0"; + } + + // Must have a port + if (port == 0) { + throw new IllegalArgumentException("Must declare a port."); + } + + connector.setAttribute("address", host); + connector.setPort(port); + + } + + protected void initProtocol() {} + + public String getConnectUrl() { + if(connectHost == null) { + String host = getAddress(); + if(host == null || host.equals("0.0.0.0") || host.equals("0:0:0:0:0:0:0:1")) { + InetAddress address = null; + try { + address = InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + host = "unknown-host"; + } + if(address != null) { + host = address.getCanonicalHostName(); + if(host == null || host.equals("")) { + host = address.getHostAddress(); + } + } + } + // this host address could be in IPv6 format, + // which means we need to wrap it in brackets + if (host.indexOf(":") >= 0) { + host = "[" + host + "]"; + } + connectHost = host; + } + return getScheme().toLowerCase()+"://"+connectHost+(getPort() == getDefaultPort() ? "" : ":"+getPort()); + } + + public abstract int getDefaultPort(); + + + // Generic HTTP + public int getAcceptCount() { + Object value = connector.getAttribute("acceptCount"); + return value == null ? 10 : Integer.parseInt(value.toString()); + } + + public String getAddress() { + Object value = connector.getAttribute("address"); + if (value == null) { + return "0.0.0.0"; + } else if (value instanceof InetAddress) { + return ((InetAddress) value).getHostAddress(); + } else + return value.toString(); + } + + public int getBufferSize() { + Object value = connector.getAttribute("bufferSize"); + return value == null ? 2048 : Integer.parseInt(value.toString()); + } + + public String getCompressableMimeType() { + return (String) connector.getAttribute("compressableMimeType"); + } + + public String getCompression() { + return (String) connector.getAttribute("compression"); + } + + public int getConnectionLinger() { + Object value = connector.getAttribute("connectionLinger"); + return value == null ? -1 : Integer.parseInt(value.toString()); + } + + public int getConnectionTimeout() { + Object value = connector.getAttribute("connectionTimeout"); + return value == null ? 60000 : Integer.parseInt(value.toString()); + } + + public boolean getDisableUploadTimeout() { + Object value = connector.getAttribute("disableUploadTimeout"); + return value == null ? true : new Boolean(value.toString()).booleanValue(); + } + + public String getExecutor() { + Object value = connector.getAttribute("executor"); + if (value == null) + return null; + + if (value instanceof String) + return (String)value; + + if(value instanceof Executor){ + return ((Executor) value).getName(); + } + + return (String) value.getClass().getName(); + } + + public String getHost() { + return getAddress(); + } + + public InetSocketAddress getListenAddress() { + return new InetSocketAddress(getHost(), getPort()); + } + + public int getKeepAliveTimeout() { + Object value = connector.getAttribute("keepAliveTimeout"); + return value == null ? getConnectionTimeout() : Integer.parseInt(value.toString()); + } + + public int getMaxHttpHeaderSize() { + Object value = connector.getAttribute("maxHttpHeaderSize"); + return value == null ? 4096 : Integer.parseInt(value.toString()); + } + + public int getMaxKeepAliveRequests() { + Object value = connector.getAttribute("maxKeepAliveRequests"); + return value == null ? 100 : Integer.parseInt(value.toString()); + } + + public int getMaxThreads() { + Object value = connector.getAttribute("maxThreads"); + return value == null ? 200 : Integer.parseInt(value.toString()); + } + + public int getMaxSpareThreads() { + Object value = connector.getAttribute("maxSpareThreads"); + return value == null ? 100 : Integer.parseInt(value.toString()); + } + + public int getMinSpareThreads() { + Object value = connector.getAttribute("minSpareThreads"); + return value == null ? 10 : Integer.parseInt(value.toString()); + } + + public String getNoCompressionUserAgents() { + return (String) connector.getAttribute("noCompressionUserAgents"); + } + + public int getPort() { + return connector.getPort(); + } + + public String getRestrictedUserAgents() { + return (String) connector.getAttribute("restrictedUserAgents"); + } + + public String getServer() { + return (String) connector.getAttribute("server"); + } + + public int getSocketBuffer() { + Object value = connector.getAttribute("socketBuffer"); + return value == null ? 9000 : Integer.parseInt(value.toString()); + } + + public boolean getTcpNoDelay() { + Object value = connector.getAttribute("tcpNoDelay"); + return value == null ? true : new Boolean(value.toString()).booleanValue(); + } + + + public int getThreadPriority() { + Object value = connector.getAttribute("threadPriority"); + return value == null ? Thread.NORM_PRIORITY : Integer.parseInt(value.toString()); + } + + + public void setAcceptCount(int acceptCount) { + connector.setAttribute("acceptCount", new Integer(acceptCount)); + } + + @Persistent + public void setAddress(String address) { + connector.setAttribute("address", address); + } + + @Persistent + public void setBufferSize(int bufferSize) { + connector.setAttribute("bufferSize", new Integer(bufferSize)); + } + + @Persistent + public void setCompressableMimeType(String compressableMimeType) { + connector.setAttribute("compressableMimeType", compressableMimeType); + } + + @Persistent + public void setCompression(String compression) { + connector.setAttribute("compression", compression); + } + + @Persistent + public void setConnectionLinger(int connectionLinger) { + connector.setAttribute("connectionLinger", new Integer(connectionLinger)); + } + + @Persistent + public void setConnectionTimeout(int connectionTimeout) { + connector.setAttribute("connectionTimeout", new Integer(connectionTimeout)); + } + + @Persistent + public void setDisableUploadTimeout(boolean disableUploadTimeout) { + connector.setAttribute("disableUploadTimeout", new Boolean(disableUploadTimeout)); + } + + @Persistent + public void setExecutor(String executor) { + connector.setAttribute("executor", executor); + } + + @Persistent + public void setHost(String host) { + setAddress(host); + } + + @Persistent + public void setKeepAliveTimeout(int keepAliveTimeout) { + connector.setAttribute("keepAliveTimeout", keepAliveTimeout); + } + + @Persistent + public void setMaxHttpHeaderSize(int maxHttpHeaderSize) { + connector.setAttribute("maxHttpHeaderSize", new Integer(maxHttpHeaderSize)); + } + + @Persistent + public void setMaxKeepAliveRequests(int maxKeepAliveRequests) { + connector.setAttribute("maxKeepAliveRequests", new Integer(maxKeepAliveRequests)); + } + + @Persistent + public void setMaxThreads(int maxThreads) { + connector.setAttribute("maxThreads", new Integer(maxThreads)); + } + + @Persistent + public void setMaxSpareThreads(int maxSpareThreads) { + connector.setAttribute("maxSpareThreads", new Integer(maxSpareThreads)); + } + + @Persistent + public void setMinSpareThreads(int minSpareThreads) { + connector.setAttribute("minSpareThreads", new Integer(minSpareThreads)); + } + + @Persistent + public void setNoCompressionUserAgents(String noCompressionUserAgents) { + connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents); + } + @Persistent + public void setPort(int port) { + connector.setPort(port); + } + @Persistent + public void setRestrictedUserAgents(String restrictedUserAgents) { + connector.setAttribute("restrictedUserAgents", restrictedUserAgents); + } + + @Persistent + public void setServer(String server) { + if (server.equals("")) + server = null; + connector.setAttribute("server", server); + } + + @Persistent + public void setSocketBuffer(int socketBuffer) { + connector.setAttribute("socketBuffer", new Integer(socketBuffer)); + } + + @Persistent + public void setTcpNoDelay(boolean tcpNoDelay) { + connector.setAttribute("tcpNoDelay", new Boolean(tcpNoDelay)); + } + + @Persistent + public void setThreadPriority(int threadPriority) { + connector.setAttribute("threadPriority", new Integer(threadPriority)); + } + + // Statistics Provider + + public boolean isStatisticsProvider() { + return true; + } + + public Stats getStats() { + String port = String.valueOf(getPort()); + if (reset) { + reset = false; + return connStatsProvider.getStats(port); + } else + return connStatsProvider.updateStats(port); + } + + public void resetStats() { + reset = true; + } + + +} Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -30,6 +30,7 @@ import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.BaseGBean; import org.apache.geronimo.tomcat.ObjectRetriever; @@ -54,12 +55,12 @@ private String name; - public ConnectorGBean(@ParamAttribute(name = "name") String name, - @ParamAttribute(name = "initParams") Map initParams, - @ParamAttribute(name = "protocol") String tomcatProtocol, - @ParamReference(name = "TomcatContainer") TomcatContainer container, - @ParamReference(name = "ServerInfo") ServerInfo serverInfo, - @ParamAttribute(name = "connector") Connector conn) throws Exception { + public ConnectorGBean(@ParamAttribute(name = "name") String name, + @ParamAttribute(name = "initParams") Map initParams, + @ParamAttribute(name = "protocol") String tomcatProtocol, + @ParamReference(name = "TomcatContainer") TomcatContainer container, + @ParamReference(name = "ServerInfo") ServerInfo serverInfo, + @ParamAttribute(name = "connector") Connector conn) throws Exception { //Relief for new Tomcat-only parameters that may come in the future if (initParams == null){ @@ -209,29 +210,35 @@ public boolean getUseIPVHosts() { return connector.getUseIPVHosts(); } - + + @Persistent public void setMaxSavePostSize(int maxSavePostSize) { connector.setMaxSavePostSize(maxSavePostSize); } - + + @Persistent public void setProxyName(String proxyName) { if (proxyName.equals("")) proxyName = null; connector.setProxyName(proxyName); } - + + @Persistent public void setProxyPort(int port) { connector.setProxyPort(port); } - + + @Persistent public void setRedirectPort(int port) { connector.setRedirectPort(port); } - + + @Persistent public void setScheme(String scheme) { connector.setScheme(scheme); } - + + @Persistent public void setSecure(boolean secure) { connector.setSecure(secure); } @@ -240,23 +247,28 @@ Object value = connector.getAttribute("SSLEnabled"); return value == null ? false : new Boolean(value.toString()).booleanValue(); } - + + @Persistent public void setSslEnabled(boolean sslEnabled) { connector.setAttribute("SSLEnabled", sslEnabled); } - + + @Persistent public void setUriEncoding(String uriEncoding) { connector.setURIEncoding(uriEncoding); } - + + @Persistent public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) { connector.setUseBodyEncodingForURI(useBodyEncodingForURI); } - + + @Persistent public void setUseIPVHosts(boolean useIPVHosts) { connector.setUseIPVHosts(useIPVHosts); } - + + @Persistent public void setXpoweredBy(boolean xpoweredBy) { connector.setXpoweredBy(xpoweredBy); } Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorWrapperGBeanStarter.java Mon Sep 7 15:36:52 2009 @@ -74,7 +74,8 @@ String uniqueName = TomcatServerGBean.ConnectorName.get(conn); if (uniqueName == null) { - uniqueName = conn.getProtocol() + "_" + conn.getAttribute("host") + "_" + conn.getPort(); + //don't build connector generated by ConnectorGBean once again. + return; } AbstractName containerAbstractName = kernel.getAbstractNameFor(container); @@ -161,6 +162,7 @@ Connector[] connectors = server.getService(null).findConnectors(); for (Connector conn : connectors) { + this.buildConnectorGBean(classLoader, kernel, conn, container); } } Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -24,6 +24,7 @@ import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; @@ -128,19 +129,23 @@ public String getSslPassword() { return (String) connector.getAttribute("SSLPassword"); } - + + @Persistent public void setPollTime(int pollTime) { connector.setAttribute("pollTime", pollTime); } - + + @Persistent public void setPollerSize(int pollerSize) { connector.setAttribute("pollerSize", pollerSize); } - + + @Persistent public void setSendfileSize(int sendfileSize) { connector.setAttribute("sendfileSize", sendfileSize); } - + + @Persistent public void setSslCACertificateFile(String sslCACertificateFile) { if (sslCACertificateFile != null && sslCACertificateFile.equals("")) sslCACertificateFile = null; @@ -150,7 +155,8 @@ else connector.setAttribute("SSLCACertificateFile", serverInfo.resolveServerPath(caCertificateFile)); } - + + @Persistent public void setSslCACertificatePath(String sslCACertificatePath) { if (sslCACertificatePath != null && sslCACertificatePath.equals("")) sslCACertificatePath = null; @@ -160,7 +166,8 @@ else connector.setAttribute("SSLCACertificatePath", serverInfo.resolveServerPath(caCertificatePath)); } - + + @Persistent public void setSslCertificateChainFile(String sslCertificateChainFile) { if (sslCertificateChainFile != null && sslCertificateChainFile.equals("")) sslCertificateChainFile = null; @@ -170,7 +177,8 @@ else connector.setAttribute("SSLCertificateChainFile", serverInfo.resolveServerPath(certificateChainFile)); } - + + @Persistent public void setSslCertificateFile(String sslCertificateFile) { if (sslCertificateFile != null && sslCertificateFile.equals("")) sslCertificateFile = null; @@ -180,7 +188,8 @@ else connector.setAttribute("SSLCertificateFile", serverInfo.resolveServerPath(certificateFile)); } - + + @Persistent public void setSslCertificateKeyFile(String sslCertificateKeyFile) { if (sslCertificateKeyFile != null && sslCertificateKeyFile.equals("")) sslCertificateKeyFile = null; @@ -190,21 +199,25 @@ else connector.setAttribute("SSLCertificateKeyFile", serverInfo.resolveServerPath(certificateKeyFile)); } - + + @Persistent public void setSslCipherSuite(String sslCipherSuite) { connector.setAttribute("SSLCipherSuite", sslCipherSuite); } - + + @Persistent public void setSslPassword(String sslPassword) { if (sslPassword != null && sslPassword.equals("")) sslPassword = null; connector.setAttribute("SSLPassword", sslPassword); } + @Persistent public void setSslProtocol(String sslProtocol) { connector.setAttribute("SSLProtocol", sslProtocol); } - + + @Persistent public void setSslCARevocationFile(String sslCARevocationFile) { if (sslCARevocationFile!= null && sslCARevocationFile.equals("")) sslCARevocationFile = null; @@ -214,7 +227,8 @@ else connector.setAttribute("SSLCARevocationFile", serverInfo.resolveServerPath(revocationFile)); } - + + @Persistent public void setSslCARevocationPath(String sslCARevocationPath) { if (sslCARevocationPath!= null && sslCARevocationPath.equals("")) sslCARevocationPath = null; @@ -225,15 +239,18 @@ connector.setAttribute("SSLCARevocationPath", serverInfo.resolveServerPath(revocationPath)); } - + + @Persistent public void setSslVerifyClient(String sslVerifyClient) { connector.setAttribute("SSLVerifyClient", sslVerifyClient); } - + + @Persistent public void setSslVerifyDepth(int sslVerifyDepth) { connector.setAttribute("SSLVerifyDepth", sslVerifyDepth); } - + + @Persistent public void setUseSendfile(boolean useSendfile) { connector.setAttribute("useSendfile", useSendfile); } Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java?rev=812199&r1=812198&r2=812199&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java Mon Sep 7 15:36:52 2009 @@ -24,6 +24,7 @@ import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; import org.apache.geronimo.gbean.annotation.ParamReference; +import org.apache.geronimo.gbean.annotation.Persistent; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; @@ -219,139 +220,173 @@ Object value = connector.getAttribute("useSendfile"); return value == null ? true : new Boolean(value.toString()).booleanValue(); } - + + @Persistent public void setAcceptorThreadCount(int acceptorThreadCount) { connector.setAttribute("acceptorThreadCount", new Integer(acceptorThreadCount)); } - + + @Persistent public void setAcceptorThreadPriority(int acceptorThreadPriority) { connector.setAttribute("acceptorThreadPriority", new Integer(acceptorThreadPriority)); } - + + @Persistent public void setCommand_line_options(boolean command_line_options) { connector.setAttribute("command-line-options", new Boolean(command_line_options)); } - + + @Persistent public void setOomParachute(int oomParachute) { connector.setAttribute("oomParachute", new Integer(oomParachute)); } - + + @Persistent public void setPollerThreadCount(int pollerThreadCount) { connector.setAttribute("pollerThreadCount", new Integer(pollerThreadCount)); } + @Persistent public void setPollerThreadPriority(int pollerThreadPriority) { connector.setAttribute("pollerThreadPriority", new Integer(pollerThreadPriority)); } - + + @Persistent public void setProcessCache(int processCache) { connector.setAttribute("processCache", new Integer(processCache)); } - + + @Persistent public void setSelectorPool_maxSelectors(int selectorPool_maxSelectors) { connector.setAttribute("selectorPool.maxSelectors", new Integer(selectorPool_maxSelectors)); } - + + @Persistent public void setSelectorPool_maxSpareSelectors(int selectorPool_maxSpareSelectors) { connector.setAttribute("selectorPool.maxSpareSelectors", new Integer(selectorPool_maxSpareSelectors)); } - + + @Persistent public void setSelectorTimeout(int selectorTimeout) { connector.setAttribute("selectorTimeout", new Integer(selectorTimeout)); } - + + @Persistent public void setSocket_appReadBufSize(int socket_appReadBufSize) { connector.setAttribute("socket.appReadBufSize", new Integer(socket_appReadBufSize)); } - + + @Persistent public void setSocket_appWriteBufSize(int socket_appWriteBufSize) { connector.setAttribute("socket.appWriteBufSize", new Integer(socket_appWriteBufSize)); } - + + @Persistent public void setSocket_bufferPool(int socket_bufferPool) { connector.setAttribute("socket.bufferPool", new Integer(socket_bufferPool)); } - + + @Persistent public void setSocket_bufferPoolSize(int socket_bufferPoolSize) { connector.setAttribute("socket.bufferPoolSize", new Integer(socket_bufferPoolSize)); } - + + @Persistent public void setSocket_directBuffer(boolean socket_directBuffer) { connector.setAttribute("socket.directBuffer", new Boolean(socket_directBuffer)); } - + + @Persistent public void setSocket_eventCache(int socket_eventCache) { connector.setAttribute("socket.eventCache", new Integer(socket_eventCache)); } - + + @Persistent public void setSocket_keyCache(int socket_keyCache) { connector.setAttribute("socket.keyCache", new Integer(socket_keyCache)); } - + + @Persistent public void setSocket_ooBInline(boolean socket_ooBInline) { connector.setAttribute("socket.ooBInline", new Boolean(socket_ooBInline)); } - + + @Persistent public void setSocket_performanceBandwidth(int socket_performanceBandwidth) { connector.setAttribute("socket.performanceBandwidth", new Integer(socket_performanceBandwidth)); } - + + @Persistent public void setSocket_performanceConnectionTime(int socket_performanceConnectionTime) { connector.setAttribute("socket.performanceConnectionTime", new Integer(socket_performanceConnectionTime)); } - + + @Persistent public void setSocket_performanceLatency(int socket_performanceLatency) { connector.setAttribute("socket.performanceLatency", new Integer(socket_performanceLatency)); } - + + @Persistent public void setSocket_processorCache(int socket_processorCache) { connector.setAttribute("socket.processorCache", new Integer(socket_processorCache)); } - + + @Persistent public void setSocket_rxBufSize(int socket_rxBufSize) { connector.setAttribute("socket.rxBufSize", new Integer(socket_rxBufSize)); } - + + @Persistent public void setSocket_soKeepAlive(boolean socket_soKeepAlive) { connector.setAttribute("socket.soKeepAlive", new Boolean(socket_soKeepAlive)); } - + + @Persistent public void setSocket_soLingerOn(boolean socket_soLingerOn) { connector.setAttribute("socket.soLingerOn", new Boolean(socket_soLingerOn)); } - + + @Persistent public void setSocket_soLingerTime(int socket_soLingerTime) { connector.setAttribute("socket.soLingerTime", new Integer(socket_soLingerTime)); } - + + @Persistent public void setSocket_soReuseAddress(boolean socket_soReuseAddress) { connector.setAttribute("socket.soReuseAddress", new Boolean(socket_soReuseAddress)); } - + + @Persistent public void setSocket_soTimeout(int socket_soTimeout) { connector.setAttribute("socket.soTimeout", new Integer(socket_soTimeout)); } - + + @Persistent public void setSocket_soTrafficClass(int socket_soTrafficClass) { connector.setAttribute("socket.soTrafficClass", new Integer(socket_soTrafficClass)); } - + + @Persistent public void setSocket_tcpNoDelay(boolean socket_tcpNoDelay) { connector.setAttribute("socket.tcpNoDelay", new Boolean(socket_tcpNoDelay)); } - + + @Persistent public void setSocket_txBufSize(int socket_txBufSize) { connector.setAttribute("socket.txBufSize", new Integer(socket_txBufSize)); } - + + @Persistent public void setUseComet(boolean useComet) { connector.setAttribute("useExecutor", new Boolean(useComet)); } - + + @Persistent public void setUseExecutor(boolean useExecutor) { connector.setAttribute("useExecutor", new Boolean(useExecutor)); } - + + @Persistent public void setUseSendfile(boolean useSendfile) { connector.setAttribute("useSendfile", new Boolean(useSendfile)); } Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java ------------------------------------------------------------------------------ svn:eol-style = native