costin 02/02/20 15:39:03 Modified: jk/java/org/apache/jk/core Channel.java JkHandler.java WorkerEnv.java Log: Use commons-logging for log instead of println Revision Changes Path 1.5 +7 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/Channel.java Index: Channel.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/Channel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Channel.java 6 Feb 2002 17:32:19 -0000 1.4 +++ Channel.java 20 Feb 2002 23:39:02 -0000 1.5 @@ -82,6 +82,8 @@ * @author Costin Manolache */ public abstract class Channel extends JkHandler { + private static org.apache.commons.logging.Log log= + org.apache.commons.logging.LogFactory.getLog( Channel.class ); /** This method is used to receive messages. It shouldn't * be exposed, as most processing is driven by sending @@ -109,12 +111,13 @@ next=wEnv.getHandler( "dispatch" ); if( next==null ) next=wEnv.getHandler( "request" ); - log("Setting default next " + next.getClass().getName()); + if( log.isDebugEnabled() ) + log.debug("Setting default next " + next.getClass().getName()); } - if(logL >0 ) - log("Calling next " + next.getName() + " " + - next.getClass().getName()); + if( log.isDebugEnabled() ) + log.debug("Calling next " + next.getName() + " " + + next.getClass().getName()); return next.invoke(msg, mc ); } } 1.2 +12 -15 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java Index: JkHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JkHandler.java 6 Feb 2002 17:25:07 -0000 1.1 +++ JkHandler.java 20 Feb 2002 23:39:02 -0000 1.2 @@ -71,10 +71,14 @@ public static final int LAST=1; public static final int ERROR=2; + private Properties properties=new Properties(); protected WorkerEnv wEnv; protected JkHandler next; protected String name; protected int id; + + private static org.apache.commons.logging.Log log= + org.apache.commons.logging.LogFactory.getLog( JkHandler.class ); public void setWorkerEnv( WorkerEnv we ) { this.wEnv=we; @@ -101,11 +105,13 @@ } String nextName=null; + /** Catalina-style "recursive" invocation. * A chain is used for Apache/3.3 style iterative invocation. */ public void setNext( JkHandler h ) { - if( logL>0 ) log("setNext " + h.getClass().getName()); + if( log.isDebugEnabled() ) + log.debug("setNext " + h.getClass().getName()); next=h; } @@ -127,20 +133,11 @@ public abstract int invoke(Msg msg, MsgContext mc ) throws IOException; - // This will use commons-logging to plug in a real logger - - protected int logL=10; - private String prefix=null; - - public void setDebug( int i ) { - logL=i; + public void setProperty( String name, String value ) { + properties.put( name, value ); } - - protected void log( String s ) { - if( prefix==null ) { - String cname = this.getClass().getName(); - prefix = cname.substring( cname.lastIndexOf(".") +1) + ":"; - } - System.out.println( prefix + s ); + + public String getProperty( String name ) { + return properties.getProperty(name) ; } } 1.5 +23 -6 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java Index: WorkerEnv.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- WorkerEnv.java 6 Feb 2002 17:36:07 -0000 1.4 +++ WorkerEnv.java 20 Feb 2002 23:39:02 -0000 1.5 @@ -89,6 +89,9 @@ private Object notes[]=new Object[32]; Hashtable handlersMap=new Hashtable(); + JkHandler handlersTable[]=new JkHandler[20]; + int handlerCount=0; + // base dir for the jk webapp String home; @@ -147,18 +150,32 @@ w.setWorkerEnv( this ); w.setName( name ); handlersMap.put( name, w ); + if( handlerCount > handlersTable.length ) { + JkHandler newT[]=new JkHandler[ 2 * handlersTable.length ]; + System.arraycopy( handlersTable, 0, newT, 0, handlersTable.length ); + handlersTable=newT; + } + handlersTable[handlerCount]=w; + w.setId( handlerCount ); + handlerCount++; } - public JkHandler getHandler( String name ) { + public final JkHandler getHandler( String name ) { return (JkHandler)handlersMap.get(name); } + public final JkHandler getHandler( int id ) { + return handlersTable[id]; + } + public void start() throws IOException { - Enumeration en=handlersMap.keys(); - while( en.hasMoreElements() ) { - String n=(String)en.nextElement(); - JkHandler w=(JkHandler)handlersMap.get(n); - w.init(); + for( int i=0; i<handlerCount; i++ ) { + //Enumeration en=handlersMap.keys(); + // while( en.hasMoreElements() ) { + // String n=(String)en.nextElement(); + // JkHandler w=(JkHandler)handlersMap.get(n); + if( handlersTable[i] != null ) + handlersTable[i].init(); } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>