cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java
amyroh 02/05/01 19:07:03
Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteServerSocketFactory.java
Log:
Add missing public for getFactory. Couldn't access the method through
reflection without being public.
Revision ChangesPath
1.2 +1 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
Index: CoyoteServerSocketFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CoyoteServerSocketFactory.java9 Apr 2002 17:47:07 - 1.1
+++ CoyoteServerSocketFactory.java2 May 2002 02:07:03 - 1.2
@@ -158,7 +158,7 @@
*/
private String keystorePass = changeit;
-String getKeystorePass() {
+public String getKeystorePass() {
return (this.keystorePass);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, May 01, 2002 7:07 PM Subject: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java amyroh 02/05/01 19:07:03 Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java Log: Add missing public for getFactory. Couldn't access the method through reflection without being public. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteSe rverSocketFactory.java I had thought that we had agreed to deprecate this one (in favor of some day being able to get PureTLS working in 4.1.x). Not that I object to Amy's change, but I hate to see her wasting her time on something that is going away. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java
- Original Message - From: [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, May 01, 2002 8:19 PM Subject: Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java On Wed, 1 May 2002, Bill Barker wrote: Add missing public for getFactory. Couldn't access the method through reflection without being public. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteSe rverSocketFactory.java I had thought that we had agreed to deprecate this one (in favor of some day being able to get PureTLS working in 4.1.x). Not that I object to Amy's change, but I hate to see her wasting her time on something that is going away. I thought PureTLS was working in 4.1.x ( and coyote ). At least the networking code has all the hooks, there are just few problems with the certs. Is there any additional problem ? The problem is that o.a.c.tomcat4 doesn't play nice with others ;-). PureTLS has additional attritubutes that aren't being passed through. This can be fixed easily enough by (like TC3.3) adding a set/getAttribute set/getProperty methods. The other problem is that the o.a.c.Request attributes aren't passed through to the ServletRequest (AFAIK, this should cause problems for JK2 as well). ( if we're going to deprecate, it would be good to do it before the release ) It doesn't serve any useful purpose anymore (the actual SocketFactory is in o.a.t.u.net), but I'd deprecate rather than remove (for now), since Coyote is also used in 4.0.x. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteServerSocketFactory.java CoyoteConnector2.java
remm02/04/09 10:47:07
Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector2.java
Added: coyote/src/java/org/apache/coyote/tomcat4
CoyoteServerSocketFactory.java
Log:
- Add a socket factory to allow configuring the SSL parameters.
Revision ChangesPath
1.4 +28 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector2.java
Index: CoyoteConnector2.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteConnector2.java 7 Apr 2002 21:11:17 - 1.3
+++ CoyoteConnector2.java 9 Apr 2002 17:47:07 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector2.java,v
1.3 2002/04/07 21:11:17 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/07 21:11:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector2.java,v
1.4 2002/04/09 17:47:07 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/09 17:47:07 $
*
*
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.3 $ $Date: 2002/04/07 21:11:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/09 17:47:07 $
*/
@@ -956,8 +956,30 @@
IntrospectionUtils.setProperty(protocolHandler, soTimeout,
+ connectionTimeout);
-// Configure socket factory
-// TODO
+IntrospectionUtils.setProperty(protocolHandler, secure,
++ secure);
+
+// Configure secure socket factory
+if (factory instanceof CoyoteServerSocketFactory) {
+CoyoteServerSocketFactory ssf = (CoyoteServerSocketFactory) factory;
+IntrospectionUtils.setProperty(protocolHandler, algorithm,
+ ssf.getAlgorithm());
+IntrospectionUtils.setProperty(protocolHandler, clientauth,
++ ssf.getClientAuth());
+IntrospectionUtils.setProperty(protocolHandler, keystore,
+ ssf.getKeystoreFile());
+IntrospectionUtils.setProperty(protocolHandler, keypass,
+ ssf.getKeystorePass());
+IntrospectionUtils.setProperty(protocolHandler, keytype,
+ ssf.getKeystoreType());
+IntrospectionUtils.setProperty(protocolHandler, protocol,
+ ssf.getProtocol());
+IntrospectionUtils.setProperty(protocolHandler,
+ sSLImplementation,
+ ssf.getSSLImplementation());
+IntrospectionUtils.setProperty(protocolHandler, socketFactory,
+ ssf.getSocketFactoryName());
+}
try {
protocolHandler.init();
1.1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
Index: CoyoteServerSocketFactory.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Tomcat, and Apache Software
*Foundation
