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/423e8e2578db92ca8ee98598b3d9f5b4... commit 423e8e2578db92ca8ee98598b3d9f5b427ee2ea6 Merge: 38bb458 a32d999 Author: Ceki Gulcu <ceki@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/38bb45838aa9e157f76243fe443acd1c... commit 38bb45838aa9e157f76243fe443acd1cc9efb3b2 Author: Ceki Gulcu <ceki@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> - <!--<includes> - <include>**/include/*.java</include> - </includes> - --> - </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> + + <!--<reportPlugins>--> + <!--<plugin>--> + <!--<groupId>org.apache.maven.plugins</groupId>--> + <!--<artifactId>maven-project-info-reports-plugin</artifactId>--> + <!--<reportSets>--> + <!--<reportSet><reports/></reportSet>--> + <!--</reportSets>--> + <!--</plugin>--> + <!--</reportPlugins>--> </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> - <!-- <a href="http://www.nabble.com/Logback-Announce-f16251.html"> Nabble </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> + + <!--<reporting>--> + <!--<plugins>--> + <!--<plugin>--> + <!--<groupId>org.apache.maven.plugins</groupId>--> + <!--<artifactId>maven-project-info-reports-plugin</artifactId>--> + <!--<version>2.4</version>--> + <!--<reportSets>--> + <!--<reportSet><reports/></reportSet>--> + <!--</reportSets>--> + <!--</plugin>--> + <!--</plugins>--> + <!--</reporting>--> <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> + <!-- Module POMs --> + <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> + <!-- Module Source directories --> + <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> + <!--<exclude>main/resources/</exclude>--> + </excludes> + </fileSet> + <!--fileSet> + <directory>audit-examples/src/main/resources</directory> + <outputDirectory>audit-examples/</outputDirectory> + </fileSet --> + <fileSet> + <directory>audit-site/src/</directory> + <outputDirectory>audit-site/src/</outputDirectory> + </fileSet> + <!-- We also include the classes of the examples module --> + <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> + + <!-- Module JARs --> + <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> + <!-- Module Source JARs --> + <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> + + + <!-- Website --> + <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> + + <!-- Parent files --> + <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.