Author: markt
Date: Tue Aug 31 19:13:01 2010
New Revision: 991296
URL: http://svn.apache.org/viewvc?rev=991296&view=rev
Log:
Re-factoring. Preparing for Http11AprProtocol to extend AbstractHttp11Protocol
Added:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Added:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=991296&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(added)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Tue Aug 31 19:13:01 2010
@@ -0,0 +1,101 @@
+/*
+ * 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.coyote.http11;
+
+public abstract class AbstractHttp11JsseProtocol
+ extends AbstractHttp11Protocol {
+
+ public String getAlgorithm() { return endpoint.getAlgorithm();}
+ public void setAlgorithm(String s ) { endpoint.setAlgorithm(s);}
+
+ public String getClientAuth() { return endpoint.getClientAuth();}
+ public void setClientAuth(String s ) { endpoint.setClientAuth(s);}
+
+ public String getKeystoreFile() { return endpoint.getKeystoreFile();}
+ public void setKeystoreFile(String s ) { endpoint.setKeystoreFile(s);}
+
+ public String getKeystorePass() { return endpoint.getKeystorePass();}
+ public void setKeystorePass(String s ) { endpoint.setKeystorePass(s);}
+
+ public String getKeystoreType() { return endpoint.getKeystoreType();}
+ public void setKeystoreType(String s ) { endpoint.setKeystoreType(s);}
+
+ public String getKeystoreProvider() {
+ return endpoint.getKeystoreProvider();
+ }
+ public void setKeystoreProvider(String s ) {
+ endpoint.setKeystoreProvider(s);
+ }
+
+ public String getSslProtocol() { return endpoint.getSslProtocol();}
+ public void setSslProtocol(String s) { endpoint.setSslProtocol(s);}
+
+ public String getCiphers() { return endpoint.getCiphers();}
+ public void setCiphers(String s) { endpoint.setCiphers(s);}
+
+ public String getKeyAlias() { return endpoint.getKeyAlias();}
+ public void setKeyAlias(String s ) { endpoint.setKeyAlias(s);}
+
+ public String getKeyPass() { return endpoint.getKeyPass();}
+ public void setKeyPass(String s ) { endpoint.setKeyPass(s);}
+
+ public void setTruststoreFile(String f){ endpoint.setTruststoreFile(f);}
+ public String getTruststoreFile(){ return endpoint.getTruststoreFile();}
+
+ public void setTruststorePass(String p){ endpoint.setTruststorePass(p);}
+ public String getTruststorePass(){return endpoint.getTruststorePass();}
+
+ public void setTruststoreType(String t){ endpoint.setTruststoreType(t);}
+ public String getTruststoreType(){ return endpoint.getTruststoreType();}
+
+ public void setTruststoreProvider(String t){
+ endpoint.setTruststoreProvider(t);
+ }
+ public String getTruststoreProvider(){
+ return endpoint.getTruststoreProvider();
+ }
+
+ public void setTruststoreAlgorithm(String a){
+ endpoint.setTruststoreAlgorithm(a);
+ }
+ public String getTruststoreAlgorithm(){
+ return endpoint.getTruststoreAlgorithm();
+ }
+
+ public void setTrustMaxCertLength(String s){
+ endpoint.setTrustMaxCertLength(s);
+ }
+ public String getTrustMaxCertLength(){
+ return endpoint.getTrustMaxCertLength();
+ }
+
+ public void setCrlFile(String s){endpoint.setCrlFile(s);}
+ public String getCrlFile(){ return endpoint.getCrlFile();}
+
+ public void setSessionCacheSize(String s){endpoint.setSessionCacheSize(s);}
+ public String getSessionCacheSize(){ return
endpoint.getSessionCacheSize();}
+
+ public void setSessionTimeout(String s){endpoint.setSessionTimeout(s);}
+ public String getSessionTimeout(){ return endpoint.getSessionTimeout();}
+
+ public void setAllowUnsafeLegacyRenegotiation(String s) {
+ endpoint.setAllowUnsafeLegacyRenegotiation(s);
+ }
+ public String getAllowUnsafeLegacyRenegotiation() {
+ return endpoint.getAllowUnsafeLegacyRenegotiation();
+ }
+}
Propchange:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=991296&r1=991295&r2=991296&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
Aug 31 19:13:01 2010
@@ -334,71 +334,6 @@ public abstract class AbstractHttp11Prot
public int getSoLinger() { return endpoint.getSoLinger(); }
public void setSoLinger(int soLinger) { endpoint.setSoLinger(soLinger); }
-
- // JSSE SSL attrbutes
- public String getAlgorithm() { return endpoint.getAlgorithm();}
- public void setAlgorithm(String s ) { endpoint.setAlgorithm(s);}
-
- public String getClientAuth() { return endpoint.getClientAuth();}
- public void setClientAuth(String s ) { endpoint.setClientAuth(s);}
-
- public String getKeystoreFile() { return endpoint.getKeystoreFile();}
- public void setKeystoreFile(String s ) { endpoint.setKeystoreFile(s);}
-
- public String getKeystorePass() { return endpoint.getKeystorePass();}
- public void setKeystorePass(String s ) { endpoint.setKeystorePass(s);}
-
- public String getKeystoreType() { return endpoint.getKeystoreType();}
- public void setKeystoreType(String s ) { endpoint.setKeystoreType(s);}
-
- public String getKeystoreProvider() { return
endpoint.getKeystoreProvider();}
- public void setKeystoreProvider(String s ) {
endpoint.setKeystoreProvider(s);}
-
- public String getSslProtocol() { return endpoint.getSslProtocol();}
- public void setSslProtocol(String s) { endpoint.setSslProtocol(s);}
-
- public String getCiphers() { return endpoint.getCiphers();}
- public void setCiphers(String s) { endpoint.setCiphers(s);}
-
- public String getKeyAlias() { return endpoint.getKeyAlias();}
- public void setKeyAlias(String s ) { endpoint.setKeyAlias(s);}
-
- public String getKeyPass() { return endpoint.getKeyPass();}
- public void setKeyPass(String s ) { endpoint.setKeyPass(s);}
-
- public void setTruststoreFile(String f){ endpoint.setTruststoreFile(f);}
- public String getTruststoreFile(){ return endpoint.getTruststoreFile();}
-
- public void setTruststorePass(String p){ endpoint.setTruststorePass(p);}
- public String getTruststorePass(){return endpoint.getTruststorePass();}
-
- public void setTruststoreType(String t){ endpoint.setTruststoreType(t);}
- public String getTruststoreType(){ return endpoint.getTruststoreType();}
-
- public void setTruststoreProvider(String
t){endpoint.setTruststoreProvider(t);}
- public String getTruststoreProvider(){ return
endpoint.getTruststoreProvider();}
-
- public void setTruststoreAlgorithm(String
a){endpoint.setTruststoreAlgorithm(a);}
- public String getTruststoreAlgorithm(){ return
endpoint.getTruststoreAlgorithm();}
-
- public void setTrustMaxCertLength(String
s){endpoint.setTrustMaxCertLength(s);}
- public String getTrustMaxCertLength(){ return
endpoint.getTrustMaxCertLength();}
-
- public void setCrlFile(String s){endpoint.setCrlFile(s);}
- public String getCrlFile(){ return endpoint.getCrlFile();}
-
- public void setSessionCacheSize(String s){endpoint.setSessionCacheSize(s);}
- public String getSessionCacheSize(){ return
endpoint.getSessionCacheSize();}
-
- public void setSessionTimeout(String s){endpoint.setSessionTimeout(s);}
- public String getSessionTimeout(){ return endpoint.getSessionTimeout();}
-
- public void setAllowUnsafeLegacyRenegotiation(String s) {
- endpoint.setAllowUnsafeLegacyRenegotiation(s);
- }
- public String getAllowUnsafeLegacyRenegotiation() {
- return endpoint.getAllowUnsafeLegacyRenegotiation();
- }
@Override
public abstract void init() throws Exception;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=991296&r1=991295&r2=991296&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Aug
31 19:13:01 2010
@@ -48,7 +48,7 @@ import org.apache.tomcat.util.net.jsse.J
* @author Costin Manolache
* @author Filip Hanik
*/
-public class Http11NioProtocol extends AbstractHttp11Protocol {
+public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=991296&r1=991295&r2=991296&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Tue Aug 31
19:13:01 2010
@@ -48,7 +48,7 @@ import org.apache.tomcat.util.net.Socket
* @author Remy Maucherat
* @author Costin Manolache
*/
-public class Http11Protocol extends AbstractHttp11Protocol {
+public class Http11Protocol extends AbstractHttp11JsseProtocol {
private static final org.apache.juli.logging.Log log
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
