You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2008/06/11 20:28:53 UTC
svn commit: r666772 - in
/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector:
Http11APRConnectorGBean.java Http11APRProtocol.java
Author: linsun
Date: Wed Jun 11 11:28:53 2008
New Revision: 666772
URL: http://svn.apache.org/viewvc?rev=666772&view=rev
Log:
GERONIMO-4114 - newly created APR HTTPS connector failed to start
Modified:
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=666772&r1=666771&r2=666772&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java Wed Jun 11 11:28:53 2008
@@ -1,281 +1,285 @@
-/*
- * 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 {
-
- private String certificateFile;
- private String certificateKeyFile;
- private String caCertificateFile;
- private String caCertificatePath;
- private String certificateChainFile;
- private String revocationPath;
- private String revocationFile;
-
- public Http11APRConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception {
- super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", host, 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 caCertificateFile;
- }
-
- public String getSslCACertificatePath() {
- return caCertificatePath;
- }
-
- public String getSslCertificateChainFile() {
- return certificateChainFile;
- }
-
- public String getSslCertificateFile() {
- return certificateFile;
- }
-
- public String getSslCertificateKeyFile() {
- return certificateKeyFile;
- }
-
- public String getSslCipherSuite() {
- return (String) connector.getAttribute("SSLCipherSuite");
- }
-
- public String getSslProtocol() {
- return (String) connector.getAttribute("SSLProtocol");
- }
-
- public String getSslCARevocationFile() {
- return revocationFile;
- }
-
- public String getSslCARevocationPath() {
- return revocationPath;
- }
-
- 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) {
- if (sslCACertificateFile != null && sslCACertificateFile.equals(""))
- sslCACertificateFile = null;
- caCertificateFile = sslCACertificateFile;
- if (caCertificateFile == null)
- connector.setAttribute("SSLCACertificateFile", null);
- else
- connector.setAttribute("SSLCACertificateFile", serverInfo.resolveServerPath(caCertificateFile));
- }
-
- public void setSslCACertificatePath(String sslCACertificatePath) {
- if (sslCACertificatePath != null && sslCACertificatePath.equals(""))
- sslCACertificatePath = null;
- caCertificatePath = sslCACertificatePath;
- if (caCertificatePath == null)
- connector.setAttribute("SSLCACertificatePath", null);
- else
- connector.setAttribute("SSLCACertificatePath", serverInfo.resolveServerPath(caCertificatePath));
- }
-
- public void setSslCertificateChainFile(String sslCertificateChainFile) {
- if (sslCertificateChainFile != null && sslCertificateChainFile.equals(""))
- sslCertificateChainFile = null;
- certificateChainFile = sslCertificateChainFile;
- if (certificateChainFile == null)
- connector.setAttribute("SSLCertificateChainFile", null);
- else
- connector.setAttribute("SSLCertificateChainFile", serverInfo.resolveServerPath(certificateChainFile));
- }
-
- public void setSslCertificateFile(String sslCertificateFile) {
- if (sslCertificateFile != null && sslCertificateFile.equals(""))
- sslCertificateFile = null;
- certificateFile = sslCertificateFile;
- if (certificateFile == null)
- connector.setAttribute("SSLCertificateFile", null);
- else
- connector.setAttribute("SSLCertificateFile", serverInfo.resolveServerPath(certificateFile));
- }
-
- public void setSslCertificateKeyFile(String sslCertificateKeyFile) {
- if (sslCertificateKeyFile != null && sslCertificateKeyFile.equals(""))
- sslCertificateKeyFile = null;
- certificateKeyFile = sslCertificateKeyFile;
- if (certificateKeyFile == null)
- connector.setAttribute("SSLCertificateKeyFile", null);
- else
- connector.setAttribute("SSLCertificateKeyFile", serverInfo.resolveServerPath(certificateKeyFile));
- }
-
- public void setSslCipherSuite(String sslCipherSuite) {
- connector.setAttribute("SSLCipherSuite", sslCipherSuite);
- }
-
- public void setSslPassword(String sslPassword) {
- if (sslPassword != null && sslPassword.equals(""))
- sslPassword = null;
- connector.setAttribute("SSLPassword", sslPassword);
- }
-
- public void setSslProtocol(String sslProtocol) {
- connector.setAttribute("SSLProtocol", sslProtocol);
- }
-
- public void setSslCARevocationFile(String sslCARevocationFile) {
- if (sslCARevocationFile!= null && sslCARevocationFile.equals(""))
- sslCARevocationFile = null;
- revocationFile = sslCARevocationFile;
- if (revocationFile == null)
- connector.setAttribute("SSLCARevocationFile", null);
- else
- connector.setAttribute("SSLCARevocationFile", serverInfo.resolveServerPath(revocationFile));
- }
-
- public void setSslCARevocationPath(String sslCARevocationPath) {
- if (sslCARevocationPath!= null && sslCARevocationPath.equals(""))
- sslCARevocationPath = null;
- revocationPath = sslCARevocationPath;
- if (revocationPath == null)
- connector.setAttribute("SSLCARevocationPath", null);
- else
- connector.setAttribute("SSLCARevocationPath", serverInfo.resolveServerPath(revocationPath));
-
- }
-
- 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 HTTP APR", 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", "host", "port", "TomcatContainer", "ServerInfo"});
- GBEAN_INFO = infoFactory.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
-}
+/*
+ * 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 {
+
+ private String certificateFile;
+ private String certificateKeyFile;
+ private String caCertificateFile;
+ private String caCertificatePath;
+ private String certificateChainFile;
+ private String revocationPath;
+ private String revocationFile;
+
+ public Http11APRConnectorGBean(String name, Map initParams, String host, int port, TomcatContainer container, ServerInfo serverInfo) throws Exception {
+ super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", host, 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 caCertificateFile;
+ }
+
+ public String getSslCACertificatePath() {
+ return caCertificatePath;
+ }
+
+ public String getSslCertificateChainFile() {
+ return certificateChainFile;
+ }
+
+ public String getSslCertificateFile() {
+ return certificateFile;
+ }
+
+ public String getSslCertificateKeyFile() {
+ return certificateKeyFile;
+ }
+
+ public String getSslCipherSuite() {
+ return (String) connector.getAttribute("SSLCipherSuite");
+ }
+
+ public String getSslProtocol() {
+ return (String) connector.getAttribute("SSLProtocol");
+ }
+
+ public String getSslCARevocationFile() {
+ return revocationFile;
+ }
+
+ public String getSslCARevocationPath() {
+ return revocationPath;
+ }
+
+ 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 String getSslPassword() {
+ return (String) connector.getAttribute("SSLPassword");
+ }
+
+ 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) {
+ if (sslCACertificateFile != null && sslCACertificateFile.equals(""))
+ sslCACertificateFile = null;
+ caCertificateFile = sslCACertificateFile;
+ if (caCertificateFile == null)
+ connector.setAttribute("SSLCACertificateFile", null);
+ else
+ connector.setAttribute("SSLCACertificateFile", serverInfo.resolveServerPath(caCertificateFile));
+ }
+
+ public void setSslCACertificatePath(String sslCACertificatePath) {
+ if (sslCACertificatePath != null && sslCACertificatePath.equals(""))
+ sslCACertificatePath = null;
+ caCertificatePath = sslCACertificatePath;
+ if (caCertificatePath == null)
+ connector.setAttribute("SSLCACertificatePath", null);
+ else
+ connector.setAttribute("SSLCACertificatePath", serverInfo.resolveServerPath(caCertificatePath));
+ }
+
+ public void setSslCertificateChainFile(String sslCertificateChainFile) {
+ if (sslCertificateChainFile != null && sslCertificateChainFile.equals(""))
+ sslCertificateChainFile = null;
+ certificateChainFile = sslCertificateChainFile;
+ if (certificateChainFile == null)
+ connector.setAttribute("SSLCertificateChainFile", null);
+ else
+ connector.setAttribute("SSLCertificateChainFile", serverInfo.resolveServerPath(certificateChainFile));
+ }
+
+ public void setSslCertificateFile(String sslCertificateFile) {
+ if (sslCertificateFile != null && sslCertificateFile.equals(""))
+ sslCertificateFile = null;
+ certificateFile = sslCertificateFile;
+ if (certificateFile == null)
+ connector.setAttribute("SSLCertificateFile", null);
+ else
+ connector.setAttribute("SSLCertificateFile", serverInfo.resolveServerPath(certificateFile));
+ }
+
+ public void setSslCertificateKeyFile(String sslCertificateKeyFile) {
+ if (sslCertificateKeyFile != null && sslCertificateKeyFile.equals(""))
+ sslCertificateKeyFile = null;
+ certificateKeyFile = sslCertificateKeyFile;
+ if (certificateKeyFile == null)
+ connector.setAttribute("SSLCertificateKeyFile", null);
+ else
+ connector.setAttribute("SSLCertificateKeyFile", serverInfo.resolveServerPath(certificateKeyFile));
+ }
+
+ public void setSslCipherSuite(String sslCipherSuite) {
+ connector.setAttribute("SSLCipherSuite", sslCipherSuite);
+ }
+
+ public void setSslPassword(String sslPassword) {
+ if (sslPassword != null && sslPassword.equals(""))
+ sslPassword = null;
+ connector.setAttribute("SSLPassword", sslPassword);
+ }
+
+ public void setSslProtocol(String sslProtocol) {
+ connector.setAttribute("SSLProtocol", sslProtocol);
+ }
+
+ public void setSslCARevocationFile(String sslCARevocationFile) {
+ if (sslCARevocationFile!= null && sslCARevocationFile.equals(""))
+ sslCARevocationFile = null;
+ revocationFile = sslCARevocationFile;
+ if (revocationFile == null)
+ connector.setAttribute("SSLCARevocationFile", null);
+ else
+ connector.setAttribute("SSLCARevocationFile", serverInfo.resolveServerPath(revocationFile));
+ }
+
+ public void setSslCARevocationPath(String sslCARevocationPath) {
+ if (sslCARevocationPath!= null && sslCARevocationPath.equals(""))
+ sslCARevocationPath = null;
+ revocationPath = sslCARevocationPath;
+ if (revocationPath == null)
+ connector.setAttribute("SSLCARevocationPath", null);
+ else
+ connector.setAttribute("SSLCARevocationPath", serverInfo.resolveServerPath(revocationPath));
+
+ }
+
+ 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 HTTP APR", 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", "host", "port", "TomcatContainer", "ServerInfo"});
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+
+}
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?rev=666772&r1=666771&r2=666772&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java Wed Jun 11 11:28:53 2008
@@ -1,58 +1,59 @@
-/*
- * 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);
-
-}
+/*
+ * 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 String getSslPassword();
+ 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);
+
+}
Re: svn commit: r666772 - in /geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector: Http11APRConnectorGBean.java Http11APRProtocol.java
Posted by Kevan Miller <ke...@gmail.com>.
Yuck. Looks like these files are missing properties (e.g. eol-style).
So, I assume all of these differences are Windows vs. Unix end-of-line
characters...
Any volunteers to get this sorted out?
--kevan
On Jun 11, 2008, at 2:28 PM, linsun@apache.org wrote:
> Author: linsun
> Date: Wed Jun 11 11:28:53 2008
> New Revision: 666772
>
> URL: http://svn.apache.org/viewvc?rev=666772&view=rev
> Log:
> GERONIMO-4114 - newly created APR HTTPS connector failed to start
>
> Modified:
> geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/
> Http11APRConnectorGBean.java
> geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java
>
> Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-
> tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
> Http11APRConnectorGBean.java
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=666772&r1=666771&r2=666772&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/
> Http11APRConnectorGBean.java (original)
> +++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/
> Http11APRConnectorGBean.java Wed Jun 11 11:28:53 2008
> @@ -1,281 +1,285 @@
> -/*
> - * 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 {
> -
> - private String certificateFile;
> - private String certificateKeyFile;
> - private String caCertificateFile;
> - private String caCertificatePath;
> - private String certificateChainFile;
> - private String revocationPath;
> - private String revocationFile;
> -
> - public Http11APRConnectorGBean(String name, Map initParams,
> String host, int port, TomcatContainer container, ServerInfo
> serverInfo) throws Exception {
> - super(name, initParams,
> "org.apache.coyote.http11.Http11AprProtocol", host, 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 caCertificateFile;
> - }
> -
> - public String getSslCACertificatePath() {
> - return caCertificatePath;
> - }
> -
> - public String getSslCertificateChainFile() {
> - return certificateChainFile;
> - }
> -
> - public String getSslCertificateFile() {
> - return certificateFile;
> - }
> -
> - public String getSslCertificateKeyFile() {
> - return certificateKeyFile;
> - }
> -
> - public String getSslCipherSuite() {
> - return (String) connector.getAttribute("SSLCipherSuite");
> - }
> -
> - public String getSslProtocol() {
> - return (String) connector.getAttribute("SSLProtocol");
> - }
> -
> - public String getSslCARevocationFile() {
> - return revocationFile;
> - }
> -
> - public String getSslCARevocationPath() {
> - return revocationPath;
> - }
> -
> - 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) {
> - if (sslCACertificateFile != null &&
> sslCACertificateFile.equals(""))
> - sslCACertificateFile = null;
> - caCertificateFile = sslCACertificateFile;
> - if (caCertificateFile == null)
> - connector.setAttribute("SSLCACertificateFile", null);
> - else
> - connector.setAttribute("SSLCACertificateFile",
> serverInfo.resolveServerPath(caCertificateFile));
> - }
> -
> - public void setSslCACertificatePath(String
> sslCACertificatePath) {
> - if (sslCACertificatePath != null &&
> sslCACertificatePath.equals(""))
> - sslCACertificatePath = null;
> - caCertificatePath = sslCACertificatePath;
> - if (caCertificatePath == null)
> - connector.setAttribute("SSLCACertificatePath", null);
> - else
> - connector.setAttribute("SSLCACertificatePath",
> serverInfo.resolveServerPath(caCertificatePath));
> - }
> -
> - public void setSslCertificateChainFile(String
> sslCertificateChainFile) {
> - if (sslCertificateChainFile != null &&
> sslCertificateChainFile.equals(""))
> - sslCertificateChainFile = null;
> - certificateChainFile = sslCertificateChainFile;
> - if (certificateChainFile == null)
> - connector.setAttribute("SSLCertificateChainFile", null);
> - else
> - connector.setAttribute("SSLCertificateChainFile",
> serverInfo.resolveServerPath(certificateChainFile));
> - }
> -
> - public void setSslCertificateFile(String sslCertificateFile) {
> - if (sslCertificateFile != null &&
> sslCertificateFile.equals(""))
> - sslCertificateFile = null;
> - certificateFile = sslCertificateFile;
> - if (certificateFile == null)
> - connector.setAttribute("SSLCertificateFile", null);
> - else
> - connector.setAttribute("SSLCertificateFile",
> serverInfo.resolveServerPath(certificateFile));
> - }
> -
> - public void setSslCertificateKeyFile(String
> sslCertificateKeyFile) {
> - if (sslCertificateKeyFile != null &&
> sslCertificateKeyFile.equals(""))
> - sslCertificateKeyFile = null;
> - certificateKeyFile = sslCertificateKeyFile;
> - if (certificateKeyFile == null)
> - connector.setAttribute("SSLCertificateKeyFile", null);
> - else
> - connector.setAttribute("SSLCertificateKeyFile",
> serverInfo.resolveServerPath(certificateKeyFile));
> - }
> -
> - public void setSslCipherSuite(String sslCipherSuite) {
> - connector.setAttribute("SSLCipherSuite", sslCipherSuite);
> - }
> -
> - public void setSslPassword(String sslPassword) {
> - if (sslPassword != null && sslPassword.equals(""))
> - sslPassword = null;
> - connector.setAttribute("SSLPassword", sslPassword);
> - }
> -
> - public void setSslProtocol(String sslProtocol) {
> - connector.setAttribute("SSLProtocol", sslProtocol);
> - }
> -
> - public void setSslCARevocationFile(String sslCARevocationFile) {
> - if (sslCARevocationFile!= null &&
> sslCARevocationFile.equals(""))
> - sslCARevocationFile = null;
> - revocationFile = sslCARevocationFile;
> - if (revocationFile == null)
> - connector.setAttribute("SSLCARevocationFile", null);
> - else
> - connector.setAttribute("SSLCARevocationFile",
> serverInfo.resolveServerPath(revocationFile));
> - }
> -
> - public void setSslCARevocationPath(String sslCARevocationPath) {
> - if (sslCARevocationPath!= null &&
> sslCARevocationPath.equals(""))
> - sslCARevocationPath = null;
> - revocationPath = sslCARevocationPath;
> - if (revocationPath == null)
> - connector.setAttribute("SSLCARevocationPath", null);
> - else
> - connector.setAttribute("SSLCARevocationPath",
> serverInfo.resolveServerPath(revocationPath));
> -
> - }
> -
> - 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 HTTP APR",
> 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", "host", "port", "TomcatContainer", "ServerInfo"});
> - GBEAN_INFO = infoFactory.getBeanInfo();
> - }
> -
> - public static GBeanInfo getGBeanInfo() {
> - return GBEAN_INFO;
> - }
> -
> -}
> +/*
> + * 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 {
> +
> + private String certificateFile;
> + private String certificateKeyFile;
> + private String caCertificateFile;
> + private String caCertificatePath;
> + private String certificateChainFile;
> + private String revocationPath;
> + private String revocationFile;
> +
> + public Http11APRConnectorGBean(String name, Map initParams,
> String host, int port, TomcatContainer container, ServerInfo
> serverInfo) throws Exception {
> + super(name, initParams,
> "org.apache.coyote.http11.Http11AprProtocol", host, 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 caCertificateFile;
> + }
> +
> + public String getSslCACertificatePath() {
> + return caCertificatePath;
> + }
> +
> + public String getSslCertificateChainFile() {
> + return certificateChainFile;
> + }
> +
> + public String getSslCertificateFile() {
> + return certificateFile;
> + }
> +
> + public String getSslCertificateKeyFile() {
> + return certificateKeyFile;
> + }
> +
> + public String getSslCipherSuite() {
> + return (String) connector.getAttribute("SSLCipherSuite");
> + }
> +
> + public String getSslProtocol() {
> + return (String) connector.getAttribute("SSLProtocol");
> + }
> +
> + public String getSslCARevocationFile() {
> + return revocationFile;
> + }
> +
> + public String getSslCARevocationPath() {
> + return revocationPath;
> + }
> +
> + 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 String getSslPassword() {
> + return (String) connector.getAttribute("SSLPassword");
> + }
> +
> + 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) {
> + if (sslCACertificateFile != null &&
> sslCACertificateFile.equals(""))
> + sslCACertificateFile = null;
> + caCertificateFile = sslCACertificateFile;
> + if (caCertificateFile == null)
> + connector.setAttribute("SSLCACertificateFile", null);
> + else
> + connector.setAttribute("SSLCACertificateFile",
> serverInfo.resolveServerPath(caCertificateFile));
> + }
> +
> + public void setSslCACertificatePath(String
> sslCACertificatePath) {
> + if (sslCACertificatePath != null &&
> sslCACertificatePath.equals(""))
> + sslCACertificatePath = null;
> + caCertificatePath = sslCACertificatePath;
> + if (caCertificatePath == null)
> + connector.setAttribute("SSLCACertificatePath", null);
> + else
> + connector.setAttribute("SSLCACertificatePath",
> serverInfo.resolveServerPath(caCertificatePath));
> + }
> +
> + public void setSslCertificateChainFile(String
> sslCertificateChainFile) {
> + if (sslCertificateChainFile != null &&
> sslCertificateChainFile.equals(""))
> + sslCertificateChainFile = null;
> + certificateChainFile = sslCertificateChainFile;
> + if (certificateChainFile == null)
> + connector.setAttribute("SSLCertificateChainFile", null);
> + else
> + connector.setAttribute("SSLCertificateChainFile",
> serverInfo.resolveServerPath(certificateChainFile));
> + }
> +
> + public void setSslCertificateFile(String sslCertificateFile) {
> + if (sslCertificateFile != null &&
> sslCertificateFile.equals(""))
> + sslCertificateFile = null;
> + certificateFile = sslCertificateFile;
> + if (certificateFile == null)
> + connector.setAttribute("SSLCertificateFile", null);
> + else
> + connector.setAttribute("SSLCertificateFile",
> serverInfo.resolveServerPath(certificateFile));
> + }
> +
> + public void setSslCertificateKeyFile(String
> sslCertificateKeyFile) {
> + if (sslCertificateKeyFile != null &&
> sslCertificateKeyFile.equals(""))
> + sslCertificateKeyFile = null;
> + certificateKeyFile = sslCertificateKeyFile;
> + if (certificateKeyFile == null)
> + connector.setAttribute("SSLCertificateKeyFile", null);
> + else
> + connector.setAttribute("SSLCertificateKeyFile",
> serverInfo.resolveServerPath(certificateKeyFile));
> + }
> +
> + public void setSslCipherSuite(String sslCipherSuite) {
> + connector.setAttribute("SSLCipherSuite", sslCipherSuite);
> + }
> +
> + public void setSslPassword(String sslPassword) {
> + if (sslPassword != null && sslPassword.equals(""))
> + sslPassword = null;
> + connector.setAttribute("SSLPassword", sslPassword);
> + }
> +
> + public void setSslProtocol(String sslProtocol) {
> + connector.setAttribute("SSLProtocol", sslProtocol);
> + }
> +
> + public void setSslCARevocationFile(String sslCARevocationFile) {
> + if (sslCARevocationFile!= null &&
> sslCARevocationFile.equals(""))
> + sslCARevocationFile = null;
> + revocationFile = sslCARevocationFile;
> + if (revocationFile == null)
> + connector.setAttribute("SSLCARevocationFile", null);
> + else
> + connector.setAttribute("SSLCARevocationFile",
> serverInfo.resolveServerPath(revocationFile));
> + }
> +
> + public void setSslCARevocationPath(String sslCARevocationPath) {
> + if (sslCARevocationPath!= null &&
> sslCARevocationPath.equals(""))
> + sslCARevocationPath = null;
> + revocationPath = sslCARevocationPath;
> + if (revocationPath == null)
> + connector.setAttribute("SSLCARevocationPath", null);
> + else
> + connector.setAttribute("SSLCARevocationPath",
> serverInfo.resolveServerPath(revocationPath));
> +
> + }
> +
> + 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 HTTP APR",
> 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", "host", "port", "TomcatContainer", "ServerInfo"});
> + GBEAN_INFO = infoFactory.getBeanInfo();
> + }
> +
> + public static GBeanInfo getGBeanInfo() {
> + return GBEAN_INFO;
> + }
> +
> +}
>
> Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-
> tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
> Http11APRProtocol.java
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?rev=666772&r1=666771&r2=666772&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/
> Http11APRProtocol.java (original)
> +++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/
> main/java/org/apache/geronimo/tomcat/connector/
> Http11APRProtocol.java Wed Jun 11 11:28:53 2008
> @@ -1,58 +1,59 @@
> -/*
> - * 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);
> -
> -}
> +/*
> + * 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 String getSslPassword();
> + 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);
> +
> +}
>
>