geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r561409 - in /geronimo/server/trunk: configs/tomcat6/src/plan/ modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
Date Tue, 31 Jul 2007 17:50:47 GMT
Author: jgenender
Date: Tue Jul 31 10:50:46 2007
New Revision: 561409

URL: http://svn.apache.org/viewvc?view=rev&rev=561409
Log:
change to use host attribute instead of address

Modified:
    geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
    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/AbstractHttp11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java

Modified: geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml Tue Jul 31 10:50:46 2007
@@ -59,7 +59,7 @@
 
     <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.Http11ConnectorGBean">
         <attribute name="name">HTTP</attribute>
-        <attribute name="address">${PlanServerHostname}</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPPort}</attribute>
         <attribute name="maxHttpHeaderSize">8192</attribute>
         <attribute name="maxThreads">150</attribute>
@@ -80,7 +80,7 @@
 
     <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.connector.AJP13ConnectorGBean">
         <attribute name="name">AJP</attribute>
-        <attribute name="address">${PlanServerHostname}</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanAJPPort}</attribute>
         <attribute name="minSpareThreads">25</attribute>
         <attribute name="maxSpareThreads">75</attribute>
@@ -99,7 +99,7 @@
     -->
     <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.connector.Https11ConnectorGBean">
         <attribute name="name">HTTPS</attribute>
-        <attribute name="address">${PlanServerHostname}</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
         <attribute name="maxHttpHeaderSize">8192</attribute>
         <attribute name="maxThreads">150</attribute>

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=561409&r1=561408&r2=561409
==============================================================================
--- 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
Tue Jul 31 10:50:46 2007
@@ -42,12 +42,12 @@
 
     protected String connectHost;
 
-    public AJP13ConnectorGBean(String name, Map initParams, String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+    public AJP13ConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
         super(name, initParams, "AJP/1.3", container, serverInfo);
         
         // Default the host to listen on all address is one was not specified
-        if (address == null) {
-            address = "0.0.0.0";
+        if (host == null) {
+            host = "0.0.0.0";
         }
 
         // Must have a port
@@ -55,7 +55,7 @@
             throw new IllegalArgumentException("Must declare a port.");
         }
 
-        connector.setAttribute("address", address);
+        connector.setAttribute("host", host);
         connector.setPort(port);
 
     }
@@ -275,7 +275,7 @@
                     "tomcatAuthentication", 
                 }
         );
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -35,8 +35,8 @@
 
     private String algorithm;
     
-    public AbstractHttp11ConnectorGBean(String name, Map initParams, String tomcatProtocol,
String address, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception
{
-        super(name, initParams, tomcatProtocol, address, port, container, serverInfo);
+    public AbstractHttp11ConnectorGBean(String name, Map initParams, String tomcatProtocol,
String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception
{
+        super(name, initParams, tomcatProtocol, host, port, container, serverInfo);
     }
 
     @Override
@@ -171,7 +171,7 @@
                     "truststoreType"
                 }
         );
-        infoFactory.setConstructor(new String[] { "name", "initParams", "tomcatProtocol",
"address", "port", "TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "tomcatProtocol",
"host", "port", "TomcatContainer", "ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -42,12 +42,12 @@
 
     private boolean reset = true;
 
-    public BaseHttp11ConnectorGBean(String name, Map initParams, String tomcatProtocol, String
address, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception {
+    public BaseHttp11ConnectorGBean(String name, Map initParams, String tomcatProtocol, String
host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception {
         super(name, initParams, tomcatProtocol, container, serverInfo);
 
         // Default the host to listen on all address is one was not specified
-        if (address == null) {
-            address = "0.0.0.0";
+        if (host == null) {
+            host = "0.0.0.0";
         }
 
         // Must have a port
@@ -55,7 +55,7 @@
             throw new IllegalArgumentException("Must declare a port.");
         }
 
-        connector.setAttribute("address", address);
+        connector.setAttribute("host", host);
         connector.setPort(port);
 
     }
@@ -402,7 +402,7 @@
                     "truststoreType"
                 }
         );
-        infoFactory.setConstructor(new String[] { "name", "initParams", "protocol", "address",
"port", "TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "protocol", "host",
"port", "TomcatContainer", "ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -28,8 +28,8 @@
 
 public class Http11APRConnectorGBean extends BaseHttp11ConnectorGBean implements Http11APRProtocol
{
 
-    public Http11APRConnectorGBean(String name, Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", address, port,
container, serverInfo);
+    public Http11APRConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", host, port,
container, serverInfo);
     }
 
     @Override
@@ -217,7 +217,7 @@
                     "sslCARevocationPath"
                 }
         );
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

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=561409&r1=561408&r2=561409
==============================================================================
--- 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
Tue Jul 31 10:50:46 2007
@@ -27,8 +27,8 @@
 
 public class Http11ConnectorGBean extends AbstractHttp11ConnectorGBean {
     
-    public Http11ConnectorGBean(String name, Map initParams,  String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, "org.apache.coyote.http11.Http11Protocol", address, port,
container, serverInfo);
+    public Http11ConnectorGBean(String name, Map initParams,  String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, "org.apache.coyote.http11.Http11Protocol", host, port, container,
serverInfo);
     }
     
     public int getDefaultPort() {
@@ -43,7 +43,7 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11ConnectorGBean.class, AbstractHttp11ConnectorGBean.GBEAN_INFO);
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -28,8 +28,8 @@
 
 public class Http11NIOConnectorGBean extends AbstractHttp11ConnectorGBean implements Http11NIOProtocol{
 
-    public Http11NIOConnectorGBean(String name,  Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, "org.apache.coyote.http11.Http11NioProtocol", address, port,
container, serverInfo);
+    public Http11NIOConnectorGBean(String name,  Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, "org.apache.coyote.http11.Http11NioProtocol", host, port,
container, serverInfo);
     }
     
     public int getDefaultPort() {
@@ -422,7 +422,7 @@
 
                 }
         );
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -28,8 +28,8 @@
 
 public class Https11APRConnectorGBean extends Http11APRConnectorGBean {
 
-    public Https11APRConnectorGBean(String name, Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, address, port, container, serverInfo);
+    public Https11APRConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, host, port, container, serverInfo);
         setSslEnabled(true);
         setScheme("https");
         setSecure(true);
@@ -47,7 +47,7 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Https11APRConnectorGBean.class, Http11APRConnectorGBean.GBEAN_INFO);
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -28,8 +28,8 @@
 
 public class Https11ConnectorGBean extends Http11ConnectorGBean {
 
-    public Https11ConnectorGBean(String name, Map initParams, String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, address, port, container, serverInfo);
+    public Https11ConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, host, port, container, serverInfo);
         setSslEnabled(true);
         setScheme("https");
         setSecure(true);
@@ -47,7 +47,7 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Https11ConnectorGBean.class, Http11ConnectorGBean.GBEAN_INFO);
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java?view=diff&rev=561409&r1=561408&r2=561409
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
Tue Jul 31 10:50:46 2007
@@ -28,8 +28,8 @@
 
 public class Https11NIOConnectorGBean extends Http11NIOConnectorGBean {
 
-    public Https11NIOConnectorGBean(String name, Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
-        super(name, initParams, address, port, container, serverInfo);
+    public Https11NIOConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, host, port, container, serverInfo);
         setSslEnabled(true);
         setScheme("https");
         setSecure(true);
@@ -47,7 +47,7 @@
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Https11NIOConnectorGBean.class, Http11NIOConnectorGBean.GBEAN_INFO);
-        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer",
"ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     



Mime
View raw message