October 2011 - logback-dev - mailman3.qos.ch

[JIRA] Created: (LBACCESS-27) Support conditional configuration
by Marshall Pierce (JIRA) 25 Oct '11

25 Oct '11

Support conditional configuration --------------------------------- Key: LBACCESS-27 URL: http://jira.qos.ch/browse/LBACCESS-27 Project: logback-access Issue Type: Improvement Reporter: Marshall Pierce Assignee: Logback dev list logback-access doesn't support conditional configuration like logback-classic. See http://mailman.qos.ch/pipermail/logback-user/2011-October/002597.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 2

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-42-g4fadcb4
by git-noreply＠pixie.qos.ch 25 Oct '11

25 Oct '11

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 4fadcb4ae7e8bac392524a37e9ab1a3a8159b6fe (commit) from 1e59f24cc91a372e4ab8d13eab3a20b20b079a23 (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=4fadcb4ae7e8bac392524a37… http://github.com/ceki/logback/commit/4fadcb4ae7e8bac392524a37e9ab1a3a8159b… commit 4fadcb4ae7e8bac392524a37e9ab1a3a8159b6fe Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 25 16:07:45 2011 +0200 fix LBACCESS-27 diff --git a/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java b/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java index d688418..2d06115 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java +++ b/logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java @@ -25,7 +25,11 @@ import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.filter.EvaluatorFilter; import ch.qos.logback.core.joran.JoranConfiguratorBase; import ch.qos.logback.core.joran.action.AppenderRefAction; +import ch.qos.logback.core.joran.action.IncludeAction; import ch.qos.logback.core.joran.action.NOPAction; +import ch.qos.logback.core.joran.conditional.ElseAction; +import ch.qos.logback.core.joran.conditional.IfAction; +import ch.qos.logback.core.joran.conditional.ThenAction; import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.joran.spi.RuleStore; @@ -33,6 +37,7 @@ import ch.qos.logback.core.joran.spi.RuleStore; /** + * This JoranConfiguratorclass adds rules specific to logback-access. * * @author Ceki Gülcü */ @@ -49,6 +54,15 @@ public class JoranConfigurator extends JoranConfiguratorBase { rs.addRule(new Pattern("configuration/appender/sift/*"), new NOPAction()); rs.addRule(new Pattern("configuration/evaluator"), new EvaluatorAction()); + + // add if-then-else support + rs.addRule(new Pattern("*/if"), new IfAction()); + rs.addRule(new Pattern("*/if/then"), new ThenAction()); + rs.addRule(new Pattern("*/if/then/*"), new NOPAction()); + rs.addRule(new Pattern("*/if/else"), new ElseAction()); + rs.addRule(new Pattern("*/if/else/*"), new NOPAction()); + + rs.addRule(new Pattern("configuration/include"), new IncludeAction()); } @Override diff --git a/logback-access/src/test/input/joran/conditional/conditionalConsole.xml b/logback-access/src/test/input/joran/conditional/conditionalConsole.xml new file mode 100644 index 0000000..1ce7b68 --- /dev/null +++ b/logback-access/src/test/input/joran/conditional/conditionalConsole.xml @@ -0,0 +1,17 @@ + +<configuration> + + <if condition='property("HOSTNAME").contains("${aHost}")'> + <then> + <appender name="CON" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%h %l %u %user %date "%r" %s %b</pattern> + </encoder> + </appender> + + <appender-ref ref="CON" /> + + </then> + </if> + +</configuration> \ No newline at end of file diff --git a/logback-access/src/test/input/joran/conditional/conditionalConsole_ELSE.xml b/logback-access/src/test/input/joran/conditional/conditionalConsole_ELSE.xml new file mode 100644 index 0000000..4d3bd85 --- /dev/null +++ b/logback-access/src/test/input/joran/conditional/conditionalConsole_ELSE.xml @@ -0,0 +1,20 @@ + +<configuration> + + <if condition='property("HOSTNAME").contains("XYZ88")'> + <then> + <appender name="CON" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%h %l %u %user %date "%r" %s %b</pattern> + </encoder> + </appender> + + <appender-ref ref="CON" /> + </then> + <else> + <appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/> + <appender-ref ref="LIST" /> + </else> + </if> + +</configuration> \ No newline at end of file diff --git a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java index de85c65..2971d7d 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java @@ -22,6 +22,7 @@ import org.junit.runners.Suite.SuiteClasses; ch.qos.logback.access.boolex.PackageTest.class, ch.qos.logback.access.net.PackageTest.class, ch.qos.logback.access.pattern.PackageTest.class, + ch.qos.logback.access.joran.PackageTest.class, ch.qos.logback.access.jetty.PackageTest.class, ch.qos.logback.access.filter.PackageTest.class, ch.qos.logback.access.servlet.PackageTest.class, diff --git a/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java b/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java new file mode 100644 index 0000000..16a2bea --- /dev/null +++ b/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java @@ -0,0 +1,84 @@ +package ch.qos.logback.access.joran; + +import ch.qos.logback.access.TeztConstants; +import ch.qos.logback.access.spi.AccessContext; +import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.FileAppender; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.read.ListAppender; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +/** + * @author Ceki Gücü + */ +public class ConditionalTest { + + AccessContext context = new AccessContext(); + StatusChecker checker = new StatusChecker(context); + + int diff = RandomUtil.getPositiveInt(); + String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; + + @Before + public void setUp() { + InetAddress localhost = null; + try { + localhost = InetAddress.getLocalHost(); + context.putProperty("aHost", localhost.getHostName()); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + } + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(context); + jc.doConfigure(file); + } + + @Test + public void conditionalConsoleApp_IF_THEN_True() throws JoranException, UnknownHostException { + configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/conditional/conditionalConsole.xml"); + ConsoleAppender consoleAppender = (ConsoleAppender) context.getAppender("CON"); + assertNotNull(consoleAppender); + assertTrue(checker.isErrorFree(0)); + } + + @Test + public void conditionalConsoleApp_IF_THEN_False() throws JoranException, + IOException, InterruptedException { + context.putProperty("aHost", null); + configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/conditional/conditionalConsole.xml"); + + ConsoleAppender consoleAppender = (ConsoleAppender) context.getAppender("CON"); + assertNull(consoleAppender); + + StatusChecker checker = new StatusChecker(context); + assertTrue(checker.isErrorFree(0)); + } + + @Test + public void conditionalConsoleApp_ELSE() throws JoranException, + IOException, InterruptedException { + configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/conditional/conditionalConsole_ELSE.xml"); + ConsoleAppender consoleAppender = (ConsoleAppender) context.getAppender("CON"); + assertNull(consoleAppender); + + ListAppender listAppender = (ListAppender) context.getAppender("LIST"); + assertNotNull(listAppender); + assertTrue(checker.isErrorFree(0)); + } +} diff --git a/logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java b/logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java new file mode 100644 index 0000000..b79b7ca --- /dev/null +++ b/logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java @@ -0,0 +1,12 @@ +package ch.qos.logback.access.joran; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Ceki Gücü + */ +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({JoranConfiguratorTest.class, ConditionalTest.class}) +public class PackageTest { +} diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index da0175a..5dc62fb 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -339,7 +339,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> -  +  <forkMode>once</forkMode> <reportFormat>plain</reportFormat> <trimStackTrace>false</trimStackTrace> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java index 4334d32..46c8f73 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java @@ -30,7 +30,7 @@ import ch.qos.logback.core.joran.spi.RuleStore; /** * This JoranConfiguratorclass adds rules specific to logback-classic. - * + * * @author Ceki Gülcü */ public class JoranConfigurator extends JoranConfiguratorBase { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 4884ea6..1e345a2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -373,9 +373,11 @@ public class JoranConfiguratorTest { public void levelChangePropagator1() throws JoranException, IOException, InterruptedException { java.util.logging.Logger.getLogger("xx").setLevel(java.util.logging.Level.INFO); + verifyJULLevel("xx", Level.INFO); String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "/jul/levelChangePropagator1.xml"; configure(configFileAsStr); + StatusPrinter.print(loggerContext); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree(0)); verifyJULLevel("xx", Level.INFO); diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 4561ba9..fa96c57 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -66,6 +66,17 @@ href="http://jira.qos.ch/browse/LBCORE-225">LBCORE-225</a> reported by Mark Woon.</p> + <p>Logback-access now supports conditional configuration. This + fixes <a + href="http://jira.qos.ch/browse/LBACCESS-27">LBACCESS-27</a> + reported by Marshall Pierce.</p> + + <p>Logback-access now supports inclusion of configuration + files. See the <a + href="manual/configuration.html#fileInclusion">chapter about + configuration</a> in the logback's online manual for more + information. </p> + <p>Added <code>ch.qos.logback.core.read</code> to "Import-Package" declaration in logback-classic's manifest file. This fixes <a href="http://jira.qos.ch/browse/LBCLASSIC-131">LBCLASSIC-131</a> @@ -1500,7 +1511,7 @@ ALTER TABLE logging_event ADD arg3 VARCHAR(254);</pre> logback's configuration framework. A file can contain an <em>include</em> element that has a <em>file</em> or <em>url</em> attribute pointing to a configuration file. See the <a - href="manual/configuration.html#Include">chapter about + href="manual/configuration.html#fileInclusion">chapter about configuration</a> in the logback's online manual for more information. </p> ----------------------------------------------------------------------- Summary of changes: .../logback/access/joran/JoranConfigurator.java | 14 +++ .../input/joran/conditional/conditionalConsole.xml | 17 ++++ .../joran/conditional/conditionalConsole_ELSE.xml | 20 +++++ .../java/ch/qos/logback/access/AllAccessTest.java | 1 + .../qos/logback/access/joran/ConditionalTest.java | 84 ++++++++++++++++++++ .../ch/qos/logback/access/joran/PackageTest.java | 12 +++ logback-classic/pom.xml | 2 +- .../logback/classic/joran/JoranConfigurator.java | 2 +- .../classic/joran/JoranConfiguratorTest.java | 2 + logback-site/src/site/pages/news.html | 13 +++- 10 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 logback-access/src/test/input/joran/conditional/conditionalConsole.xml create mode 100644 logback-access/src/test/input/joran/conditional/conditionalConsole_ELSE.xml create mode 100644 logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java create mode 100644 logback-access/src/test/java/ch/qos/logback/access/joran/PackageTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-41-g1e59f24
by git-noreply＠pixie.qos.ch 25 Oct '11

25 Oct '11

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 1e59f24cc91a372e4ab8d13eab3a20b20b079a23 (commit) from 2755e4fc3be21f233f08b138786be0028549ce86 (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=1e59f24cc91a372e4ab8d13e… http://github.com/ceki/logback/commit/1e59f24cc91a372e4ab8d13eab3a20b20b079… commit 1e59f24cc91a372e4ab8d13eab3a20b20b079a23 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 25 13:40:16 2011 +0200 pom.xml cleanup, minor edits in news.html diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index ad93bc8..4561ba9 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -66,6 +66,11 @@ href="http://jira.qos.ch/browse/LBCORE-225">LBCORE-225</a> reported by Mark Woon.</p> + <p>Added <code>ch.qos.logback.core.read</code> to "Import-Package" + declaration in logback-classic's manifest file. This fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-131">LBCLASSIC-131</a> + reported by Michal Prihoda and Thomas Jaeckle.</p> + <p>Fixed infinitely recursive calls in <code>AccessConverter#addError</code> methods as reported in <a href="http://jira.qos.ch/browse/LBACCESS-25">LBACCESS-25</a> by @@ -78,6 +83,8 @@ Pierre Queinnec. </p> + + <h3>September 21st, 2011 - Release of version 0.9.30</h3> <p>Archive removal can now deal with prolonged periods of diff --git a/pom.xml b/pom.xml index 1fd67a6..592a633 100755 --- a/pom.xml +++ b/pom.xml @@ -137,11 +137,7 @@ <artifactId>tomcat-catalina</artifactId> <version>${tomcat.version}</version> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.1</version> - </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> @@ -178,9 +174,9 @@ <build> <extensions> <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>1.0-beta-1</version> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>1.0-beta-1</version> </extension> </extensions> @@ -253,17 +249,17 @@ <buildcommands> <buildcommand>org.scala-ide.sdt.core.scalabuilder</buildcommand> </buildcommands> - - +  <sourceIncludes> <sourceInclude>**/*.scala</sourceInclude> <sourceInclude>**/*.java</sourceInclude> @@ -277,13 +273,9 @@ <version>2.1</version> <configuration> <descriptors> - <descriptor> - src/main/assembly/dist.xml - </descriptor> + <descriptor>src/main/assembly/dist.xml</descriptor> </descriptors> - <finalName> - logback-${project.version} - </finalName> + <finalName>logback-${project.version}</finalName> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>target/site/dist/</outputDirectory> </configuration> @@ -299,89 +291,78 @@ <artifactId>maven-scala-plugin</artifactId> <version>2.15.2</version> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> <version>1.0</version> </plugin> - </plugins> - </build> - <reporting> - <plugins> + +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>3.0</version> <configuration> - <excludeModules>fml</excludeModules> - <excludeModules>apt</excludeModules> - </configuration> - </plugin> + <reportPlugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <configuration> + <aggregate>true</aggregate> + <javadocDir>target/site/apidocs/</javadocDir> + <linkJavadoc>true</linkJavadoc> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - <configuration> - <aggregate>true</aggregate> - <javadocDir>target/site/apidocs/</javadocDir> - <linkJavadoc>true</linkJavadoc> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> - <reportSets> - <reportSet> - <reports/> - </reportSet> - </reportSets> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <configuration> + <aggregate>true</aggregate> +  + <links> + <link> + http://java.sun.com/j2se/1.5.0/docs/api + </link> + </links> + <groups> + <group> + <title>Logback Core</title> + <packages>ch.qos.logback.core:ch.qos.logback.core.* + </packages> + </group> + <group> + <title>Logback Classic</title> + <packages> + ch.qos.logback:ch.qos.logback.classic:ch.qos.logback.classic.* + </packages> + </group> + <group> + <title>Logback Access</title> + <packages>ch.qos.logback.access:ch.qos.logback.access.* + </packages> + </group> + <group> + <title>SLF4J</title> + <packages>org.slf4j:org.slf4j.*</packages> + </group> + <group> + <title>Examples</title> + <packages>chapter*:joran*</packages> + </group> + </groups> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <configuration> - <aggregate>true</aggregate> -  - <links> - <link> - http://java.sun.com/j2se/1.5.0/docs/api - </link> - </links> - <groups> - <group> - <title>Logback Core</title> - <packages>ch.qos.logback.core:ch.qos.logback.core.*</packages> - </group> - <group> - <title>Logback Classic</title> - <packages> - ch.qos.logback:ch.qos.logback.classic:ch.qos.logback.classic.* - </packages> - </group> - <group> - <title>Logback Access</title> - <packages>ch.qos.logback.access:ch.qos.logback.access.*</packages> - </group> - <group> - <title>SLF4J</title> - <packages>org.slf4j:org.slf4j.*</packages> - </group> - <group> - <title>Examples</title> - <packages>chapter*:joran*</packages> - </group> - </groups> + </reportPlugins> </configuration> </plugin> </plugins> - - </reporting> + </build> <distributionManagement> <site> @@ -411,6 +392,7 @@ <plugin> <groupId>com.google.code.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> + <version>1.9.0</version> <configuration> <header>src/main/licenseHeader.txt</header> <quiet>false</quiet> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 7 ++ pom.xml | 156 +++++++++++++++------------------ 2 files changed, 76 insertions(+), 87 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-131) Missing Import-Package declaration in logback-classic causes problem with RollingFileAppender
by Pavol Juhos (JIRA) 25 Oct '11

25 Oct '11

Missing Import-Package declaration in logback-classic causes problem with RollingFileAppender --------------------------------------------------------------------------------------------- Key: LBCLASSIC-131 URL: http://jira.qos.ch/browse/LBCLASSIC-131 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.15 Environment: OSGi Service Platform Release 4 Reporter: Pavol Juhos Assignee: Logback dev list In OSGi environment logback-core will correctly try to use the class-loader of logback-classic bundle to load classes of the selected Appenders. This however means that logback-classic needs to have visibility to the requested Appender classes. Since RollingFileAppender is located in a separate package "ch.qos.logback.core.rolling" and not explicitly referenced from logback-classic code, the respective Import-Package declaration will not be generated automatically by the BND tool (embedded in maven-bundle-plugin). In order to avoid ClassNotFound exceptions when trying to use RollingFileAppender the appropriate Import-Package declarations have to be added explicitly to the configuration of maven-bundle-plugin in logback-classic POM. The current <Import-Package> settings in maven-bundle-plugin configuration: <Import-Package>sun.reflect;resolution:=optional, javax.jms;resolution:=optional, * </Import-Package> Suggested update: <Import-Package>sun.reflect;resolution:=optional, javax.jms;resolution:=optional, ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, * </Import-Package> Please consider also to implement the related issue LBCLASSIC-121 when fixing this defect. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

5 6

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-40-g2755e4f
by git-noreply＠pixie.qos.ch 25 Oct '11

25 Oct '11

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 2755e4fc3be21f233f08b138786be0028549ce86 (commit) from f185581de0c9a4c67d4bc1461f2d776072254f3d (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=2755e4fc3be21f233f08b138… http://github.com/ceki/logback/commit/2755e4fc3be21f233f08b138786be0028549c… commit 2755e4fc3be21f233f08b138786be0028549ce86 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 25 13:19:48 2011 +0200 fix LBCLASSIC-131 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 4a70dd9..da0175a 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -380,9 +380,11 @@ sun.reflect;resolution:=optional, javax.*;resolution:=optional, org.xml.*;resolution:=optional, - org.slf4j, ch.qos.logback.core.rolling, + org.slf4j, + ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, ch.qos.logback.core.util, + ch.qos.logback.core.read, org.codehaus.groovy.*;resolution:=optional, groovy.lang.*;resolution:=optional, * ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-39-gf185581
by git-noreply＠pixie.qos.ch 24 Oct '11

24 Oct '11

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 f185581de0c9a4c67d4bc1461f2d776072254f3d (commit) from 167a25b010ef73ba5ed9b1b0d2275576d598c142 (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=f185581de0c9a4c67d4bc146… http://github.com/ceki/logback/commit/f185581de0c9a4c67d4bc1461f2d776072254… commit f185581de0c9a4c67d4bc1461f2d776072254f3d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 24 23:39:11 2011 +0200 added link to logback-audit, other minor edits diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 7041b1d..7ec14b0 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -51,8 +51,7 @@ <p>The <a href="http://audit.qos.ch">logback-audit</a> project is designed for processing logging events having long-term business - significance. Logback-audit is commercial software based on - logback-core. + significance. Logback-audit is based on logback-core. </p> diff --git a/logback-site/src/site/pages/mailinglist.html b/logback-site/src/site/pages/mailinglist.html index d114616..60f93ee 100644 --- a/logback-site/src/site/pages/mailinglist.html +++ b/logback-site/src/site/pages/mailinglist.html @@ -45,14 +45,6 @@ not cross post. </p> - <p>Please do your best to ensure that you are not sending HTML or - "Styled" email to the list. If you are using Outlook or - Outlook Express or Eudora, chances are that you are sending HTML - email by default. There is usually a setting that will allow you - to send "Plain Text" email. - </p> - - <table class="bodyTable"> <tr class="a"> <th>Name</th> diff --git a/logback-site/src/site/pages/templates/left.js b/logback-site/src/site/pages/templates/left.js index 12a2fe7..b7c1883 100644 --- a/logback-site/src/site/pages/templates/left.js +++ b/logback-site/src/site/pages/templates/left.js @@ -14,6 +14,9 @@ document.write('<p class="menu"><a href="' + prefix + 'repos.html">Source Reposi document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/professionalSupport">Support offerings</a>'); document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/training">Training</a>'); +document.write('<p class="menu_header">Sister projects</p>'); +document.write('<p class="menu"><a href="http://audit.qos.ch/">Logback-audit</a>'); + document.write('<p class="menu_header">Online Tools</p>'); document.write('<p class="menu"><a href="http://logback.qos.ch/translator/">log4j.properties Translator</a>'); document.write('<p class="menu"><a href="http://logback.qos.ch/translator/asGroovy.html">logback.XML to Groovy</a>'); diff --git a/pom.xml b/pom.xml index 5c67477..1fd67a6 100755 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ <version>2.4</version> <reportSets> <reportSet> - <reports></reports> + <reports/> </reportSet> </reportSets> </plugin> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 3 +-- logback-site/src/site/pages/mailinglist.html | 8 -------- logback-site/src/site/pages/templates/left.js | 3 +++ pom.xml | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback-audit: logging for events with business significance. annotated tag v_0.5 created. v_0.5
by git-noreply＠pixie.qos.ch 24 Oct '11

24 Oct '11

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-audit: logging for events with business significance.". The annotated tag, v_0.5 has been created at 89497664e67d667b435b2cae1c435ba5de071bc4 (tag) tagging 50428a9363b4269d356bdee362bc10d89baf2207 (commit) tagged by Ceki Gulcu on Mon Oct 24 23:31:44 2011 +0200 - Log ----------------------------------------------------------------- tagging 0.5 Ceki Gulcu (9): initial commit upgrade to logback-core 0.9.30 ongoing work ongoing work ongoing work minor edit preparing release 0.5 Merge branch 'master' of git.qos.ch:logback-audit minor edits ----------------------------------------------------------------------- hooks/post-receive -- Logback-audit: logging for events with business significance.

1 0

[GIT] Logback-audit: logging for events with business significance. branch master updated. 50428a9363b4269d356bdee362bc10d89baf2207
by git-noreply＠pixie.qos.ch 24 Oct '11

24 Oct '11

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-audit: logging for events with business significance.". The branch, master has been updated via 50428a9363b4269d356bdee362bc10d89baf2207 (commit) from 423e8e2578db92ca8ee98598b3d9f5b427ee2ea6 (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://github.com/ceki/logback-audit/commit/50428a9363b4269d356bdee362bc10d… commit 50428a9363b4269d356bdee362bc10d89baf2207 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 24 23:31:29 2011 +0200 minor edits diff --git a/audit-site/src/site/pages/news.html b/audit-site/src/site/pages/news.html index f525735..30f170b 100755 --- a/audit-site/src/site/pages/news.html +++ b/audit-site/src/site/pages/news.html @@ -30,8 +30,9 @@ <hr width="80%" align="center" /> - <h3>October 24TH, 2011 - Release of logback-audit version 0.5 </h3> + <h3>October 24th, 2011 - Release of logback-audit version 0.5 </h3> + <p>Initial public release of logback-audit.</p> <hr width="80%" align="center" /> diff --git a/pom.xml b/pom.xml index 47dccd0..1883b39 100755 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -116,7 +117,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>1.0-beta-1</version> + <version>2.0</version> </extension> </extensions> <plugins> @@ -149,10 +150,10 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.8</version> + <version>2.8</version> <configuration> <downloadSources>true</downloadSources> </configuration> @@ -181,38 +182,42 @@ <artifactId>maven-site-plugin</artifactId> <version>3.0</version> <configuration> - <reportPlugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <configuration> - <aggregate>true</aggregate> - <links> - <link> - http://java.sun.com/j2se/1.5.0/docs/api - </link> - </links> - <groups> - <group> - <title>Logback Audit Common</title> - <packages>ch.qos.logback.audit</packages> - </group> - <group> - <title>Logback Audit Client</title> - <packages>ch.qos.logback.audit.client:ch.qos.logback.audit.client.*</packages> - </group> - <group> - <title>Logback Audit Server</title> - <packages>ch.qos.logback.audit.server:ch.qos.logback.audit.server.*</packages> - </group> - <group> - <title>Examples</title> - <packages>examples*</packages> - </group> - </groups> - </configuration> - </plugin> + <reportPlugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <configuration> + <aggregate>true</aggregate> + <links> + <link> + http://java.sun.com/j2se/1.5.0/docs/api + </link> + </links> + <groups> + <group> + <title>Logback Audit Common</title> + <packages>ch.qos.logback.audit</packages> + </group> + <group> + <title>Logback Audit Client</title> + <packages> + ch.qos.logback.audit.client:ch.qos.logback.audit.client.* + </packages> + </group> + <group> + <title>Logback Audit Server</title> + <packages> + ch.qos.logback.audit.server:ch.qos.logback.audit.server.* + </packages> + </group> + <group> + <title>Examples</title> + <packages>examples*</packages> + </group> + </groups> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -233,16 +238,16 @@ </build>  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +   <profiles> @@ -274,12 +279,34 @@ </plugins> </build> </profile> + + <profile> + <id>javadocjar</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <distributionManagement> <site> <id>pixie</id> - <url>scp://pixie/var/www/audit.qos.ch/htdocs/</url> + <url>scp://pixie.qos.ch/var/www/audit.qos.ch/htdocs/</url> </site> <repository> ----------------------------------------------------------------------- Summary of changes: audit-site/src/site/pages/news.html | 3 +- pom.xml | 121 +++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 48 deletions(-) hooks/post-receive -- Logback-audit: logging for events with business significance.

1 0

[GIT] Logback-audit: logging for events with business significance. branch master updated. 423e8e2578db92ca8ee98598b3d9f5b427ee2ea6
by git-noreply＠pixie.qos.ch 24 Oct '11

24 Oct '11

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-audit: logging for events with business significance.". The branch, master has been updated via 423e8e2578db92ca8ee98598b3d9f5b427ee2ea6 (commit) via 38bb45838aa9e157f76243fe443acd1cc9efb3b2 (commit) from a32d999ff86511193ae7e69b1beb4c00108474da (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://github.com/ceki/logback-audit/commit/423e8e2578db92ca8ee98598b3d9f5b… commit 423e8e2578db92ca8ee98598b3d9f5b427ee2ea6 Merge: 38bb458 a32d999 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 24 23:09:39 2011 +0200 Merge branch 'master' of git.qos.ch:logback-audit http://github.com/ceki/logback-audit/commit/38bb45838aa9e157f76243fe443acd1… commit 38bb45838aa9e157f76243fe443acd1cc9efb3b2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 24 23:08:16 2011 +0200 preparing release 0.5 diff --git a/audit-client/pom.xml b/audit-client/pom.xml index e38ab76..5531df1 100644 --- a/audit-client/pom.xml +++ b/audit-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/audit-common/pom.xml b/audit-common/pom.xml index 477a321..aab3f12 100644 --- a/audit-common/pom.xml +++ b/audit-common/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/audit-examples/pom.xml b/audit-examples/pom.xml index eec6091..e6a0352 100644 --- a/audit-examples/pom.xml +++ b/audit-examples/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -57,23 +57,4 @@ </build> - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <configuration> -  - </configuration> - </plugin> - </plugins> - </reporting> - - - - </project> \ No newline at end of file diff --git a/audit-server/pom.xml b/audit-server/pom.xml index 4fb1a61..855f40c 100755 --- a/audit-server/pom.xml +++ b/audit-server/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/audit-site/pom.xml b/audit-site/pom.xml index 84edf74..2b22f84 100755 --- a/audit-site/pom.xml +++ b/audit-site/pom.xml @@ -6,17 +6,28 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> - - <groupId>ch.qos.logback</groupId> <artifactId>audit-site</artifactId> <packaging>jar</packaging> <name>Logback Audit Site</name> <url>http://audit.qos.ch</url> + + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + </license> + + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> + </license> + </licenses> + <build> <resources> <resource> @@ -28,29 +39,33 @@ </resource> </resources> - </build> - - - <reporting> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <configuration> - <outputDirectory>${project.parent.basedir}/target/site - </outputDirectory> + <outputDirectory>${project.parent.basedir}/target/site</outputDirectory> </configuration> + +  +  +  +  +  +  +  +  +  </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> - </plugin> + </plugins> + + </build> + + + <reporting> + <plugins> + + </plugins> </reporting> diff --git a/audit-site/src/site/pages/bugreport.html b/audit-site/src/site/pages/bugreport.html new file mode 100755 index 0000000..35cf479 --- /dev/null +++ b/audit-site/src/site/pages/bugreport.html @@ -0,0 +1,93 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Bug report</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> + + <body> + <script type="text/javascript">prefix='';</script> + + <script src="templates/header.js" type="text/javascript"></script> + <div id="left"> + <script src="templates/left.js" type="text/javascript"></script> + </div> + <div id="content"> + + + + + <h2>Before you report a bug</h2> + + <p>The logback community consists of those who use logback and its + modules, help answer questions on discussions lists, contribute + documentation and patches, and those who develop and maintain its + code. Those who assist on a day to day basis resolving bug reports + do this for a wide variety of reasons, and almost all of them do + this on their own time.</p> + + <p>Many bugs reported end up not being a bug in logback, but are + due to misconfiguration, problems caused by installed + applications, the operating system, etc. + </p> + + <p>Before reporting a bug please make every effort to resolve the + problem yourself. Just reporting a bug will not fix it. A good + bug report includes a detailed description of the problem and a + succinct test case which can reproduce the problem. + </p> + + <h3>Review the documentation</h3> + + <p>Review the documentation for the version of component you are + using. The problem you are having may already be addressed in the + docs. + </p> + + <h3>Search the mailing list archives</h3> + + <p>It is very likely you are not the first to run into a problem. + Others may have already found a solution. Our various mailing lists + are likely to have discussed this problem before. + </p> + + <h3>Search JIRA</h3> + + <p>Please search the bug database to see if the bug you are seeing + has already been reported. The bug may have already been fixed + and is available in a later version. If someone else has reported + the same bug, you could add supporting information to help + reproduce and resolve the bug. + </p> + + <ul> + <li><a href="http://jira.qos.ch/secure/IssueNavigator.jspa">Search + for logback bugs</a></li> + </ul> + + <h3>Reporting a bug</h3> + + <p>Only after you have exhausted the aforementioned steps, should + you file a formal report in JIRA, our bug tracking system. + </p> + + <p>Please make sure you provide as much information as possible. + It is hard to fix a bug if the person looking into the problem + cannot reproduce it. + </p> + + <ul> + <li><a + href="http://jira.qos.ch/secure/CreateIssue!default.jspa">Report + new logback bug</a></li> + </ul> + + <script src="templates/footer.js" type="text/javascript"></script> + +</div> +</body> +</html> diff --git a/audit-site/src/site/pages/css/_print.css b/audit-site/src/site/pages/css/_print.css new file mode 100644 index 0000000..84b45b0 --- /dev/null +++ b/audit-site/src/site/pages/css/_print.css @@ -0,0 +1,30 @@ + +body { + margin: 0px; + padding: 100px 0px 2px 0px; + line-height: 1.3em; + font-size: 12px; +} + +#left, #right, span.asGroovy { + width: 0px; + height: 0px; + display: none; + visibility:hidden; +} + +#bodyColumn { + margin-right: 1.5em; + margin-left: 0px; /*was: 197*/ +} + + +table.bodyTable td { + vertical-align: text-top; +} + +table.bodyTable th { + vertical-align: text-top; + text-align:center; +} + diff --git a/audit-site/src/site/pages/css/common.css b/audit-site/src/site/pages/css/common.css new file mode 100644 index 0000000..1c4e954 --- /dev/null +++ b/audit-site/src/site/pages/css/common.css @@ -0,0 +1,274 @@ +html { +/* padding:0px; + margin:0px; */ +} + + +a { + color: #0000CC; + background-color:transparent; + text-decoration: none; +} + +#content a:hover { + text-decoration: underline; +} + +.example { + width: 90%; + font-style: italic; +} + + +div.source { + margin-top: 1em; +} + +.longline { + overflow: scroll; +} + +.source, .command, .console { + border-top: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + background: #eee; + font-family: Courier, "MS Courier New", Prestige, monospace; + padding-left: 1ex; + white-space: pre; +} + +.source { + padding-bottom: 0.5ex; + padding-top: 0.5ex; +} + +.command { + padding-bottom: 0ex; + padding-top: 0ex; +} + +.console { +} + +pre { + padding: 0px; + margin: 0px; + background-color:transparent; + font-family: Courier, Monaco, Monospace; +} + +.alignright { + margin-top: 0; + text-align: right; + font-size: 10px; +} + + +h1, h2, h3, h4 { + color: #333; + padding-top: 0ex; + background-color: transparent; +} + +h2 { + font-weight: 900; + font-size: x-large; +} + +h3 { + font-weight: bold; + font-size: large; +} + +h4 { + font-weight: bold; + font-size: medium; +} + +table.footer { + width: 100%; +} + +.footer { + color: #564b47; + background-color: #fff; + padding:0px; + border-top: 1px solid #CCCCCC; + margin-top: 3ex; + font-size: smaller; +} + + +p.menu { + padding-top: 0px; + padding-bottom: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +.small { + font-size: smaller; +} + +.strong, .bold { + /*font-size: 13px;*/ + font-weight: bold; +} + +/* ========== body table ============ */ +table.bodyTable { + padding: 0px; + margin-left: -2px; + margin-right: -2px; +} + +table.bodyTable th { + color: white; + background-color: #bbb; + font-weight: bold; +} + + +table.bodyTable td { + vertical-align: text-top; + padding-left: 0.5ex; + padding-bottom: 0.5ex; +} + + +/* apply to tr elements of tables which are both bodytable and dark */ +table[class="bodyTable dark"] tr { + background-color: #ddd; +} + +/* apply to tr elements of tables which are both bodytable and dark */ +table[class="bodyTable properties"] tr { + vertical-align: top; +} + +table.bodyTable tr.a { + background-color: #ddd; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +table.bodyTable tr.alt { + background-color: #eee; +} + +/* we don't want the first p under td to appear indented */ +table.bodyTable tr td p:first-child { + padding-top: 0px; + margin-top: 0px; +} + +/* EOF =============== bodyTable =============== */ + +.author { + text-align: left; + font-weight: bold; +} + +.definition { + padding-left: 5px; + padding-right: 5px; + margin: 5px 50px 5px 50px; + text-align: justify; + background-color: #E6E64C; +} + +.deftitle { + font-weight: bold; +} + + +.big { + font-size: 130%; +} + + +.green { + color: green; +} + +.white_bg { + background-color: #FFFFFF; +} + +.lgray_bg { + background-color: #EEE; +} + + +.blue { + color: blue; +} + +.red { + color: red; +} + +.redBold { + color: red; + font-weight: bold; +} + +.greenBold { + color: green; + font-weight: bold; +} + +.code { + font-family: Courier, monospace; + color: #666; +} + +.variable { + font-family: Courier, monospace; + font-style:italic; +} + + + +.attr { + font-family: Courier, monospace; + font-style:italic; + +} + +.option { + border-top: 1px dotted black; + border-bottom: 1px dotted black; + border-left: 1px dotted black; + border-right: 1px dotted black; + padding-left: 2px; + padding-right: 2px; + font-family: Arial, sans-serif; +} + +.highlight { + width: 300px; + float: right; + display: inline; + font-weight: bolder; + border:1px solid #000; + background:#FFCC99; + padding-top: 0px; + padding-left: 1ex; + padding-right: 1ex; + margin-left: 3em; + margin-right: 3em; +} + +.quote { + text-align: right; + padding-left: 12em; +} + +/* --------- numbering --------- */ +.autoEx:before { + counter-increment: example; /* Add 1 to example */ + content: counter(example) +} \ No newline at end of file diff --git a/audit-site/src/site/pages/css/popup.css b/audit-site/src/site/pages/css/popup.css new file mode 100644 index 0000000..2b20468 --- /dev/null +++ b/audit-site/src/site/pages/css/popup.css @@ -0,0 +1,67 @@ + +/* =========== popup ================== */ +#backgroundPopup { + display:none; + position:fixed; + _position:absolute; /* hack for internet explorer 6*/ + height:100%; + width:100%; + top:0; + left:0; + background:#000000; + border:1px solid #cecece; + z-index:1; +} + +#popupContents { + display:none; + position:fixed; + _position:absolute; /* hack for internet explorer 6*/ + height: 150px; + width: 408px; + background:#FFFFFF; + border: 2px solid #cecece; + z-index:2; + padding-left: 1ex; + font-size:13px; +} + +#popupContents p { + margin: 0px; +} +#popupContents h3 { + margin: 0px; +} + +#popupContactClose { + font-size:14px; + line-height:14px; + right:6px; + top:4px; + position:absolute; + color:#6fa5fd; + font-weight:700; + display:block; +} + +a.popupLink { + background: #FFF; + color: #0079C5; + font-family: "Comic Sans MS", sans-serif; + white-space: nowrap; + font-size: 14px; + font-weight: bold; + + border-top: 2px solid #DDD; + border-left: 2px solid #DDD; + border-right: 2px solid #888; + border-bottom: 2px solid #888; + padding: 0px 1em 0px 1em; + margin: 0px 0px 3px 0px; +} + +a.popupLink:hover { + background: #E0E0EF; + cursor: pointer; +} + diff --git a/audit-site/src/site/pages/css/prettify.css b/audit-site/src/site/pages/css/prettify.css new file mode 100644 index 0000000..351152b --- /dev/null +++ b/audit-site/src/site/pages/css/prettify.css @@ -0,0 +1,27 @@ +/* Pretty printing styles. Used with prettify.js. */ + +.str { color: #080; } +.kwd { color: #008; } +.com { color: #800; } +.typ { color: #606; } +.lit { color: #066; } +.pun { color: #660; } +.pln { color: #000; } +.tag { color: #008; } +.atn { color: #606; } +.atv { color: #080; } +.dec { color: #606; } +pre.prettyprint { padding: 2px; border: 1px solid #888; } + +@media print { + .str { color: #060; } + .kwd { color: #006; font-weight: bold; } + .com { color: #600; font-style: italic; } + .typ { color: #404; font-weight: bold; } + .lit { color: #044; } + .pun { color: #440; } + .pln { color: #000; } + .tag { color: #006; font-weight: bold; } + .atn { color: #404; } + .atv { color: #060; } +} diff --git a/audit-site/src/site/pages/css/print.css b/audit-site/src/site/pages/css/print.css deleted file mode 100644 index d110474..0000000 --- a/audit-site/src/site/pages/css/print.css +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Print css. - * -*/ -body { - margin: 0px; - padding: 0px 0px 2px 0px; - line-height: 1.3em; - font-size: 12px; -} - -#left, #right { - width: 0px; - height: 0px; - visibility:hidden; -} - -#bodyColumn { - margin-right: 1.5em; - margin-left: 0px; /*was: 197*/ -} - -pre { - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -table.bodyTable td { - vertical-align: text-top; -} - -table.bodyTable th { - vertical-align: text-top; - text-align:center; -} \ No newline at end of file diff --git a/audit-site/src/site/pages/css/screen.css b/audit-site/src/site/pages/css/screen.css new file mode 100644 index 0000000..61b4ef4 --- /dev/null +++ b/audit-site/src/site/pages/css/screen.css @@ -0,0 +1,145 @@ +html { +/* padding:0px; + margin:0px; */ +} + +body { + background-color: #fff; + font-family: Verdana, Arial, SunSans-Regular, Sans-Serif; + color: #000; + padding: 0px; + margin: 0px; + counter-reset: example; /* Create an example counter scope */ +} + +.footer { + color: #564b47; + background-color: #fff; + padding:0px; + border-top: 1px solid #CCCCCC; + margin-top: 3ex; + font-size: smaller; +} + + +#job img { + border:1px solid #DDDDDD; +} + +#job:hover img { + border:1px solid #8888EE; +} + +p.menu { + padding-top: 0px; + padding-bottom: 0px; + margin-top: 0px; + margin-bottom: 0px; + font-size: smaller; +} + + +#left { + position: absolute; + left: 0px; + width: 15em; + color: #564b47; + margin: 4px 0px 0px 4px; + padding: 0px; + border: 1px solid #cccccc; + background-color: #ffffff; + font-size: 80%; +} + +#left a, #right a { + display: block; + width: 95.5%; + margin: 0px; + padding: 2px; + border: solid 1px #FFFFFF; + color: #0066cc; + text-decoration: none; +} + +p.menu_header { + margin: 0px; + padding: 2px; + font-weight: normal; + background-color: #ffd0a0; + border-top: solid 1px #CCCCCC; + border-bottom: solid 1px #CCCCCC; +} + +#left a:hover, #right a:hover { + border: solid 1px #FFFFFF; + background-color: #3333CC; + color: #ffffff; +} + +#left a:hover.x { + background-color: #fff; +} + +#right { + position: absolute; + right: 0px; + width: 12em; + color: #564b47; + margin: 4px 4px 0px 0px; + padding: 0px; + background-color: #ffffff; + border: 1px solid #cccccc; + font-size: 80%; +} + +#left img { + display: block; + margin: 20px 0 20px 17px; + border: none; + width: 90px; + height: 30px; +} + +#headerLine { + background-color:#FFD0A0; + border:1px solid #CCCCCC; + font-size:small; + margin:0 4px; + padding:3px 10px; +} + +#content { + min-width:50em; + margin: 0px 15em 0px 15em; + padding: 0px; + background-color: #ffffff; +} + +#content img { + border:none; + margin-left: auto; + margin-right: auto; + display: block; +} + +span.asGroovy { + background: #fff; + color: #0079C5; + font-family: "Comic Sans MS", sans-serif; + white-space: nowrap; + font-size: 80%; + + border-top: 2px solid #DDD; + border-left: 2px solid #DDD; + border-right: 2px solid #888; + border-bottom: 2px solid #888; + padding: 0px 1em 0px 1em; + margin: -4px 4px 0 4px; + float: right; +} + +span.asGroovy:hover { + background: #E0E0EF; + cursor: pointer; +} + diff --git a/audit-site/src/site/pages/css/site.css b/audit-site/src/site/pages/css/site.css deleted file mode 100644 index 6ee917d..0000000 --- a/audit-site/src/site/pages/css/site.css +++ /dev/null @@ -1,309 +0,0 @@ -html { -/* padding:0px; - margin:0px; */ -} - -body { - background-color: #fff; - font-family: Verdana, Arial, SunSans-Regular, Sans-Serif; - color: #000; - padding: 0px; - margin: 0px; -} - -a { - color: #0000CC; - background-color:transparent; - text-decoration: none; -} - -#content a:hover { - text-decoration: underline; -} - -div.source { - margin-top: 1em; -} - -.source { - border-top: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background:#eee; - font-family: Courier, "MS Courier New", Prestige, Everson Monocourrier, monospace; - padding-bottom: 0.5ex; - padding-top: 0.5ex; - padding-left: 1ex; - white-space: pre; -} - -.command { - border-top: 1px solid #DDDDDD; - border-bottom: 1px solid #DDDDDD; - background:#eee; - font-family: Courier, "MS Courier New", Prestige, Everson Monocourrier, monospace; - padding-bottom: 0ex; - padding-top: 0ex; - padding-left: 1ex; - white-space: pre; -} - -pre { - padding: 0px; - margin: 0px; - background-color:transparent; - font-family: Courier, Monaco, Monospace; -} - -.alignright { - margin-top: 0; - text-align: right; - font-size: 10px; -} - - -h1, h2, h3, h4 { - color: #333; - padding-top: 0ex; - background-color: transparent; -} - -h2 { - font-weight: 900; - font-size: x-large; -} - -h3 { - font-weight: normal; - font-size: large; -} - -h4 { - font-weight: bolder; -} - -.footer { - text-align: right; - color: #564b47; - background-color: #fff; - padding:0px; - border-top: 1px solid #CCCCCC; - margin-top: 3ex; - font-size: smaller; -} - - -p.menu { - padding-top: 0px; - padding-bottom: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -.small { - font-size: smaller; -} - -strong { - /*font-size: 13px;*/ - font-weight: bold; -} - -/* positioning-layers static and absolute */ - -#breadcrumbs { - padding: 3px 10px 3px 10px; - margin: 0px 4px 0px 4px; - font-size: small; - border: 1px solid #CCCCCC; - /*border-bottom: 1px solid #aaa; - /* background-color: #ccc; lime; - border-color: #663300;*/ - background-color: #ffd0a0; - /*max-width: 77em;*/ -} - -#left { - position: absolute; - left: 0px; - width: 15em; - color: #564b47; - margin: 4px 0px 0px 4px; - padding: 0px; - border: 1px solid #cccccc; - background-color: #ffffff; - font-size: 80%; -} - -#left a, #right a { - display: block; - width: 95.5%; - margin: 0px; - padding: 2px; - border: solid 1px #FFFFFF; - color: #0066cc; - text-decoration: none; -} - -p.menu_header { - margin: 0px; - padding: 2px; - font-weight: normal; - background-color: #ffd0a0; - border-top: solid 1px #CCCCCC; - border-bottom: solid 1px #CCCCCC; -} - -#left a:hover, #right a:hover { - border: solid 1px #FFFFFF; - background-color: #3333CC; - color: #ffffff; -} - -#left a:hover.x { - background-color: #fff; -} - - -#content { - margin: 0px 15em 0px 15em; - padding: 0px; - background-color: #ffffff; -} - -#right { - position: absolute; - right: 0px; - width: 12em; - color: #564b47; - margin: 4px 4px 0px 0px; - padding: 0px; - background-color: #ffffff; - border: 1px solid #cccccc; - font-size: 80%; -} - -#left img { - display: block; - margin: 20px 0 20px 17px; - border: none; - width: 90px; - height: 30px; -} - -#content img { - border:none; - margin-left: auto; - margin-right: auto; - display: block; -} - -table.bodyTable { - padding: 0px; - width: 100%; - margin-left: -2px; - margin-right: -2px; -} - -table.bodyTable th { - color: white; - background-color: #bbb; - font-weight: bold; -} - - -table.bodyTable td { - padding-left: 0.5ex; - padding-bottom: 0.5ex; -} - - -table.bodyTable tr { - background-color: #ddd; -} - -table.bodyTable tr.b { - background-color: #eee; -} -table.bodyTable tr.alt { - background-color: #eee; -} -.author { - text-align: left; - font-weight: bold; -} - -.definition { - padding-left: 5px; - padding-right: 5px; - margin: 5px 50px 5px 50px; - text-align: justify; - background-color: #E6E64C; -} - -.deftitle { - font-weight: bold; -} - - -.big { - font-size: 130%; -} - -.green { - color: green; -} - -.white_bg { - background-color: #FFFFFF; -} - - -.blue { - color: blue; -} -.red { - color: red; -} - -.redBold { - color: red; - font-weight: bold; -} -.greenBold { - color: green; - font-weight: bold; -} - -code { - font-family: Courier, monospace; -} - - -.option { - border: 1px solid black; - font-family: Arial, sans-serif; -} - -.highlight { - width: 300px; - float: right; - display: inline; - font-weight: bolder; - border:1px solid #000; - background:#FFCC99; - padding-top: 0px; - padding-left: 1ex; - padding-right: 1ex; - margin-left: 3em; - margin-right: 3em; -} - -.quote { - text-align: right; - padding-left: 12em; -} - -.answer { - padding-left: 1.5em; - border-bottom: 1px solid black; -} \ No newline at end of file diff --git a/audit-site/src/site/pages/documentation.html b/audit-site/src/site/pages/documentation.html old mode 100644 new mode 100755 index c7fc062..c378545 --- a/audit-site/src/site/pages/documentation.html +++ b/audit-site/src/site/pages/documentation.html @@ -1,23 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> -<title>Documentation</title> -<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> -</head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Documentation</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> <body> - <script> -prefix=''; -</script> + <script>prefix='';</script> -<script src="templates/header.js"></script> -<div id="left"> - <script src="templates/left.js"></script> -</div> -<div id="right"> - <script src="templates/right.js"></script> -</div> -<div id="content"> + <script src="templates/header.js"></script> + <div id="left"> + <script src="templates/left.js"></script> + </div> + <div id="right"> + <script src="templates/right.js"></script> + </div> + + + <div id="content"> <h2>Logback documentation</h2> diff --git a/audit-site/src/site/pages/download.html b/audit-site/src/site/pages/download.html new file mode 100755 index 0000000..3a05e04 --- /dev/null +++ b/audit-site/src/site/pages/download.html @@ -0,0 +1,47 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Download</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> + <body> + <script type="text/javascript">prefix='';</script> + + <script src="templates/header.js" type="text/javascript"></script> + + <div id="left"> + <noscript>Please turn on Javascript to view this menu</noscript> + <script src="templates/left.js" type="text/javascript"></script> + </div> + + + + <div id="content"> + + <h2>Download links</h2> + + + <p>Logback-audit modules are available as downloads including full + source code, class files and documentation. + </p> + + <ul> + <li><a href="dist/logback-audit-${project.version}.zip">logback-audit-${project.version}.zip</a></li> + <li><a href="dist/logback-audit-${project.version}.tar.gz">logback-audit-${project.version}.tar.gz</a></li> + </ul> + + + <p>If you wish to download an older version of logback-audit, please + refer to the <a href="http://audit.qos.ch/dist/">distributions + directory</a>.</p> + + + <script src="templates/footer.js" type="text/javascript"></script> +</div> +</body> +</html> diff --git a/audit-site/src/site/pages/index.html b/audit-site/src/site/pages/index.html old mode 100644 new mode 100755 index fb6cd25..efd9191 --- a/audit-site/src/site/pages/index.html +++ b/audit-site/src/site/pages/index.html @@ -1,10 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> -<title>Logback Audit</title> -<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> -</head> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Logback Audit</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> <body> <script> prefix=''; diff --git a/audit-site/src/site/pages/license.html b/audit-site/src/site/pages/license.html old mode 100644 new mode 100755 index db5cc98..4d97546 --- a/audit-site/src/site/pages/license.html +++ b/audit-site/src/site/pages/license.html @@ -1,44 +1,78 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> -<title>License</title> -<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> -</head> -<body> -<script> -prefix=''; -</script> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>License</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + + </head> + <body> + <script type="text/javascript">prefix='';</script> -<script src="templates/header.js"></script> -<div id="left"> - <script src="templates/left.js"></script> -</div> -<div id="right"> - <script src="templates/right.js"></script> -</div> -<div id="content"> - - <div class="section"> - <h2>Logback Audit License</h2> - </div> + <script src="templates/header.js" type="text/javascript"></script> + <div id="left"> + <script src="templates/left.js" type="text/javascript"></script> + </div> + <div id="content"> + + <div class="section"> + <h2>Logback License</h2> + </div> + + + <p>As of release 0.9.18, logback source code and binaries are + dual-licensed under the EPL v1.0 and the LGPL 2.1, or more + formally:</p> + + <p class="source">Logback: the reliable, generic, fast and flexible logging framework. +Copyright (C) 1999-2009, QOS.ch. All rights reserved. + +This program and the accompanying materials are dual-licensed under +either the terms of the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License v1.0</a> as published by +the Eclipse Foundation + + or (per the licensee's choosing) + +under the terms of the GNU <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">Lesser General Public License version 2.1</a> +as published by the Free Software Foundation.</p> - <p>Logback Audit, the flexible audit-logging framework is - commercial software copyrighted by QOS.ch.Usage is subject to - commercial licensing terms.</p> +  + + <p>The EPL/LGPL dual-license serves several purposes. The LGPL + license ensures <em>continuity</em> in terms of licensing of the + logback project. Prior to version 0.9.18, logback was licensed + (exclusively) under the LGPL v2.1. Moreover, since the EPL is + deemed <a + href="http://www.fsf.org/licensing/licenses/index_htm">incompatible</a> + by the Free Software Foundation, the LGPL will allow various + licensees, in particular software distributors who may be already + bound by the terms of the GPL or the LGPL, to distribute our + software. + </p> - <table> - <tr> - <td>For further information or to obtain a trial copy, please - contact</td> - <td><img src="images/audit-infoEMAIL.gif" - border="1" alt="" align="top" valign="top"/></td> - </tr> - </table> + <p>On the other hand, the EPL license will placate organizations + which refuse certain restrictions imposed by the LGPL. + </p> + + <p>If you wish to make a significant contribution to the logback + project, you are invited to file a <a + href="http://logback.qos.ch/cla.txt">Contributor License + Agreement</a>. The purpose of this agreement is to 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 projects 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> - -<script src="templates/footer.js"></script> </div> </body> </html> diff --git a/audit-site/src/site/pages/mailinglist.html b/audit-site/src/site/pages/mailinglist.html old mode 100644 new mode 100755 index 0e2e835..60f93ee --- a/audit-site/src/site/pages/mailinglist.html +++ b/audit-site/src/site/pages/mailinglist.html @@ -1,94 +1,154 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> -<title>Mailing lists</title> -<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> -</head> -<body> - <script> -prefix=''; -</script> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Mailing lists</title> + + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> + <body> + <script type="text/javascript">prefix='';</script> -<script src="templates/header.js"></script> -<div id="left"> - <script src="templates/left.js"></script> -</div> -<div id="right"> - <script src="templates/right.js"></script> -</div> -<div id="content"> + <script src="templates/header.js" type="text/javascript"></script> + <div id="left"> + <noscript>Please turn on Javascript to view this menu</noscript> + <script src="templates/left.js" type="text/javascript"></script> + </div> + <div id="content"> - - - <h2>Project Mailing Lists</h2> + <h2>Project Mailing Lists</h2> - <p>A mailing list is an electronic discussion forum that anyone can - subscribe to. When someone sends an email message to the mailing - list, a copy of that message is broadcast to everyone who is - subscribed to that mailing list. Mailing lists provide a simple and - effective communication mechanism. With potentially hundreds of - subscribers, there is a common set of etiquette guidelines that you - should observe. Please keep on reading. - </p> + <p>A mailing list is an electronic discussion forum that anyone + can subscribe to. When someone sends an email message to the + mailing list, a copy of that message is broadcast to everyone who + is subscribed to that mailing list. Mailing lists provide a simple + and effective communication mechanism. With potentially thousands + of subscribers, there is a common set of etiquette guidelines that + you should observe. Please keep on reading. + </p> - <h3>Respect the mailing list type</h3> + <h3>Respect the mailing list type</h3> + + <p>The "User" lists are where you can send questions and comments + about configuration, setup, usage and other "user" types of + questions. The "Developer" lists are where you can send questions and + comments about the actual software source code and other issues + related to development. + </p> - <p>The "Announce" list is reserved for logback-audit releated - annoucements. Please do not post on this list. - </p> - - <p>The "Support" list is where you can send questions and comments - about configuration, setup, usage and other questions about using - logback-audit. - </p> + <p>Some questions are appropriate for posting on both the "user" + and the "developer" lists. In this case, pick one and only one. Do + not cross post. + </p> + <table class="bodyTable"> + <tr class="a"> + <th>Name</th> + <th>Volume</th> + <th>Subscribe</th> + <th>Unsubscribe</th> + <th>Archives</th> + </tr> + <tr class="b"> + <td>QOS.ch announce List</td> + <td>Low</td> + <td> + <a + href="http://qos.ch/mailman/listinfo/announce"> + Subscribe + </a> + </td> + <td> + <a + href="http://qos.ch/mailman/options/announce"> + Unsubscribe + </a> + </td> + <td> + <a + href="http://www.qos.ch/pipermail/announce/"> + qos.ch + </a> + </td> + </tr> + <tr class="a"> + <td>Logback User List</td> + <td>Medium</td> + <td> + <a + href="http://qos.ch/mailman/listinfo/logback-user"> + Subscribe + </a> + </td> + <td> + <a + href="http://qos.ch/mailman/options/logback-user"> + Unsubscribe + </a> + </td> + <td> + <a + href="http://www.qos.ch/pipermail/logback-user/"> + qos.ch + </a> | + <a + href="http://marc.theaimsgroup.com/?l=logback-user"> + MARC + </a> | - <h3>Do not post in HTML</h3> + <a + href="http://www.nabble.com/Logback-User-f16252.html"> + Nabble + </a> + </td> + </tr> + <tr class="b"> + <td>Logback Dev List</td> + <td>Medium</td> + <td> + <a + href="http://qos.ch/mailman/listinfo/logback-dev"> + Subscribe + </a> + </td> + <td> + <a + href="http://qos.ch/mailman/options/logback-dev"> + Unsubscribe + </a> + </td> + <td> + <a + href="http://www.qos.ch/pipermail/logback-dev/"> + qos.ch + </a> | + <a + href="http://marc.theaimsgroup.com/?l=logback-dev"> + MARC + </a> | + <a + href="http://www.nabble.com/Logback-Dev-f16253.html"> + Nabble + </a> + </td> + </tr> + </table> - <p>Please do your best to ensure that you are not sending HTML or - "Stylelized" email to the list. If you are using Outlook or Outlook - Express or Eudora, chances are that you are sending HTML email by - default. There is usually a setting that will allow you to send - "Plain Text" email. - </p> + <p> </p> - <table class="bodyTable"> - <tr class="a"> - <th>Name</th> - <th>Volume</th> - <th>To subscribe or to unsubscribe</th> - <th>Archives</th> - </tr> - <tr class="b"> - <td>Logback-Audit Announce List</td> - <td>Low</td> - <td> - <a - href="http://qos.ch/mailman/listinfo/logback-audit-announce"> - List's web-page - </a> - </td> - - <td> - <a href="http://www.qos.ch/pipermail/logback-audit-announce/"> qos.ch </a> -  - </td> - </tr> - <tr class="a"> - <td>Logback-Audit Support List</td> - <td>Medium</td> - <td> <a href="http://qos.ch/mailman/listinfo/logback-audit-support">List's web-page</a> - </td> - <td><a href="http://www.qos.ch/pipermail/logback-audit-support/"> qos.ch </a> - </td> - </tr> - </table> + <h2>On IRC</h2> + <p>We can also be reached on IRC at <span + class="big"><code>irc.freenode.net#qos.ch</code></span>. </p> + <p> </p> - <script src="templates/footer.js"></script> + <script src="templates/footer.js" type="text/javascript"></script> </div> </body> </html> diff --git a/audit-site/src/site/pages/news.html b/audit-site/src/site/pages/news.html old mode 100644 new mode 100755 index 69cceb5..f525735 --- a/audit-site/src/site/pages/news.html +++ b/audit-site/src/site/pages/news.html @@ -1,14 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> -<title>News</title> -<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> -</head> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>News</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + </head> <body> - <script> -prefix=''; -</script> + <script>prefix='';</script> <script src="templates/header.js"></script> <div id="left"> @@ -23,10 +23,15 @@ prefix=''; <h2>Logback-Audit News</h2> - <p>You can receive logback-audit related announcements by - subscribing to the <a - href="http://www.qos.ch/mailman/listinfo/logback-audit-announce">logback-audit - announce</a> mailing list.</p> + <p>You can receive logback-audit-related announcements by subscribing to + the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch + announce</a> mailing list.</p> + + + <hr width="80%" align="center" /> + + <h3>October 24TH, 2011 - Release of logback-audit version 0.5 </h3> + <hr width="80%" align="center" /> diff --git a/audit-site/src/site/pages/templates/footer.js b/audit-site/src/site/pages/templates/footer.js old mode 100644 new mode 100755 index fe0a0f1..08094bd --- a/audit-site/src/site/pages/templates/footer.js +++ b/audit-site/src/site/pages/templates/footer.js @@ -1,4 +1,26 @@ -document.write('<p class="footer">') -document.write('Copyright © 2007-2008 <a href="http://www.qos.ch/">QOS.ch</a>') -document.write('</p>') \ No newline at end of file + +document.write('<table class="footer" border="0">') + +document.write('<tr>') + +document.write('<td valign="top">Copyright © 2011 <a href="http://www.qos.ch/">QOS.ch</a></td>') + +document.write(' <td rowspan="2">') +document.write(' <script type="text/javascript" src="http://www.ohloh.net/p/586885/widgets/project_users.js"></script>') +document.write(' </td>') + + +document.write('</tr>') + +AAT = '@' +DOOTT = '.' +document.write('<tr>') + +document.write('<td align="left" colspan="1">') +document.write('We are actively looking for volunteers to proofread the documentation. Please send your corrections or suggestions for improvement to "corrections' + AAT +'qos'+DOOTT+'ch". See also the <a href="http://articles.qos.ch/contributing.html">instructions for contributors</a>.'); +document.write('</td>') +document.write(' <td> </td>') +document.write('</tr>') + +document.write('</table>') diff --git a/audit-site/src/site/pages/templates/left.js b/audit-site/src/site/pages/templates/left.js old mode 100644 new mode 100755 index fd33cda..d8f606d --- a/audit-site/src/site/pages/templates/left.js +++ b/audit-site/src/site/pages/templates/left.js @@ -1,15 +1,13 @@ -document.write('<p class="menu_header">Logback project</p>'); +document.write('<p class="menu_header">Logback-Audit project</p>'); document.write('<p class="menu"><a href="' + prefix + 'index.html">Introduction</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); +document.write('<p class="menu"><a href="' + prefix + 'download.html">Download</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'documentation.html">Documentation</a></p>'); +document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); +document.write('<p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); +document.write('<p class="menu_header">Support</p>'); document.write('<p class="menu"><a href="' + prefix + 'mailinglist.html">Mailing Lists</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'bugreport.html">Bug Report</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); -document.write('<p><a class="x" href="http://www.qos.ch/"><img src="' + prefix + 'images/logos/qosLogo.png" /></a></p>'); - -document.write('<span class="small">Last updated 2008-03-23</span>'); - document.write('</p>'); diff --git a/audit-site/src/site/resources/second_step.png b/audit-site/src/site/resources/second_step.png new file mode 100755 index 0000000..b4fe925 Binary files /dev/null and b/audit-site/src/site/resources/second_step.png differ diff --git a/pom.xml b/pom.xml index 5fc74df..47dccd0 100755 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <groupId>ch.qos.logback</groupId> <artifactId>audit-parent</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <packaging>pom</packaging> <name>Logback Audit Parent</name> - + <url>http://audit.qos.ch</url> @@ -34,8 +34,8 @@ <scope>test</scope> </dependency> </dependencies> - - + + <dependencyManagement> <dependencies> <dependency> @@ -61,13 +61,13 @@ <artifactId>logback-core</artifactId> <version>${logback.version}</version> </dependency> - + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>${logback.version}</version> </dependency> - + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -86,7 +86,7 @@ <version>${slf4j.version}</version> </dependency> - + <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> @@ -110,7 +110,7 @@ </dependencies> </dependencyManagement> - + <build> <extensions> <extension> @@ -156,37 +156,38 @@ <configuration> <downloadSources>true</downloadSources> </configuration> - </plugin> - </plugins> + </plugin> - </build> - - <reporting> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> <configuration> - <excludeModules>fml</excludeModules> - <excludeModules>apt</excludeModules> + <descriptors> + <descriptor> + src/main/assembly/dist.xml + </descriptor> + </descriptors> + <finalName> + logback-audit-${project.version} + </finalName> + <appendAssemblyId>false</appendAssemblyId> + <outputDirectory>target/site/dist/</outputDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> - <reportSets> - <reportSet><reports/></reportSet> - </reportSets> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> + <artifactId>maven-site-plugin</artifactId> + <version>3.0</version> <configuration> - <aggregate>true</aggregate> + <reportPlugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <configuration> + <aggregate>true</aggregate> <links> <link> http://java.sun.com/j2se/1.5.0/docs/api @@ -210,22 +211,39 @@ <packages>examples*</packages> </group> </groups> - </configuration> - </plugin> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - <configuration> - <includes> - <include>examples/*.java</include> - </includes> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <configuration> + <includes> + <include>examples/*.java</include> + </includes> + </configuration> + </plugin> + </reportPlugins> </configuration> </plugin> + </plugins> - </reporting> + </build> + +  +  +  +  +  +  +  +  +  +  +  +  <profiles> <profile> @@ -268,7 +286,7 @@ <id>pixie</id> <url>scp://pixie.qos.ch/var/mvnrepo/</url> </repository> - + </distributionManagement> diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml new file mode 100755 index 0000000..c1ec63c --- /dev/null +++ b/src/main/assembly/dist.xml @@ -0,0 +1,184 @@ +<assembly> + <id>dist</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + </formats> + <fileSets> +  + <fileSet> + <directory>audit-common/</directory> + <outputDirectory>audit-common/</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <excludes><exclude>*.bak</exclude></excludes> + </fileSet> + <fileSet> + <directory>audit-server/</directory> + <outputDirectory>audit-server/</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>audit-client/</directory> + <outputDirectory>audit-client/</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>audit-examples/</directory> + <outputDirectory>audit-examples/</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>audit-site/</directory> + <outputDirectory>audit-site/</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> +  + <fileSet> + <directory>audit-common/src/</directory> + <outputDirectory>audit-common/src/</outputDirectory> + <excludes> + <exclude> + test/output/ + </exclude> + </excludes> + </fileSet> + <fileSet> + <directory>audit-server/src/</directory> + <outputDirectory>audit-server/src/</outputDirectory> + </fileSet> + <fileSet> + <directory>audit-client/src/</directory> + <outputDirectory>audit-client/src/</outputDirectory> + </fileSet> + <fileSet> + <directory>audit-examples/src/</directory> + <outputDirectory>audit-examples/src/</outputDirectory> + <excludes> +  + </excludes> + </fileSet> +  + <fileSet> + <directory>audit-site/src/</directory> + <outputDirectory>audit-site/src/</outputDirectory> + </fileSet> +  + <fileSet> + <directory>audit-examples/target/</directory> + <outputDirectory>audit-examples/</outputDirectory> + <includes> + <include>audit-examples-${project.version}.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>audit-examples/lib/</directory> + <outputDirectory>audit-examples/lib</outputDirectory> + </fileSet> + <fileSet> + <directory>audit-examples/target/classes</directory> + <outputDirectory>audit-examples/</outputDirectory> + <includes> + <include>setClasspath.sh</include> + <include>setClasspath.cmd</include> + </includes> + </fileSet> + +  + <fileSet> + <directory>audit-common/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-common-${project.version}.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>audit-server/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-server-${project.version}.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>audit-client/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-client-${project.version}.jar</include> + </includes> + </fileSet> +  + <fileSet> + <directory>audit-common/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-common-${project.version}-sources.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>audit-server/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-server-${project.version}-sources.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>audit-client/target/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>audit-client-${project.version}-sources.jar</include> + </includes> + </fileSet> + + +  + <fileSet> + <directory>target/site</directory> + <outputDirectory>docs/</outputDirectory> + <excludes> + <exclude>dist/*</exclude> + <exclude>**/apidocs/**</exclude> + <exclude>**/testapidocs/**</exclude> + <exclude>**/xref/**</exclude> + <exclude>**/xref-test/**</exclude> + </excludes> + </fileSet> + +  + <fileSet> + <includes> + <include>src/</include> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + <excludes> + <exclude>*.bak</exclude> + </excludes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: audit-client/pom.xml | 2 +- audit-common/pom.xml | 2 +- audit-examples/pom.xml | 21 +-- audit-server/pom.xml | 2 +- audit-site/pom.xml | 53 +++-- audit-site/src/site/pages/bugreport.html | 93 ++++++ audit-site/src/site/pages/css/_print.css | 30 ++ audit-site/src/site/pages/css/common.css | 274 +++++++++++++++++ audit-site/src/site/pages/css/popup.css | 67 +++++ audit-site/src/site/pages/css/prettify.css | 27 ++ audit-site/src/site/pages/css/print.css | 38 --- audit-site/src/site/pages/css/screen.css | 145 +++++++++ audit-site/src/site/pages/css/site.css | 309 -------------------- audit-site/src/site/pages/documentation.html | 32 +- audit-site/src/site/pages/download.html | 47 +++ audit-site/src/site/pages/index.html | 12 +- audit-site/src/site/pages/license.html | 104 +++++--- audit-site/src/site/pages/mailinglist.html | 214 +++++++++----- audit-site/src/site/pages/news.html | 29 +- audit-site/src/site/pages/templates/footer.js | 28 ++- audit-site/src/site/pages/templates/left.js | 12 +- .../site/resources/{images => }/second_step.png | Bin 11470 -> 11470 bytes pom.xml | 102 ++++--- src/main/assembly/dist.xml | 184 ++++++++++++ 24 files changed, 1242 insertions(+), 585 deletions(-) create mode 100755 audit-site/src/site/pages/bugreport.html create mode 100644 audit-site/src/site/pages/css/_print.css create mode 100644 audit-site/src/site/pages/css/common.css create mode 100644 audit-site/src/site/pages/css/popup.css create mode 100644 audit-site/src/site/pages/css/prettify.css delete mode 100644 audit-site/src/site/pages/css/print.css create mode 100644 audit-site/src/site/pages/css/screen.css delete mode 100644 audit-site/src/site/pages/css/site.css mode change 100644 => 100755 audit-site/src/site/pages/documentation.html create mode 100755 audit-site/src/site/pages/download.html mode change 100644 => 100755 audit-site/src/site/pages/index.html mode change 100644 => 100755 audit-site/src/site/pages/license.html mode change 100644 => 100755 audit-site/src/site/pages/mailinglist.html mode change 100644 => 100755 audit-site/src/site/pages/news.html mode change 100644 => 100755 audit-site/src/site/pages/templates/footer.js mode change 100644 => 100755 audit-site/src/site/pages/templates/left.js copy audit-site/src/site/resources/{images => }/second_step.png (100%) mode change 100644 => 100755 create mode 100755 src/main/assembly/dist.xml hooks/post-receive -- Logback-audit: logging for events with business significance.

1 0

Looking for volunteers
by ceki 21 Oct '11

21 Oct '11

Hi all, I like to propose the following two projects for volunteer work. 1) the logback eclipse plugin (some work already exists) 2) an editor/guide/wizard to help writing logback configuration files Any volunteers? Comments? -- Ceki http://twitter.com/#!/ceki

1 0