Permalink
Browse files

doc edits

  • Loading branch information...
1 parent ab197e7 commit d740209dde2149aaf7654301f4a9a870813c5ed1 @ceki ceki committed Jun 12, 2012
@@ -0,0 +1,31 @@
+package ch.qos.logback.classic.issue.DarioCampagna;
+
+import ch.qos.cal10n.IMessageConveyor;
+import ch.qos.cal10n.MessageConveyor;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.slf4j.cal10n.LocLogger;
+import org.slf4j.cal10n.LocLoggerFactory;
+
+import java.util.Locale;
+
+public class Main {
+ public static void main(String[] args) throws JoranException {
+
+ LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+ context.reset();
+ JoranConfigurator joranConfigurator = new JoranConfigurator();
+ joranConfigurator.setContext(context);
+ joranConfigurator.doConfigure("src/test/java/ch/qos/logback/classic/issue/DarioCampagna/logback-marker.xml");
+ IMessageConveyor mc = new MessageConveyor(Locale.getDefault());
+ LocLoggerFactory llFactory_default = new LocLoggerFactory(mc);
+ LocLogger locLogger = llFactory_default.getLocLogger("defaultLocLogger");
+ Marker alwaysMarker = MarkerFactory.getMarker("ALWAYS");
+ locLogger.info(alwaysMarker, "This will always appear.");
+ locLogger.info("Hello!");
+ }
+}
@@ -0,0 +1,19 @@
+<configuration debug="true">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%level - %date - %marker - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
+ <Marker>ALWAYS</Marker>
+ <OnMatch>ACCEPT</OnMatch>
+ <OnMismatch>NEUTRAL</OnMismatch>
+ </turboFilter>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
@@ -29,6 +29,17 @@
<hr width="80%" align="center" />
+ <h3>, 2012 - Release of version 1.0.7</h3>
+
+ <p>Substitution properties are now correctly recognized by <span
+ class="attr">scan</span> and <span class="attr">scanPeriod</span>
+ attributes of <code>&lt;configuration></code> element in
+ configuration files. This fixes <a
+ href="http://jira.qos.ch/browse/LOGBACK-396">LOGBACK-396</a>
+ reported by Oh Chin Boon</p>
+
+ <hr width="80%" align="center" />
+
<h3>7th of June, 2012 - Release of version 1.0.6</h3>
<p><a
@@ -22,11 +22,10 @@
<h2>Call for volunteers</h2>
- <p>We are looking for volunteers in the following areas (in order
- of decreasing priority).</p>
+ <p>We are looking for volunteers in the following areas.</p>
<ol>
- <li><b>logback in 10 minutes</b>
+ <li><span class="label">top priority</span> <b>logback in 10 minutes</b>
<p>We are looking for a volunteer to write a short document
describing logback for beginners, entitled say "logback in 10
@@ -38,10 +37,20 @@
</p>
</li>
+ <li><span class="label">high priority</span> <b>Maintain the groovy configurator</b>
+
+ <p>The Groovy configurator, aka Gaffer, although pretty cool, is
+ not getting the attention it deserves. The amount of code
+ involved, altough not completely trivial, is far from
+ insurmountable. We are looking for a volunteer to take over
+ Gaffer.
+ </p>
+ </li>
+
<li><b>Write a tool for parsing log files</b>
- <p>We are looking for a volunteer to write a tool for parsing
- log files.</p>
+ <p>We are looking for a volunteer to write a tool for parsing
+ log files.</p>
</li>
<li><b>Improve OSGi support</b>
@@ -57,7 +66,7 @@
</p>
</li>
- <li><b>Proof reading the documentation</b>
+ <li><span class="label">high priority</span> <b>Proof reading the documentation</b>
<p>We are always looking for volunteers to proof-read the
documentation. Suggestions as to the design and look-and-feel of
the site are also welcome.</p>
View
@@ -10,8 +10,6 @@ mvn assembly:assembly
mvn deploy -P javadocjar,sign-artifacts
mvn site:deploy -N
-#git tag -a v_${VERSION_NUMBER}
-#git push --tags
-
-
-#git push github --tags
+git tag -a v_${VERSION_NUMBER}
+git push --tags
+git push github --tags

0 comments on commit d740209

Please sign in to comment.