geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r560317 - in /geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector: AJP13ConnectorGBean.java Ajp13Protocol.java Http11ConnectorGBean.java
Date Fri, 27 Jul 2007 17:09:37 GMT
Author: jgenender
Date: Fri Jul 27 10:09:36 2007
New Revision: 560317

URL: http://svn.apache.org/viewvc?view=rev&rev=560317
Log:
Fix AJP reported port

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Ajp13Protocol.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java?view=diff&rev=560317&r1=560316&r2=560317
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
Fri Jul 27 10:09:36 2007
@@ -27,12 +27,13 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.management.StatisticsProvider;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.tomcat.TomcatContainer;
 import org.apache.geronimo.tomcat.stats.ConnectorStats;
 
-public class AJP13ConnectorGBean extends ConnectorGBean implements Ajp13Protocol{
+public class AJP13ConnectorGBean extends ConnectorGBean implements Ajp13Protocol, StatisticsProvider
{
     
     // JSR77 stats
     private ConnectorStats connStatsProvider = new ConnectorStats();
@@ -55,7 +56,7 @@
         }
 
         connector.setAttribute("address", address);
-        connector.setAttribute("port", port);
+        connector.setPort(port);
 
     }
     
@@ -248,6 +249,7 @@
                     "bufferSize", 
                     "connectionTimeout", 
                     "executor", 
+                    "host",
                     "keepAliveTimeout", 
                     "maxThreads",
                     "maxSpareThreads",
@@ -263,6 +265,7 @@
                     "bufferSize", 
                     "connectionTimeout", 
                     "executor", 
+                    "host",
                     "keepAliveTimeout", 
                     "maxThreads",
                     "maxSpareThreads",

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Ajp13Protocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Ajp13Protocol.java?view=diff&rev=560317&r1=560316&r2=560317
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Ajp13Protocol.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Ajp13Protocol.java
Fri Jul 27 10:09:36 2007
@@ -30,6 +30,8 @@
     public void setConnectionTimeout(int connectionTimeout);
     public String getExecutor();
     public void setExecutor(String executor);
+    public String getHost();
+    public void setHost(String address);
     public int getKeepAliveTimeout();
     public void setKeepAliveTimeout(int keepAliveTimeout);
     public int getMaxThreads();

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java?view=diff&rev=560317&r1=560316&r2=560317
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
Fri Jul 27 10:09:36 2007
@@ -29,7 +29,7 @@
 public class Http11ConnectorGBean extends BaseHttp11ConnectorGBean {
 
     public Http11ConnectorGBean(String name, Map initParams, String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, "HTTP/1.1", address, port, container, serverInfo);
+        super(name, initParams, "org.apache.coyote.http11.Http11Protocol", address, port,
container, serverInfo);
     }
 
     public int getDefaultPort() {



Mime
View raw message