Author: ceki Date: Mon Feb 4 17:56:30 2008 New Revision: 1618 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java - copied, changed from r1616, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java Removed: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java Log: - renamed BasicContext as AccessContext for extra clarity Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SimpleSocketServer.java Mon Feb 4 17:56:30 2008 @@ -13,7 +13,7 @@ import java.net.Socket; import ch.qos.logback.access.joran.JoranConfigurator; -import ch.qos.logback.access.spi.BasicContext; +import ch.qos.logback.access.spi.AccessContext; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.util.StatusPrinter; @@ -43,7 +43,7 @@ static int port; - private static BasicContext basicContext; + private static AccessContext basicContext; public static void main(String argv[]) throws Exception { if (argv.length == 2) { @@ -86,7 +86,7 @@ usage("Could not interpret port number [" + portStr + "]."); } - basicContext = new BasicContext(); + basicContext = new AccessContext(); if (configFile.endsWith(".xml")) { JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(basicContext); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SocketNode.java Mon Feb 4 17:56:30 2008 @@ -15,8 +15,8 @@ import java.io.ObjectInputStream; import java.net.Socket; +import ch.qos.logback.access.spi.AccessContext; import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.access.spi.BasicContext; import ch.qos.logback.core.spi.FilterReply; // Contributors: Moses Hohman <mmhohman@rainbow.uchicago.edu> @@ -38,10 +38,10 @@ public class SocketNode implements Runnable { Socket socket; - BasicContext context; + AccessContext context; ObjectInputStream ois; - public SocketNode(Socket socket, BasicContext context) { + public SocketNode(Socket socket, AccessContext context) { this.socket = socket; this.context = context; try { Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java (from r1616, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java) ============================================================================== --- /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/BasicContext.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessContext.java Mon Feb 4 17:56:30 2008 @@ -18,7 +18,7 @@ * * @author Sébastien Pennec */ -public class BasicContext extends ContextBase implements AppenderAttachable<AccessEvent>, FilterAttachable { +public class AccessContext extends ContextBase implements AppenderAttachable<AccessEvent>, FilterAttachable { AppenderAttachableImpl<AccessEvent> aai = new AppenderAttachableImpl<AccessEvent>(); FilterAttachableImpl fai = new FilterAttachableImpl();