geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r560392 - /geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
Date Fri, 27 Jul 2007 21:35:52 GMT
Author: jgenender
Date: Fri Jul 27 14:35:51 2007
New Revision: 560392

URL: http://svn.apache.org/viewvc?view=rev&rev=560392
Log:
Add APR connectors

Added:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11Protocol.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?view=diff&rev=560392&r1=560391&r2=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -33,13 +33,7 @@
 import org.apache.geronimo.tomcat.TomcatContainer;
 import org.apache.geronimo.tomcat.stats.ConnectorStats;
 
-public abstract class BaseHttp11ConnectorGBean extends ConnectorGBean implements Http11Protocol,
StatisticsProvider {
-
-    private String keystoreFileName;
-
-    private String truststoreFileName;
-
-    private String algorithm;
+public abstract class BaseHttp11ConnectorGBean extends ConnectorGBean implements BaseHttp11Protocol,
StatisticsProvider {
 
     protected String connectHost;
     
@@ -97,93 +91,6 @@
     
     public abstract int getDefaultPort();
 
-    // Generic SSL
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    public String getCiphers() {
-        return (String) connector.getAttribute("ciphers");
-    }
-
-    public boolean getClientAuth() {
-        Object value = connector.getAttribute("clientAuth");
-        return value == null ? false : new Boolean(value.toString()).booleanValue();
-    }
-
-    public String getKeyAlias() {
-        return (String) connector.getAttribute("keyAlias");
-    }
-
-    public String getKeystoreFile() {
-        return keystoreFileName;
-    }
-
-    public String getKeystoreType() {
-        return (String) connector.getAttribute("keystoreType");
-    }
-
-    public String getSslProtocol() {
-        return (String) connector.getAttribute("sslProtocol");
-    }
-
-    public String getTruststoreFile() {
-        return truststoreFileName;
-    }
-
-    public String getTruststoreType() {
-        return (String) connector.getAttribute("truststoreType");
-    }
-
-    public void setAlgorithm(String algorithm) {
-        this.algorithm = algorithm;
-        if ("default".equalsIgnoreCase(algorithm)) {
-            algorithm = KeyManagerFactory.getDefaultAlgorithm();
-        }
-        connector.setAttribute("algorithm", algorithm);
-    }
-
-    public void setCiphers(String ciphers) {
-        connector.setAttribute("ciphers", ciphers);
-    }
-
-    public void setClientAuth(boolean clientAuth) {
-        connector.setAttribute("clientAuth", new Boolean(clientAuth));
-    }
-
-    public void setKeyAlias(String keyAlias) {
-        connector.setAttribute("keyAlias", keyAlias);
-    }
-
-    public void setKeystoreFile(String keystoreFile) {
-        keystoreFileName = keystoreFile;
-        connector.setAttribute("keystoreFile", serverInfo.resolveServerPath(keystoreFileName));
-    }
-
-    public void setKeystorePass(String keystorePass) {
-        connector.setAttribute("keystorePass", keystorePass);
-    }
-
-    public void setKeystoreType(String keystoreType) {
-        connector.setAttribute("keystoreType", keystoreType);
-    }
-
-    public void setSslProtocol(String sslProtocol) {
-        connector.setAttribute("sslProtocol", sslProtocol);
-    }
-
-    public void setTruststoreFile(String truststoreFile) {
-        truststoreFileName = truststoreFile;
-        connector.setAttribute("truststoreFile", serverInfo.resolveServerPath(truststoreFileName));
-    }
-
-    public void setTruststorePass(String truststorePass) {
-        connector.setAttribute("truststorePass", truststorePass);
-    }
-
-    public void setTruststoreType(String truststoreType) {
-        connector.setAttribute("truststoreType", truststoreType);
-    }
 
     // Generic HTTP
     public int getAcceptCount() {

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?view=diff&rev=560392&r1=560391&r2=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -73,7 +73,7 @@
             throw new IllegalArgumentException("serverInfo cannot be null.");
         }
         
-        initProtocol();
+        tomcatProtocol = validateProtocol(tomcatProtocol);
 
         this.name = name;
         this.container = container;
@@ -115,7 +115,7 @@
      * Ensures that this implementation can handle the requested protocol.
      * @param protocol
      */
-    protected void initProtocol() {}
+    protected String validateProtocol(String tomcatProtocol) { return tomcatProtocol;}
     
     public abstract int getDefaultPort();
     

Added: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?view=auto&rev=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
(added)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.tomcat.connector;
+
+import java.util.Map;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.tomcat.TomcatContainer;
+
+public class Http11APRConnectorGBean extends BaseHttp11ConnectorGBean implements Http11APRProtocol
{
+
+    public Http11APRConnectorGBean(String name, Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", address, port,
container, serverInfo);
+    }
+
+    @Override
+    public int getDefaultPort() {
+        return 80;
+    }
+
+    @Override
+    public String getGeronimoProtocol() {
+        return WebManager.PROTOCOL_HTTP;
+    }
+
+    public int getPollTime() {
+        Object value = connector.getAttribute("pollTime");
+        return value == null ? 2000 : new Integer(value.toString()).intValue();
+    }
+
+    public int getPollerSize() {
+        Object value = connector.getAttribute("pollerSize");
+        return value == null ? 8192 : new Integer(value.toString()).intValue();
+    }
+
+    public int getSendfileSize() {
+        Object value = connector.getAttribute("sendfileSize");
+        return value == null ? 8192 : new Integer(value.toString()).intValue();
+    }
+
+    public String getSslCACertificateFile() {
+        return (String) connector.getAttribute("SSLCACertificateFile");
+    }
+
+    public String getSslCACertificatePath() {
+        return (String) connector.getAttribute("SSLCACertificatePath");
+    }
+
+    public String getSslCertificateChainFile() {
+        return (String) connector.getAttribute("SSLCertificateChainFile");
+    }
+
+    public String getSslCertificateFile() {
+        return (String) connector.getAttribute("SSLCertificateFile");
+    }
+
+    public String getSslCertificateKeyFile() {
+        return (String) connector.getAttribute("SSLCertificateKeyFile");
+    }
+
+    public String getSslCipherSuite() {
+        return (String) connector.getAttribute("SSLCipherSuite");
+    }
+    
+    public String getSslProtocol() {
+        return (String) connector.getAttribute("SSLProtocol");
+    }
+
+    public String getSslCARevocationFile() {
+        return (String) connector.getAttribute("SSLCARevocationFile");
+    }
+
+    public String getSslCARevocationPath() {
+        return (String) connector.getAttribute("SSLCARevocationPath");
+    }
+
+    public String getSslVerifyClient() {
+        return (String) connector.getAttribute("SSLVerifyClient");
+    }
+
+    public int getSslVerifyDepth() {
+        Object value = connector.getAttribute("SSLVerifyDepth");
+        return value == null ? 10 : new Integer(value.toString()).intValue();
+    }
+
+    public boolean getUseSendfile() {
+        Object value = connector.getAttribute("useSendfile");
+        return value == null ? true : new Boolean(value.toString()).booleanValue();
+    }
+
+    public void setPollTime(int pollTime) {
+        connector.setAttribute("pollTime", pollTime);
+    }
+
+    public void setPollerSize(int pollerSize) {
+        connector.setAttribute("pollerSize", pollerSize);
+    }
+
+    public void setSendfileSize(int sendfileSize) {
+        connector.setAttribute("sendfileSize", sendfileSize);
+    }
+
+    public void setSslCACertificateFile(String sslCACertificateFile) {
+        connector.setAttribute("SSLCACertificateFile", sslCACertificateFile);
+    }
+
+    public void setSslCACertificatePath(String sslCACertificatePath) {
+        connector.setAttribute("SSLCACertificatePath", sslCACertificatePath);
+    }
+
+    public void setSslCertificateChainFile(String sslCertificateChainFile) {
+        connector.setAttribute("SSLCertificateChainFile", sslCertificateChainFile);
+    }
+
+    public void setSslCertificateFile(String sslCertificateFile) {
+        connector.setAttribute("SSLCertificateFile", sslCertificateFile);
+    }
+
+    public void setSslCertificateKeyFile(String sslCertificateKeyFile) {
+        connector.setAttribute("SSLCertificateKeyFile", sslCertificateKeyFile);
+    }
+
+    public void setSslCipherSuite(String sslCipherSuite) {
+        connector.setAttribute("SSLCipherSuite", sslCipherSuite);
+    }
+
+    public void setSslPassword(String sslPassword) {
+        connector.setAttribute("SSLPassword", sslPassword);
+    }
+    
+    public void setSslProtocol(String sslProtocol) {
+        connector.setAttribute("SSLProtocol", sslProtocol);
+    }
+
+    public void setSslCARevocationFile(String sslCARevocationFile) {
+        connector.setAttribute("SSLCARevocationFile", sslCARevocationFile);
+    }
+
+    public void setSslCARevocationPath(String sslCARevocationPath) {
+        connector.setAttribute("SSLCARevocationPath", sslCARevocationPath);
+    }
+
+    public void setSslVerifyClient(String sslVerifyClient) {
+        connector.setAttribute("SSLVerifyClient", sslVerifyClient);
+    }
+
+    public void setSslVerifyDepth(int sslVerifyDepth) {
+        connector.setAttribute("SSLVerifyDepth", sslVerifyDepth);
+    }
+
+    public void setUseSendfile(boolean useSendfile) {
+        connector.setAttribute("useSendfile", useSendfile);
+    }
+    
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11APRConnectorGBean.class, BaseHttp11ConnectorGBean.GBEAN_INFO);
+        infoFactory.addInterface(Http11APRProtocol.class, 
+                new String[] {
+                    //APR Attributes
+                    "pollTime",
+                    "pollerSize",
+                    "useSendfile",
+                    "sendfileSize",
+                    //SSL Attributes
+                    "sslProtocol",
+                    "sslCipherSuite",
+                    "sslCertificateFile",
+                    "sslCertificateKeyFile",
+                    "sslPassword",
+                    "sslVerifyClient",
+                    "sslVerifyDepth",
+                    "sslCACertificateFile",
+                    "sslCACertificatePath",
+                    "sslCertificateChainFile",
+                    "sslCARevocationFile",
+                    "sslCARevocationPath"
+                },
+                new String[] {
+                    //APR Attributes
+                    "pollTime",
+                    "pollerSize",
+                    "useSendfile",
+                    "sendfileSize",
+                    //SSL Attributes
+                    "sslProtocol",
+                    "sslCipherSuite",
+                    "sslCertificateFile",
+                    "sslCertificateKeyFile",
+                    "sslPassword",
+                    "sslVerifyClient",
+                    "sslVerifyDepth",
+                    "sslCACertificateFile",
+                    "sslCACertificatePath",
+                    "sslCertificateChainFile",
+                    "sslCARevocationFile",
+                    "sslCARevocationPath"
+                }
+        );
+        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+    
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Added: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?view=auto&rev=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
(added)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
Fri Jul 27 14:35:51 2007
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.tomcat.connector;
+
+public interface Http11APRProtocol {
+    
+    //APR
+    public int getPollTime();
+    public void setPollTime(int pollTime);
+    public int getPollerSize();
+    public void setPollerSize(int pollerSize);
+    public boolean getUseSendfile();
+    public void setUseSendfile(boolean useSendfile);
+    public int getSendfileSize();
+    public void setSendfileSize(int sendfileSize);
+    
+    //SSL
+    public String getSslProtocol();
+    public void setSslProtocol(String sslProtocol);
+    public String getSslCipherSuite();
+    public void setSslCipherSuite(String sslCipherSuite);
+    public String getSslCertificateFile();
+    public void setSslCertificateFile(String sslCertificateFile);
+    public String getSslCertificateKeyFile();
+    public void setSslCertificateKeyFile(String sslCertificateKeyFile);
+    public void setSslPassword(String sslPassword);
+    public String getSslVerifyClient();
+    public void setSslVerifyClient(String sslVerifyClient);
+    public int getSslVerifyDepth();
+    public void setSslVerifyDepth(int sslVerifyDepth);
+    public String getSslCACertificateFile();
+    public void setSslCACertificateFile(String sslCACertificateFile);
+    public String getSslCACertificatePath();
+    public void setSslCACertificatePath(String sslCACertificatePath);
+    public String getSslCertificateChainFile();
+    public void setSslCertificateChainFile(String sslCertificateChainFile);
+    public String getSslCARevocationFile();
+    public void setSslCARevocationFile(String sslCARevocationFile);
+    public String getSslCARevocationPath();
+    public void setSslCARevocationPath(String sslCARevocationPath);
+
+}

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java?view=diff&rev=560392&r1=560391&r2=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -22,33 +22,30 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.tomcat.TomcatContainer;
 
-public class Http11ConnectorGBean extends BaseHttp11ConnectorGBean {
-
-    public Http11ConnectorGBean(String name, Map initParams, String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
+public class Http11ConnectorGBean extends AbstractHttp11ConnectorGBean {
+    
+    public Http11ConnectorGBean(String name, Map initParams,  String address, int port, TomcatContainer
container, ServerInfo serverInfo) throws Exception {
         super(name, initParams, "org.apache.coyote.http11.Http11Protocol", address, port,
container, serverInfo);
     }
-
+    
     public int getDefaultPort() {
         return 80; 
     }  
     
-    public String getGeronimoProtocol(){
-        return WebManager.PROTOCOL_HTTP;
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
     }
     
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11ConnectorGBean.class, BaseHttp11ConnectorGBean.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11ConnectorGBean.class, AbstractHttp11ConnectorGBean.GBEAN_INFO);
         infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
     
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
+    
 }

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java?view=diff&rev=560392&r1=560391&r2=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -26,7 +26,7 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.tomcat.TomcatContainer;
 
-public class Http11NIOConnectorGBean extends BaseHttp11ConnectorGBean implements Http11NIOProtocol{
+public class Http11NIOConnectorGBean extends AbstractHttp11ConnectorGBean implements Http11NIOProtocol{
 
     public Http11NIOConnectorGBean(String name,  Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
         super(name, initParams, "org.apache.coyote.http11.Http11NioProtocol", address, port,
container, serverInfo);
@@ -348,8 +348,8 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11NIOConnectorGBean.class, BaseHttp11ConnectorGBean.GBEAN_INFO);
-        infoFactory.addInterface(Http11Protocol.class, 
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Http11NIOConnectorGBean.class, AbstractHttp11ConnectorGBean.GBEAN_INFO);
+        infoFactory.addInterface(Http11NIOProtocol.class, 
                 new String[] {
                     "useSendfile", 
                     "useExecutor", 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11Protocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11Protocol.java?view=diff&rev=560392&r1=560391&r2=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11Protocol.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11Protocol.java
Fri Jul 27 14:35:51 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.geronimo.tomcat.connector;
 
-public interface Http11Protocol extends BaseHttp11Protocol {
+public interface Http11Protocol {
 
     //Https
     public String getAlgorithm();

Added: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java?view=auto&rev=560392
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
(added)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
Fri Jul 27 14:35:51 2007
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.tomcat.connector;
+
+import java.util.Map;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.tomcat.TomcatContainer;
+
+public class Https11APRConnectorGBean extends Http11APRConnectorGBean {
+
+    public Https11APRConnectorGBean(String name, Map initParams, String address, int port,
TomcatContainer container, ServerInfo serverInfo) throws Exception {
+        super(name, initParams, address, port, container, serverInfo);
+        setSslEnabled(true);
+        setScheme("https");
+        setSecure(true);
+    }
+    
+    public int getDefaultPort() {
+        return 443; 
+    }  
+    
+    public String getGeronimoProtocol(){
+        return WebManager.PROTOCOL_HTTPS;
+    }
+    
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Tomcat Connector",
Https11APRConnectorGBean.class, Http11APRConnectorGBean.GBEAN_INFO);
+        infoFactory.setConstructor(new String[] { "name", "initParams", "address", "port",
"TomcatContainer", "ServerInfo"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+    
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }    
+}



Mime
View raw message