Author: seb Date: Tue Nov 28 11:31:41 2006 New Revision: 1010 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java Log: removed request and response from Janino variables added a testcase to PackageTest.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java Tue Nov 28 11:31:41 2006 @@ -20,12 +20,8 @@ static { DEFAULT_PARAM_NAME_LIST.add("event"); - DEFAULT_PARAM_NAME_LIST.add("request"); - DEFAULT_PARAM_NAME_LIST.add("response"); DEFAULT_PARAM_TYPE_LIST.add(AccessEvent.class); - DEFAULT_PARAM_TYPE_LIST.add(HttpServletRequest.class); - DEFAULT_PARAM_TYPE_LIST.add(HttpServletResponse.class); } @@ -66,8 +62,6 @@ Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size()+matcherListSize]; values[i++] = loggingEvent; - values[i++] = loggingEvent.getRequest(); - values[i++] = loggingEvent.getResponse(); for(int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java Tue Nov 28 11:31:41 2006 @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(URLEvaluatorTest.class); + suite.addTestSuite(SocketAppenderTest.class); return suite; } } \ No newline at end of file