[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-82-gdf1f63a
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Wed Mar 17 09:17:32 CET 2010
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 df1f63a50268df0d6a9a9dcf352f4abc8766c74f (commit)
from fd195dcaa9d37ecc26fe243c950f126c832cfe9a (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=df1f63a50268df0d6a9a9dcf352f4abc8766c74f
http://github.com/ceki/logback/commit/df1f63a50268df0d6a9a9dcf352f4abc8766c74f
commit df1f63a50268df0d6a9a9dcf352f4abc8766c74f
Author: Ceki Gulcu <ceki at qos.ch>
Date: Wed Mar 17 09:15:44 2010 +0100
- change in indentation in ConsoleAppender
- added paragraph about exemptions in license.html
diff --git a/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java b/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java
index ccc7cbb..5304874 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/ConsoleAppender.java
@@ -16,81 +16,80 @@ package ch.qos.logback.core;
import ch.qos.logback.core.status.Status;
import ch.qos.logback.core.status.WarnStatus;
-
/**
* ConsoleAppender appends log events to <code>System.out</code> or
* <code>System.err</code> using a layout specified by the user. The default
* target is <code>System.out</code>.
- *
- * For more information about this appender, please refer to the online manual at
- * http://logback.qos.ch/manual/appenders.html#ConsoleAppender
- *
+ *
+ * For more information about this appender, please refer to the online manual
+ * at http://logback.qos.ch/manual/appenders.html#ConsoleAppender
+ *
* @author Ceki Gülcü
*/
public class ConsoleAppender<E> extends OutputStreamAppender<E> {
- public static final String SYSTEM_OUT = "System.out";
- public static final String SYSTEM_ERR = "System.err";
- protected String target = SYSTEM_OUT;
+ public static final String SYSTEM_OUT = "System.out";
+ public static final String SYSTEM_ERR = "System.err";
+ protected String target = SYSTEM_OUT;
- /**
- * As in most logback components, the default constructor does nothing.
- */
- public ConsoleAppender() {
- }
-
- /**
- * Sets the value of the <b>Target</b> option. Recognized values are
- * "System.out" and "System.err". Any other value will be ignored.
- */
- public void setTarget(String value) {
- String v = value.trim();
+ /**
+ * As in most logback components, the default constructor does nothing.
+ */
+ public ConsoleAppender() {
+ }
- if (SYSTEM_OUT.equalsIgnoreCase(v)) {
- target = SYSTEM_OUT;
- } else if (SYSTEM_ERR.equalsIgnoreCase(v)) {
- target = SYSTEM_ERR;
- } else {
- targetWarn(value);
- }
- }
+ /**
+ * Sets the value of the <b>Target</b> option. Recognized values are
+ * "System.out" and "System.err". Any other value will be ignored.
+ */
+ public void setTarget(String value) {
+ String v = value.trim();
- /**
- * Returns the current value of the <b>Target</b> property. The default
- * value of the option is "System.out".
- *
- * See also {@link #setTarget}.
- */
- public String getTarget() {
- return target;
+ if (SYSTEM_OUT.equalsIgnoreCase(v)) {
+ target = SYSTEM_OUT;
+ } else if (SYSTEM_ERR.equalsIgnoreCase(v)) {
+ target = SYSTEM_ERR;
+ } else {
+ targetWarn(value);
}
+ }
- void targetWarn(String val) {
- Status status = new WarnStatus("["+val+" should be System.out or System.err.", this);
- status.add(new WarnStatus("Using previously set target, System.out by default.", this));
- addStatus(status);
- }
+ /**
+ * Returns the current value of the <b>Target</b> property. The default value
+ * of the option is "System.out".
+ *
+ * See also {@link #setTarget}.
+ */
+ public String getTarget() {
+ return target;
+ }
- public void start() {
- if (target.equals(SYSTEM_OUT)) {
- setOutputStream(System.out);
- } else {
- setOutputStream(System.err);
- }
- super.start();
- }
+ void targetWarn(String val) {
+ Status status = new WarnStatus("[" + val
+ + " should be System.out or System.err.", this);
+ status.add(new WarnStatus(
+ "Using previously set target, System.out by default.", this));
+ addStatus(status);
+ }
- /**
- * This method overrides the parent {@link OutputStreamAppender#closeOutputStream}
- * implementation because the console stream is not ours to close.
- */
- @Override
- protected final void closeOutputStream() {
- encoderClose();
+ public void start() {
+ if (target.equals(SYSTEM_OUT)) {
+ setOutputStream(System.out);
+ } else {
+ setOutputStream(System.err);
}
-
-
+ super.start();
}
+ /**
+ * This method overrides the parent
+ * {@link OutputStreamAppender#closeOutputStream} implementation because the
+ * console stream is not ours to close.
+ */
+ @Override
+ protected final void closeOutputStream() {
+ encoderClose();
+ }
+}
diff --git a/logback-site/src/site/pages/license.html b/logback-site/src/site/pages/license.html
index 74fcdbc..2dbcc92 100644
--- a/logback-site/src/site/pages/license.html
+++ b/logback-site/src/site/pages/license.html
@@ -69,6 +69,11 @@ as published by the Free Software Foundation.</p>
formalize the terms of your contribution and to protect the
project in case of litigation.
</p>
+
+ <p>Upon request, we may exempt open-source projects from LGPL and
+ EPL's reciprocity clauses so that the said pojects can develop
+ logback extensions under the license of their choice. Exemptions
+ are granted on a case by case basis.</p>
<script src="templates/footer.js" type="text/javascript"></script>
</div>
-----------------------------------------------------------------------
Summary of changes:
.../java/ch/qos/logback/core/ConsoleAppender.java | 115 ++++++++++----------
logback-site/src/site/pages/license.html | 5 +
2 files changed, 62 insertions(+), 58 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
More information about the logback-dev
mailing list