This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging
framework.".
The branch, master has been updated
via 9280a49da9307f3ce8c2179544467c919f0a634f (commit)
from 4804883e64fc1a14719a28d81a2479c628a8de39 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=9280a49da9307f3ce8c2179544467c919f0a634f
http://github.com/ceki/logback/commit/9280a49da9307f3ce8c2179544467c919f0a634f
commit 9280a49da9307f3ce8c2179544467c919f0a634f
Author: Ceki Gulcu <[email protected]>
Date: Mon Feb 7 16:57:48 2011 +0100
fix LBCLASSIC-248
diff --git
a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java
b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java
index 2f163e2..8af89b4 100644
---
a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java
+++
b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java
@@ -46,7 +46,12 @@ public class ConditionalWithoutJanino {
// assume that janino.jar ia NOT on the classpath
@Test
public void condtionalWithoutJanino() throws JoranException {
- configure(ClassicTestConstants.JORAN_INPUT_PREFIX +
"conditional/withoutJanino.xml");
+ String configFile = ClassicTestConstants.JORAN_INPUT_PREFIX +
"conditional/withoutJanino.xml";
+ String currentDir = System.getProperty("user.dir");
+ if(!currentDir.contains("logback-classic")) {
+ configFile = "logback-classic/"+configFile;
+ }
+ configure(configFile);
StatusPrinter.print(loggerContext);
StatusChecker checker = new StatusChecker(loggerContext);
assertTrue(checker.containsMatch(IfAction.MISSING_JANINO_MSG));
-----------------------------------------------------------------------
Summary of changes:
.../classic/boolex/ConditionalWithoutJanino.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
_______________________________________________
logback-dev mailing list
[email protected]
http://qos.ch/mailman/listinfo/logback-dev
