geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r169333 - in /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat: ConnectorGBean.java HostGBean.java
Date Mon, 09 May 2005 15:39:36 GMT
Author: jgenender
Date: Mon May  9 08:39:35 2005
New Revision: 169333

URL: http://svn.apache.org/viewcvs?rev=169333&view=rev
Log:
Added protocol as Connector attribute and cleaned up imports

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.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=169333&r1=169332&r2=169333&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
Mon May  9 08:39:35 2005
@@ -30,7 +30,7 @@
     private final Connector connector;
     private final TomcatContainer container;
 
-    public ConnectorGBean(Map initParams, TomcatContainer container) throws Exception {
+    public ConnectorGBean(String protocol, Map initParams, TomcatContainer container) throws
Exception {
         super(); // TODO: make it an attribute
         
         if (container == null){
@@ -40,7 +40,7 @@
         this.container = container;
                 
         //Create the Connector object
-        connector = new Connector();
+        connector = new Connector(protocol);
         
         //Set the parameters
         setParameters(connector, initParams);
@@ -68,10 +68,11 @@
 
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("TomcatConnector", ConnectorGBean.class);
+        infoFactory.addAttribute("protocol", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
         infoFactory.addReference("TomcatContainer", TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addOperation("getInternalObject");
-        infoFactory.setConstructor(new String[] { "initParams", "TomcatContainer"});
+        infoFactory.setConstructor(new String[] { "protocol", "initParams", "TomcatContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

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=169333&r1=169332&r2=169333&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 Mon May
 9 08:39:35 2005
@@ -23,7 +23,6 @@
 import org.apache.catalina.Host;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
-import org.apache.catalina.core.StandardEngine;
 import org.apache.catalina.core.StandardHost;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;



Mime
View raw message