You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/06/04 15:05:04 UTC
svn commit: r544146 - in /geronimo/server/trunk:
assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Author: akulshreshtha
Date: Mon Jun 4 06:05:04 2007
New Revision: 544146
URL: http://svn.apache.org/viewvc?view=rev&rev=544146
Log:
Enabled AJP connector for jetty
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=544146&r1=544145&r2=544146
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Mon Jun 4 06:05:04 2007
@@ -117,7 +117,7 @@
<attribute name="port">${PlanHTTPPortPrimary + portOffset}</attribute>
<attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
</gbean>
- <gbean name="JettyAJP13Connector" load="false">
+ <gbean name="JettyAJP13Connector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanAJPPortPrimary + portOffset}</attribute>
<attribute name="redirectPort">${PlanHTTPSPortPrimary + portOffset}</attribute>
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=544146&r1=544145&r2=544146
==============================================================================
--- 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 Mon Jun 4 06:05:04 2007
@@ -82,11 +82,9 @@
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);
}
- // 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 + "'");
}
@@ -134,11 +132,7 @@
* connectors for).
*/
public String[] getSupportedProtocols() {
- return new String[]{PROTOCOL_HTTP, PROTOCOL_HTTPS};
- //
- // AJP Connector is not yet supported by Jetty
- // so leave out 'PROTOCOL_AJP' for now
- //
+ return new String[]{PROTOCOL_HTTP, PROTOCOL_HTTPS, PROTOCOL_AJP};
}
/**