pier 01/09/16 22:10:55 Modified: catalina/src/share/org/apache/catalina/connector/warp Constants.java WarpConfigurationHandler.java WarpConnection.java WarpLogger.java WarpRequestHandler.java Log: 4.0 final integration. Revision Changes Path 1.5 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Constants.java Index: Constants.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Constants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Constants.java 2001/09/10 00:25:49 1.4 +++ Constants.java 2001/09/17 05:10:54 1.5 @@ -61,7 +61,7 @@ public static final String PACKAGE="org.apache.catalina.connector.warp"; /** Compile-in debug flag. */ - public static final boolean DEBUG=true; + public static final boolean DEBUG=false; /** * The WARP protocol major version. 1.6 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConfigurationHandler.java Index: WarpConfigurationHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConfigurationHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WarpConfigurationHandler.java 2001/08/27 19:10:25 1.5 +++ WarpConfigurationHandler.java 2001/09/17 05:10:54 1.6 @@ -294,7 +294,7 @@ if (!file.exists()) { logger.log("Cannot find \""+file.getPath()+"\" for appl. \""+ - applName); + applName+"\" host \""+host.getName()+"\""); return(null); } 1.12 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnection.java Index: WarpConnection.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnection.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- WarpConnection.java 2001/09/10 00:25:49 1.11 +++ WarpConnection.java 2001/09/17 05:10:55 1.12 @@ -213,7 +213,7 @@ if (Constants.DEBUG) { String typ=Integer.toHexString(packet.getType()); logger.debug(">> TYPE="+typ+" LENGTH="+packet.size); - logger.debug(">> "+packet.dump()); + //logger.debug(">> "+packet.dump()); } this.output.write(packet.getType()&0x0ff); @@ -255,7 +255,7 @@ if (Constants.DEBUG) { String typ=Integer.toHexString(packet.getType()); logger.debug("<< TYPE="+typ+" LENGTH="+packet.size); - logger.debug("<< "+packet.dump()); + // logger.debug("<< "+packet.dump()); } } } 1.2 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpLogger.java Index: WarpLogger.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpLogger.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WarpLogger.java 2001/07/19 23:59:15 1.1 +++ WarpLogger.java 2001/09/17 05:10:55 1.2 @@ -119,13 +119,13 @@ /** Log to the container logger with the specified level or to stderr */ private void log(String msg, Exception exc, int lev) { if (this.container==null) { - dump(msg,exc); + if (Constants.DEBUG) dump(msg,exc); return; } Logger logg=this.container.getLogger(); if (logg==null) { - dump(msg,exc); + if (Constants.DEBUG) dump(msg,exc); return; } 1.12 +26 -0 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpRequestHandler.java Index: WarpRequestHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpRequestHandler.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- WarpRequestHandler.java 2001/08/09 20:08:58 1.11 +++ WarpRequestHandler.java 2001/09/17 05:10:55 1.12 @@ -75,6 +75,8 @@ import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringParser; +import java.security.Principal; + public class WarpRequestHandler { private StringParser parser = new StringParser(); @@ -167,6 +169,11 @@ logger.debug("Request user="+user+" auth="+auth); request.setAuthType(auth); // What to do for user name? + if(user != null && auth != null && auth.equals("Basic")) { + Principal prin = new BasicPrincipal(user); + request.setUserPrincipal(prin); + } + break; } @@ -397,5 +404,24 @@ } } + class BasicPrincipal implements Principal { + private String user; + BasicPrincipal(String user) { + this.user = user; + } + + public boolean equals(Object another) { + return (another instanceof Principal && + ((Principal)another).getName().equals(user)); + } + + public String getName() { + return user; + } + + public String toString() { + return getName(); + } + } }