Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 77349 invoked from network); 15 Aug 2005 01:45:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Aug 2005 01:45:56 -0000 Received: (qmail 98622 invoked by uid 500); 15 Aug 2005 01:45:55 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 98613 invoked by uid 500); 15 Aug 2005 01:45:55 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 98600 invoked by uid 99); 15 Aug 2005 01:45:55 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2005 18:45:55 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 14 Aug 2005 18:46:16 -0700 Received: (qmail 77337 invoked by uid 65534); 15 Aug 2005 01:45:54 -0000 Message-ID: <20050815014554.77336.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232687 - in /geronimo/trunk/modules/tomcat/src: java/org/apache/geronimo/tomcat/ConnectorGBean.java test/org/apache/geronimo/tomcat/ContainerTest.java Date: Mon, 15 Aug 2005 01:45:53 -0000 To: scm@geronimo.apache.org From: jgenender@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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);