geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
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 08:07:08 GMT
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();
>      }
>
>


Mime
View raw message