Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Message-ID: <20050818223849.700.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r233391 -
 /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
Date: Thu, 18 Aug 2005 22:38:48 -0000
To: scm@geronimo.apache.org
From: jgenender@apache.org

Author: jgenender
Date: Thu Aug 18 15:38:47 2005
New Revision: 233391

URL: http://svn.apache.org/viewcvs?rev=233391&view=rev
Log:
Added aliases attribute

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java?rev=233391&r1=233390&r2=233391&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java Thu Aug 18 15:38:47 2005
@@ -16,7 +16,9 @@
  */
 package org.apache.geronimo.tomcat;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.catalina.Host;
@@ -45,6 +47,7 @@
 
     public HostGBean(String className, 
             Map initParams, 
+            ArrayList aliases,
             ObjectRetriever realmGBean,            
             ValveGBean tomcatValveChain) throws Exception {
         super(); // TODO: make it an attribute
@@ -74,6 +77,14 @@
         //Set the parameters
         setParameters(host, initParams);
         
+        //Add aliases, if any
+        if (aliases != null){
+            for (Iterator iter = aliases.iterator(); iter.hasNext();) {
+                String alias = (String) iter.next();
+                host.addAlias(alias);
+            }
+        }
+        
         if (realmGBean != null)
             host.setRealm((Realm)realmGBean.getInternalObject());
 
@@ -99,11 +110,11 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started");
+        log.info("Started host name '" + host.getName() + "'");
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped");
+        log.info("Stopped host '" + host.getName() + "'");
     }
 
     public static final GBeanInfo GBEAN_INFO;
@@ -112,10 +123,11 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("TomcatHost", HostGBean.class, J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
+        infoFactory.addAttribute("aliases", ArrayList.class, true);
         infoFactory.addReference("RealmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
         infoFactory.addOperation("getInternalObject");
-        infoFactory.setConstructor(new String[] { "className", "initParams", "RealmGBean", "TomcatValveChain" });
+        infoFactory.setConstructor(new String[] { "className", "initParams", "aliases", "RealmGBean", "TomcatValveChain" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }