tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
Date Tue, 27 Jun 2000 22:29:51 GMT
costin      00/06/27 15:29:51

  Modified:    src/share/org/apache/tomcat/request SimpleMapper1.java
               src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  - removed debug=0 from SimpleMapper. Thanks Carlos Pita <carlos@aper.net>
  - added back the "secure" in addSecureEndpoint. You need JSSE in classpath to
  use the method.
  
  Submitted by:	Carlos Pita <carlos@aper.net>
  
  Revision  Changes    Path
  1.12      +0 -1      jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java
  
  Index: SimpleMapper1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/SimpleMapper1.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SimpleMapper1.java	2000/06/23 02:16:21	1.11
  +++ SimpleMapper1.java	2000/06/27 22:29:48	1.12
  @@ -125,7 +125,6 @@
   	// set-up a per/container note for maps
   	ctExtMapNote = cm.getNoteId( ContextManager.CONTAINER_NOTE,
   				     "map.extension");
  -	debug=0;
       }
   
       /** Called when a context is added.
  
  
  
  1.11      +3 -3      jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EmbededTomcat.java	2000/06/23 02:16:26	1.10
  +++ EmbededTomcat.java	2000/06/27 22:29:50	1.11
  @@ -126,9 +126,9 @@
   	if( addr != null ) sc.setAttribute( "vhost_address", addr );
   	if( hostname != null ) sc.setAttribute( "vhost_name", hostname );
   
  -// 	sc.setAttribute( "socketFactory",
  -// 			 "org.apache.tomcat.net.SSLSocketFactory");
  -	System.out.println("XXX " + keyFile + " " + keyPass);
  +	sc.setAttribute( "socketFactory",
  +			 "org.apache.tomcat.net.SSLSocketFactory");
  +	//	System.out.println("XXX " + keyFile + " " + keyPass);
   	sc.setTcpConnectionHandler( new HttpConnectionHandler());
   	// XXX add the secure socket
   	
  
  
  

Mime
View raw message