You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/08/15 03:45:53 UTC

svn commit: r232687 - in /geronimo/trunk/modules/tomcat/src: java/org/apache/geronimo/tomcat/ConnectorGBean.java test/org/apache/geronimo/tomcat/ContainerTest.java

Author: jgenender
Date: Sun Aug 14 18:45:50 2005
New Revision: 232687

URL: http://svn.apache.org/viewcvs?rev=232687&view=rev
Log:
Added name attribute to the connector

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java?rev=232687&r1=232686&r2=232687&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java Sun Aug 14 18:45:50 2005
@@ -46,6 +46,10 @@
     public ConnectorGBean(String name, String protocol, Map initParams, TomcatContainer container, ServerInfo serverInfo) throws Exception {
         super(); // TODO: make it an attribute
         
+        if (name == null){
+            throw new IllegalArgumentException("name cannot be null.");
+        }
+
         if (container == null){
             throw new IllegalArgumentException("container cannot be null.");
         }

Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=232687&r1=232686&r2=232687&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java Sun Aug 14 18:45:50 2005
@@ -291,6 +291,7 @@
        initParams.clear();
        initParams.put("port","8080");
        connector = new GBeanData(connectorName, ConnectorGBean.GBEAN_INFO);
+       connector.setAttribute("name", "HTTP");
        connector.setAttribute("initParams", initParams);
        connector.setReferencePattern("TomcatContainer", containerName);
        connector.setReferencePattern("ServerInfo", serverInfoName);