From scm-return-38184-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Sep 03 03:06:44 2009 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 12529 invoked from network); 3 Sep 2009 03:06:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Sep 2009 03:06:44 -0000 Received: (qmail 45403 invoked by uid 500); 3 Sep 2009 03:06:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 45258 invoked by uid 500); 3 Sep 2009 03:06:43 -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 45249 invoked by uid 99); 3 Sep 2009 03:06:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 03:06:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 03:06:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 483C823888DB; Thu, 3 Sep 2009 03:06:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810766 [2/2] - in /geronimo/server/branches/2.2: framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/ plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ plugi... Date: Thu, 03 Sep 2009 03:06:20 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090903030621.483C823888DB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java Thu Sep 3 03:06:18 2009 @@ -20,16 +20,27 @@ import java.util.Map; -import org.apache.geronimo.gbean.GBeanInfo; -import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.catalina.connector.Connector; +import org.apache.geronimo.gbean.annotation.GBean; +import org.apache.geronimo.gbean.annotation.ParamAttribute; +import org.apache.geronimo.gbean.annotation.ParamReference; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; +@GBean(name="Tomcat Connector HTTPS APR") public class Https11APRConnectorGBean extends Http11APRConnectorGBean { - public Https11APRConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception { - super(name, initParams, host, port, container, serverInfo); + public Https11APRConnectorGBean(@ParamAttribute(name = "name") String name, + @ParamAttribute(name = "initParams") Map initParams, + @ParamAttribute(name = "host") String host, + @ParamAttribute(name = "port") int port, + @ParamReference(name = "TomcatContainer") TomcatContainer container, + @ParamReference(name = "ServerInfo") ServerInfo serverInfo, + @ParamAttribute(name = "connector") Connector conn) throws Exception { + + super(name, initParams, host, port, container, serverInfo, conn); + setSslEnabled(true); setScheme("https"); setSecure(true); @@ -42,16 +53,5 @@ public String getGeronimoProtocol(){ return WebManager.PROTOCOL_HTTPS; } - - public static final GBeanInfo GBEAN_INFO; - static { - GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector HTTPS APR", Https11APRConnectorGBean.class, Http11APRConnectorGBean.GBEAN_INFO); - infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer", "ServerInfo"}); - GBEAN_INFO = infoFactory.getBeanInfo(); - } - - public static GBeanInfo getGBeanInfo() { - return GBEAN_INFO; - } } Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java Thu Sep 3 03:06:18 2009 @@ -20,16 +20,26 @@ import java.util.Map; -import org.apache.geronimo.gbean.GBeanInfo; -import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.catalina.connector.Connector; +import org.apache.geronimo.gbean.annotation.GBean; +import org.apache.geronimo.gbean.annotation.ParamAttribute; +import org.apache.geronimo.gbean.annotation.ParamReference; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; +@GBean(name="Tomcat Connector HTTPS BIO") public class Https11ConnectorGBean extends Http11ConnectorGBean { - public Https11ConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception { - super(name, initParams, host, port, container, serverInfo); + public Https11ConnectorGBean(@ParamAttribute(name = "name") String name, + @ParamAttribute(name = "initParams") Map initParams, + @ParamAttribute(name = "host") String host, + @ParamAttribute(name = "port") int port, + @ParamReference(name = "TomcatContainer") TomcatContainer container, + @ParamReference(name = "ServerInfo") ServerInfo serverInfo, + @ParamAttribute(name = "connector") Connector conn) throws Exception { + + super(name, initParams, host, port, container, serverInfo, conn); setSslEnabled(true); setScheme("https"); setSecure(true); @@ -42,16 +52,5 @@ public String getGeronimoProtocol(){ return WebManager.PROTOCOL_HTTPS; } - - public static final GBeanInfo GBEAN_INFO; - - static { - GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector HTTPS BIO", Https11ConnectorGBean.class, Http11ConnectorGBean.GBEAN_INFO); - infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer", "ServerInfo"}); - GBEAN_INFO = infoFactory.getBeanInfo(); - } - - public static GBeanInfo getGBeanInfo() { - return GBEAN_INFO; - } + } Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java Thu Sep 3 03:06:18 2009 @@ -20,16 +20,26 @@ import java.util.Map; -import org.apache.geronimo.gbean.GBeanInfo; -import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.catalina.connector.Connector; +import org.apache.geronimo.gbean.annotation.GBean; +import org.apache.geronimo.gbean.annotation.ParamAttribute; +import org.apache.geronimo.gbean.annotation.ParamReference; import org.apache.geronimo.management.geronimo.WebManager; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.TomcatContainer; +@GBean(name="Tomcat Connector HTTPS NIO") public class Https11NIOConnectorGBean extends Http11NIOConnectorGBean { - public Https11NIOConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception { - super(name, initParams, host, port, container, serverInfo); + public Https11NIOConnectorGBean(@ParamAttribute(name = "name") String name, + @ParamAttribute(name = "initParams") Map initParams, + @ParamAttribute(name = "host") String host, + @ParamAttribute(name = "port") int port, + @ParamReference(name = "TomcatContainer") TomcatContainer container, + @ParamReference(name = "ServerInfo") ServerInfo serverInfo, + @ParamAttribute(name = "connector") Connector conn) throws Exception { + + super(name, initParams, host, port, container, serverInfo, conn); setSslEnabled(true); setScheme("https"); setSecure(true); @@ -43,15 +53,4 @@ return WebManager.PROTOCOL_HTTPS; } - public static final GBeanInfo GBEAN_INFO; - - static { - GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector HTTPS NIO", Https11NIOConnectorGBean.class, Http11NIOConnectorGBean.GBEAN_INFO); - infoFactory.setConstructor(new String[] { "name", "initParams", "host", "port", "TomcatContainer", "ServerInfo"}); - GBEAN_INFO = infoFactory.getBeanInfo(); - } - - public static GBeanInfo getGBeanInfo() { - return GBEAN_INFO; - } } Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java Thu Sep 3 03:06:18 2009 @@ -12,7 +12,6 @@ import java.util.Map; import java.util.List; import java.util.ArrayList; -import java.lang.reflect.Constructor; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -26,6 +25,7 @@ import org.apache.catalina.LifecycleListener; import org.apache.catalina.Service; import org.apache.catalina.Executor; +import org.apache.geronimo.tomcat.TomcatServerGBean; import org.apache.xbean.recipe.ObjectRecipe; import org.apache.xbean.recipe.Option; import org.apache.tomcat.util.IntrospectionUtils; @@ -607,7 +607,11 @@ java.util.concurrent.Executor.class.getName(), cl); - } else { + } else if("name".equals(name)){ + + TomcatServerGBean.ConnectorName.put(connector, entry.getValue()); + + } else{ connector.setProperty(name, entry.getValue()); } } @@ -615,6 +619,7 @@ for (ListenerType listenerType : getListener()) { LifecycleListener listener = listenerType.getLifecycleListener(cl); connector.addLifecycleListener(listener); + TomcatServerGBean.LifecycleListeners.add(listener); } return connector; } Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Thu Sep 3 03:06:18 2009 @@ -187,7 +187,7 @@ container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(), null, null, null, engine, null, serverInfo, null, null); container.doStart(); - connector = new Http11ConnectorGBean("HTTP", null, "localhost", port++, container, serverInfo); + connector = new Http11ConnectorGBean("HTTP", null, "localhost", port++, container, serverInfo,null); connector.doStart(); TransactionManagerImpl transactionManager = new TransactionManagerImpl(); Modified: geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml?rev=810766&r1=810765&r2=810766&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml (original) +++ geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml Thu Sep 3 03:06:18 2009 @@ -62,7 +62,8 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - - - + + TomcatServer + @@ -83,6 +86,15 @@ TomcatServer + + + + TomcatServer + + + TomcatWebContainer + +