remm 2004/09/14 06:20:03
Modified: catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
- Fix classname of the connector.
- Remove socket factory.
Revision Changes Path
1.21 +2 -34
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Embedded.java 29 Aug 2004 16:46:13 -0000 1.20
+++ Embedded.java 14 Sep 2004 13:20:03 -0000 1.21
@@ -177,16 +177,6 @@
/**
- * The socket factory that will be used when a <code>secure</code>
- * Connector is created. If a standard Connector is created, the
- * internal (to the Connector class default socket factory class)
- * will be used instead.
- */
- protected String socketFactory =
- "org.apache.catalina.net.SSLSocketFactory";
-
-
- /**
* Has this component been started yet?
*/
protected boolean started = false;
@@ -248,28 +238,6 @@
}
-
- /**
- * Return the secure socket factory class name.
- */
- public String getSocketFactory() {
-
- return (this.socketFactory);
-
- }
-
-
- /**
- * Set the secure socket factory class name.
- *
- * @param socketFactory The new secure socket factory class name
- */
- public void setSocketFactory(String socketFactory) {
-
- this.socketFactory = socketFactory;
-
- }
-
public void setAwait(boolean b) {
await = b;
}
@@ -414,7 +382,7 @@
try {
Class clazz =
- Class.forName("org.apache.coyote.tomcat5.CoyoteConnector");
+ Class.forName("org.apache.catalina.connector.Connector");
connector = (Connector) clazz.newInstance();
if (address != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
