Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 43327 invoked from network); 26 May 2007 08:07:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 May 2007 08:07:12 -0000 Received: (qmail 97922 invoked by uid 500); 26 May 2007 08:07:11 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 97869 invoked by uid 500); 26 May 2007 08:07:11 -0000 Mailing-List: contact dev-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 dev@geronimo.apache.org Received: (qmail 97858 invoked by uid 99); 26 May 2007 08:07:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 May 2007 01:07:10 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [69.147.95.72] (HELO smtp109.plus.mail.sp1.yahoo.com) (69.147.95.72) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 26 May 2007 01:07:04 -0700 Received: (qmail 35313 invoked from network); 26 May 2007 08:06:43 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Received:X-YMail-OSG:Mime-Version:In-Reply-To:References:Content-Type:Message-Id:Content-Transfer-Encoding:From:Subject:Date:To:X-Mailer; b=zsXTFe24OY//IbIPbXxAv6ChziT5+kVPtxzmY5VRdPY37sVgihJBXNEVVTZQEbtEnlL0t+8sz0CUxy73wFwszqO9XGpIdqpygBizy/I4C1KyLmnUzhXjyktz9MWb2F0U8J5+kf+PZLibhrwY1rYwFcLpQNhqeNDhflLDRw34Th8= ; Received: from unknown (HELO ?10.11.55.8?) (david_jencks@63.105.20.225 with plain) by smtp109.plus.mail.sp1.yahoo.com with SMTP; 26 May 2007 08:06:43 -0000 X-YMail-OSG: i6kIhLkVM1nOuQ5ueVpz7d1Rj18gIYs7AwMQPJIz0IAYYO1boT1xrpD7HQRP3plHH0NzxSQ6kR.9fLLbZYXZWBkIwg5IgW0lIdXV.go1zsQZDtOPGMcvomheLcWj Mime-Version: 1.0 (Apple Message framework v752.3) In-Reply-To: <20070526024616.96FAB1A981A@eris.apache.org> References: <20070526024616.96FAB1A981A@eris.apache.org> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <9A193DD1-8542-438C-ADB1-84825489C626@yahoo.com> Content-Transfer-Encoding: 7bit From: David Jencks Subject: Re: svn commit: r541850 - in /geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6: JettyManagerImpl.java connector/JettyConnector.java Date: Sat, 26 May 2007 01:07:08 -0700 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.752.3) X-Virus-Checked: Checked by ClamAV on apache.org This might be a bit misleading since I think there is in fact an ajp connector for jetty, we just haven't wrapped it yet. thanks david jencks On May 25, 2007, at 7:46 PM, akulshreshtha@apache.org wrote: > Author: akulshreshtha > Date: Fri May 25 19:46:15 2007 > New Revision: 541850 > > URL: http://svn.apache.org/viewvc?view=rev&rev=541850 > Log: > GERONIMO-2773 - Removed minThreads, tcpNoDelay attributes from > JettyConnector, and added protocol, Mark AJP as unsupported protocol > > Modified: > geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/JettyManagerImpl.java > geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/connector/JettyConnector.java > > Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/ > java/org/apache/geronimo/jetty6/JettyManagerImpl.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ > JettyManagerImpl.java?view=diff&rev=541850&r1=541849&r2=541850 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/JettyManagerImpl.java (original) > +++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/JettyManagerImpl.java Fri May 25 19:46:15 2007 > @@ -82,14 +82,18 @@ > AbstractNameQuery query = new AbstractNameQuery > (KeystoreManager.class.getName()); > connector.setReferencePattern("KeystoreManager", query); > //todo: default HTTPS settings > - } else if (protocol.equals(PROTOCOL_AJP)) { > - connector = new GBeanData(name, > AJP13Connector.GBEAN_INFO); > - } else { > + } > + // Note: AJP Connector is not yet supported by Jetty > + // else if (protocol.equals(PROTOCOL_AJP)) { > + // connector = new GBeanData(name, > AJP13Connector.GBEAN_INFO); > + //} > + else { > throw new IllegalArgumentException("Invalid protocol > '" + protocol + "'"); > } > connector.setAttribute("host", host); > connector.setAttribute("port", new Integer(port)); > - connector.setAttribute("minThreads", new Integer(10)); > + //connector.setAttribute("minThreads", new Integer(10)); > + connector.setAttribute("protocol", protocol); > connector.setAttribute("maxThreads", new Integer(50)); > connector.setReferencePattern > (JettyConnector.CONNECTOR_CONTAINER_REFERENCE, containerName); > EditableConfigurationManager mgr = > ConfigurationUtil.getEditableConfigurationManager(kernel); > @@ -130,7 +134,11 @@ > * connectors for). > */ > public String[] getSupportedProtocols() { > - return new String[]{PROTOCOL_HTTP, PROTOCOL_HTTPS, > PROTOCOL_AJP}; > + return new String[]{PROTOCOL_HTTP, PROTOCOL_HTTPS}; > + // > + // AJP Connector is not yet supported by Jetty > + // so leave out 'PROTOCOL_AJP' for now > + // > } > > /** > > Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/ > java/org/apache/geronimo/jetty6/connector/JettyConnector.java > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ > geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/ > JettyConnector.java?view=diff&rev=541850&r1=541849&r2=541850 > ====================================================================== > ======== > --- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/connector/JettyConnector.java (original) > +++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/ > apache/geronimo/jetty6/connector/JettyConnector.java Fri May 25 > 19:46:15 2007 > @@ -236,8 +236,11 @@ > static { > GBeanInfoBuilder infoFactory = > GBeanInfoBuilder.createStatic("Jetty HTTP Connector", > JettyConnector.class); > infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, > JettyContainer.class, NameFactory.GERONIMO_SERVICE); > - infoFactory.addInterface(JettyWebConnector.class, new > String[]{"host", "port", "minThreads", "maxThreads", > "bufferSizeBytes", "acceptQueueSize", "lingerMillis", "tcpNoDelay", > "redirectPort", "connectUrl", "maxIdleTimeMs"}, > - new String[]{"host", "port", "redirectPort", > "maxThreads", "minThreads"}); > + // removed 'minThreads' from persistent and manageable > String[] > + // removed 'tcpNoDelay' from persistent String[] > + // added 'protocol' to persistent and manageable String[] > + infoFactory.addInterface(JettyWebConnector.class, new > String[]{"host", "port", "minThreads", "maxThreads", > "bufferSizeBytes", "acceptQueueSize", "lingerMillis", "protocol", > "redirectPort", "connectUrl", "maxIdleTimeMs"}, > + new String[]{"host", "port", "redirectPort", > "maxThreads", "minThreads", "protocol"}); > infoFactory.setConstructor(new String[]{"JettyContainer"}); > GBEAN_INFO = infoFactory.getBeanInfo(); > } > >