You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/07/05 09:05:01 UTC
svn commit: r1142903 - in
/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector:
Https11ConnectorGBean.java Https11NIOConnectorGBean.java Https11Protocol.java
Author: genspring
Date: Tue Jul 5 07:05:01 2011
New Revision: 1142903
URL: http://svn.apache.org/viewvc?rev=1142903&view=rev
Log:
Revert "GERONIMO-6027 https connector definition portlet patch from Shenghao Fang"
clientAuth=want is a legal value so that we can handle it as boolean. Please change the connector edit console behavior.
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11Protocol.java
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java?rev=1142903&r1=1142902&r2=1142903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java Tue Jul 5 07:05:01 2011
@@ -77,9 +77,9 @@ public class Https11ConnectorGBean exten
return (String) connector.getAttribute("ciphers");
}
- public boolean getClientAuth() {
+ public String getClientAuth() {
Object value = connector.getAttribute("clientAuth");
- return value == null ? false : Boolean.valueOf(value.toString());
+ return value == null ? "false" : value.toString();
}
public String getKeyAlias() {
@@ -137,8 +137,8 @@ public class Https11ConnectorGBean exten
}
@Persistent(manageable=false)
- public void setClientAuth(boolean clientAuth) {
- connector.setAttribute("clientAuth", Boolean.valueOf(clientAuth));
+ public void setClientAuth(String clientAuth) {
+ connector.setAttribute("clientAuth", clientAuth);
}
@Persistent(manageable=false)
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java?rev=1142903&r1=1142902&r2=1142903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java Tue Jul 5 07:05:01 2011
@@ -75,9 +75,9 @@ public class Https11NIOConnectorGBean ex
return (String) connector.getAttribute("ciphers");
}
- public boolean getClientAuth() {
+ public String getClientAuth() {
Object value = connector.getAttribute("clientAuth");
- return value == null ? false : Boolean.valueOf(value.toString());
+ return value == null ? "false" : value.toString();
}
public String getKeyAlias() {
@@ -135,8 +135,8 @@ public class Https11NIOConnectorGBean ex
}
@Persistent(manageable=false)
- public void setClientAuth(boolean clientAuth) {
- connector.setAttribute("clientAuth", Boolean.valueOf(clientAuth));
+ public void setClientAuth(String clientAuth) {
+ connector.setAttribute("clientAuth", clientAuth);
}
@Persistent(manageable=false)
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11Protocol.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11Protocol.java?rev=1142903&r1=1142902&r2=1142903&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11Protocol.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/Https11Protocol.java Tue Jul 5 07:05:01 2011
@@ -20,49 +20,28 @@ package org.apache.geronimo.tomcat.conne
public interface Https11Protocol {
- // Https
+ //Https
public String getAlgorithm();
-
public void setAlgorithm(String algorithm);
-
- public boolean getClientAuth();
-
- public void setClientAuth(boolean clientAuth);
-
+ public String getClientAuth();
+ public void setClientAuth(String clientAuth);
public String getKeystoreFile();
-
public void setKeystoreFile(String keystoreFile);
-
public String getKeystorePass();
-
public void setKeystorePass(String keystorePass);
-
public String getKeystoreType();
-
public void setKeystoreType(String keystoreType);
-
public String getSslProtocol();
-
public void setSslProtocol(String sslProtocol);
-
public String getCiphers();
-
public void setCiphers(String ciphers);
-
public String getKeyAlias();
-
public void setKeyAlias(String keyAlias);
-
public String getTruststoreFile();
-
public void setTruststoreFile(String truststoreFile);
-
public String getTruststorePass();
-
public void setTruststorePass(String truststorePass);
-
public String getTruststoreType();
-
public void setTruststoreType(String truststoreType);
}