Skip to content

Commit

Permalink
ow
Browse files Browse the repository at this point in the history 
Signed-off-by: Ceki Gulcu <[email protected]>
  • Loading branch information
@ceki
ceki committed Jan 12, 2023
1 parent 71fa431 commit 4d62979
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 53 deletions.
2 changes: 1 addition & 1 deletion mvni.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function scpLogback() {
}

function doRsync() {
ssh root@ge.qos.ch "rsync -r -p -z -l --exclude=log/ --delete rsync://yvo.qos.ch/www/www.slf4j.org /var/www"
ssh root@exo1.qos.ch "rsync -r -p -z -l --exclude=log/ --delete rsync://yvo.qos.ch/www/www.slf4j.org /var/www"
}


Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<latest.1.version>1.7.36</latest.1.version>
<latest.2.version>2.0.3</latest.2.version>
<latest.2.version>2.0.6</latest.2.version>
<latest.stable.version>${latest.2.version}</latest.stable.version>
<older.stable.version>${latest.1.version}</older.stable.version>
<logback-javax.version>1.3.2</logback-javax.version>
<logback-jakarta.version>1.4.2</logback-jakarta.version>
<reload4j.version>1.2.22</reload4j.version>
<logback-javax.version>1.3.5</logback-javax.version>
<logback-jakarta.version>1.4.5</logback-jakarta.version>
<reload4j.version>1.2.24</reload4j.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
Expand Down
53 changes: 31 additions & 22 deletions src/site/pages/css/site3.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
--max-menu-width: 14rem;

--main-logo-height: 2rem;
--sponsor-icon-height: calc(var(--main-logo-height) * 0.5);
--x-logo-height: calc(var(--main-logo-height) * 0.5);
--logo-in-menu-height: 2.5ex;
}

Expand All @@ -27,15 +25,6 @@ body {
padding: 0px;
counter-reset: example; /* Create an example counter scope */

/*display: grid;*/

/*gap: 0rem;*/
/*grid-template-columns: 1fr;*/
/*grid-template-areas:*/
/* 'headerArea'*/
/* 'contentArea';*/

/* mobile first */
margin-left: 1rem;
margin-right: 1rem;
}
Expand All @@ -54,8 +43,6 @@ table {

:root {
--main-logo-height: 3rem;
--sponsor-icon-height: calc(var(--main-logo-height) * 0.7);
--x-logo-height: calc(var(--main-logo-height) * 0.7);
}

body {
Expand All @@ -79,8 +66,16 @@ img.logo {
height: var(--main-logo-height);
}

img.sponsorIcon {
height: var(--sponsor-icon-height);
img.avatar-icon,
img.sponsor-icon,
img.twitter-logo{
max-height: calc(var(--main-logo-height))
}

div.twitter,
div.avatar {
width: calc(var(--main-logo-height) );
margin: 3px;
}

pre, div.bodyTable {
Expand Down Expand Up @@ -110,12 +105,7 @@ img.data {
/*max-width: calc(var(--max-width-on-wide-screen) * 0.75);*/
}

.twitter-logo{
height: var(--x-logo-height);
}
.github-logo {
height: var(--logo-in-menu-height);
}


/*-----------------------------------------*/

Expand Down Expand Up @@ -149,20 +139,34 @@ img.data {
align-self: end;
}

#header-grid-icons-item-flex-container {
display: flex;
flex-direction: row;
align-items: center; /* vertical alignment: */
/*justify-content: flex-end;*/
}

#header-grid-line-item {
grid-area: header-line-area;
}

div#ad {
grid-area: ad-area;
margin: 0.5rem;
}

div#ad,
.horizontal-ad {
max-height: calc(var(--main-logo-height) * 2);
}

.top-message {
background-color: #f9f9f9;
color: #999;
text-align: center;
border-bottom: 1px solid #EEE;
border-radius: 3px;
}

div#sponsor {
float: right;
display: flex;
Expand All @@ -178,6 +182,10 @@ div#sponsor {
padding: 0px;
}

div.pub {
margin: 0px;
padding: 0px;
}
p.sponsoredBy {
padding: 2px;
margin: 0px;
Expand All @@ -188,6 +196,7 @@ p.sponsoredBy {
border-bottom: solid 1px #CCCCCC;
}
div.spotify {
margin: 3px;
background-color: #FFEEDD;
}
img.spotify {
Expand Down
6 changes: 3 additions & 3 deletions src/site/pages/download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h2>STABLE version</h2>

<p>The current stable and actively developed version of SLF4J
is
<span class="big green">${latest.stable.version}</span>.
Expand All @@ -28,8 +28,8 @@ <h2>Older stable version (INACTIVE)</h2>
<p>The older stable SLF4J version is <span class="big
green">${older.stable.version}</span>. It is no longer actively
developed.</p>


<h2>Maven central</h2>

<p>SLF4J artifacts such as <em>.jar</em>, <em>.sources.jar</em>
Expand Down
3 changes: 2 additions & 1 deletion src/site/pages/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">


<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h2>Simple Logging Facade for Java (SLF4J)</h2>

Expand Down
1 change: 0 additions & 1 deletion src/site/pages/manual.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>SLF4J Manual</title>
<script type="text/javascript">prefix='';</script>

</head>

<body onLoad="enableMenuEventListeners(); hljs.highlightAll(); decorate();">
Expand Down
79 changes: 76 additions & 3 deletions src/site/pages/news.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ <h1>SLF4J News</h1>
class names in <code/>
-->

<hr noshade="noshade" size="1"/>

<h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>
<h2>On the 2.0.x series</h2>

<p class="highlight">The the 2.0.x series requires Java&nbsp;8 and
adds a backward-compatible <a
Expand All @@ -58,6 +56,81 @@ <h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>
href="faq.html#changesInVersion200">detailed</a> in the FAQ page.
</p>

<hr noshade="noshade" size="1"/>

<h3 class="doAnchor" name="2.0.6">2022-12-12 - Release of SLF4J 2.0.6</h3>


<p>&bull; When replaying events occuring during initialization, the
<code>LoggerFactory#replaySingleEvent</code> method now applies
filtering by level by invoking the filtering methods of the
underlying logging system whereas previous the underlying system
was invoked without filtering. This fixes <a
href="https://jira.qos.ch/browse/SLF4J-575">SLF4J-575</a> reported
by Patrick Doyle.</p>

<p>&bull; Artifacts creation now invokes the BND tool to generate
OSGi headers, in particular "uses" clases. This fixes <a
href="https://jira.qos.ch/browse/SLF4J-574">SLF4J-574</a> reported
Jonah Graham who also provided the relevant PR.</p>


<p>&bull; The binary of this version can be reproduced by checking
out the tag v_2.0.6 from the source code repository
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
under Linux Debian 11.2.</p>


<hr noshade="noshade" size="1"/>

<h3 class="doAnchor" name="2.0.5">2022-11-25 - Release of SLF4J 2.0.5</h3>

<p>&bull; If a <code>SecurityManager</code> is installed, then
<code>LoggerFactory</code> will now load providers as a privileged
action by invoking
<code>AccessController.doPrivileged()</code>. This will allow
Wildfy-Core to upgrade to SLF4J 2.0.x as discussed in <a
href="https://github.com/qos-ch/slf4j/pull/304">PR 304</a>
contributed by Piotr P. Karwasz.
</p>

<p>&bull; The binary of this version can be reproduced by checking
out the tag v_2.0.5 from the source code repository
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
under Linux Debian 11.2.</p>

<hr noshade="noshade" size="1"/>

<h3 class="doAnchor" name="2.0.4">2022-11-17 - Release of SLF4J 2.0.4</h3>

<p>&bull; <code>LoggerFactory</code> now uses the class loader that
loaded <code>LoggerFactory</code> class itself to find providers of
type <code>SLF4JServiceProvider</code>. Previously, the thread
context class loader was used. This was unintentional and the
current behavior more closely matches that of the SLF4J 1.7 series
and earlier. This tentatively fixes <a
href="https://jira.qos.ch/browse/SLF4J-544">SLF4J-544</a> as well
as several other related/duplicating issues.
</p>

<p>&bull; The <code>MANIFEST.MF</code> files of slf4j-api,
slf4j-jdk14, slf4j-nop, slf4j-reload4j and slf4j-simple modules now
declare the appropriate OSGi <code>Require-Capability</code> and
<code>Provide-Capability</code> statements in relation to
<code>org.slf4j.spi.SLF4JServiceProvider</code> service. This fixes
<a href="https://jira.qos.ch/browse/SLF4J-572">SLF4J-572</a>
reported by Stefan Bischof who also provided the relevant PR.
</p>

<p>&bull; The binary of this version can be reproduced by checking
out the tag v_2.0.4 from the source code repository
(GitHub). Release built using Java "19" 2022-09-20 build 19+36-2038
under Linux Debian 11.2.</p>

<hr noshade="noshade" size="1"/>

<h3 class="doAnchor" name="2.0.3">2022-09-28 - Release of SLF4J 2.0.3</h3>

<p>&bull; Fixed a bug in <code>Reload4jLoggerAdapter</code> when
used in conjunction with the fluent API, the timestamp would not be
correctly set. This issue was reported
Expand Down
38 changes: 27 additions & 11 deletions src/site/pages/templates/header3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ function insertLogoAndMenu() {
document.write(' <i class="fa-regular fa-code-branch"></i> Source Repository');
//document.write(' <img style="vertical-align: middle;" class="github-logo" src="' + prefix + 'images/GitHub-Mark-32px.png" alt="Source code" /> Source Repository</a>');
document.write(' </a>');
document.write(' <a href="' + prefix + 'count/tidelift.html">');
document.write(' <i class="fa-regular fa-t"></i> Tidelift');
document.write(' </a>');

//document.write(' <a href="http://www.qos.ch/shop/products/professionalSupport"><i class="fa-regular fa-rectangle-pro"></i> Support offerings</a>');
document.write(' </div>');
document.write(' </div>'); // hanging div END
Expand All @@ -42,26 +46,24 @@ function insertLogoAndMenu() {
document.write(' <div>'); // hanging div START
document.write(' <div class="dropdown-heading">Wrapped implementations</div>');
document.write(' <div class="dropdown-links">');
document.write(' <a href="api/org/slf4j/jul/JDK14LoggerAdapter.html">JUL</a>');
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">log4j 1.x (replaced by reload4j)</a>');
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">reload4j</a>');
document.write(' <a href="api/org/slf4j/simple/SimpleLogger.html">Simple</a>');
document.write(' <a href="api/org/slf4j/jul/JDK14LoggerAdapter.html">slf4j-jdk14</a>');
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">slf4j-log4j 1.x (superseded by slf4j-reload4j)</a>');
document.write(' <a href="api/org/slf4j/reload4j/Reload4jLoggerAdapter.html">slf4j-reload4j</a>');
document.write(' <a href="api/org/slf4j/simple/SimpleLogger.html">slf4j-simple</a>');
document.write(' </div>');
document.write(' </div>'); // hanging div END
document.write(' <div>'); // hanging div START
document.write(' <div class="dropdown-heading">Other implementations</div>');
document.write(' <div class="dropdown-links">');
document.write(' <a href="https://tinylog.org/v2/download/#slf4j">tinylog</a>');
document.write(' <a href="' + prefix +'count/tinylog.html">tinylog</a>');
document.write(' <a href="' + prefix +'count/jboss.html">JBoss logging</a>');
document.write(' </div>');
document.write(' </div>'); // hanging div END

document.write(' </div>');
document.write(' </div>');
}


document.write('<div id="header">');

document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/site3.css"/>');
document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/menu2.css"/>');
document.write('<link rel="stylesheet" type="text/css" href="'+prefix+'css/stackoverflow-light.min.css"/>');
Expand All @@ -75,6 +77,8 @@ document.write('<script type="text/javascript" src="'+prefix+'js/menuListener.js
document.write('<script type="text/javascript" src="'+prefix+'js/decorator.js"></script>');
document.write('<script type="text/javascript" src="'+prefix+'js/highlight.min.js"></script>');

document.write('<div id="header">');

document.write('<div id="header-grid">');

document.write('<div id="header-grid-logo-item">');
Expand All @@ -83,24 +87,36 @@ document.write('</div>');

document.write('<div id="header-grid-icons-item">');

document.write('<div id="header-grid-icons-item-flex-container">');

document.write(' <div class="sponsor">');
document.write(' <a href="' + prefix +'count/sponsor.html"">');
document.write(' <img class="sponsorIcon" src="' + prefix + 'images/sponsor.png" alt="Sponsor qos-ch"/>');
document.write(' <img class="sponsor-icon" src="' + prefix + 'images/sponsor.png" alt="Sponsor qos-ch"/>');
document.write(' </a>');
document.write(' </div>');

document.write(' <div class="twitter">');
document.write(' <a href="' + prefix +'count/twitter.html">');
document.write(' <img class="twitter-logo" src="' + prefix + 'images/TwitterLogo_blue.svg" alt="Follow @qos_ch on Twitter"/>');
document.write(' </a>');
document.write(' </div>');

// close header-grid-icons-item-flex-container
document.write('</div>');
// close #header-grid-icons-item
document.write('</div>');

// div close #header-grid-icons-item
document.write(' <div id="header-grid-line-item" class="headerline"></div>');

document.write('<div id="ad">');
document.write(' <script type="text/javascript" src="'+prefix+'templates/ad.js" ></script>');
document.write('<div id="ad" class="top-message">');
document.write(' <p>Need an issue fixed as soon as possible? Consider <a href="'+prefix+'count/champion.html"><i class="fa-regular fa-trophy"></i> championing a release</a>.</p>');
document.write('</div>');

// document.write('<div id="ad">');
// document.write(' <script type="text/javascript" src="'+prefix+'templates/ad.js" ></script>');
// document.write('</div>');

// close #header-grid
document.write('</div>');

Expand Down
17 changes: 10 additions & 7 deletions src/site/pages/templates/sponsoredBy.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@

document.write('<div id="sponsor">');

document.write(' <p class="sponsoredBy">&nbsp;Sponsored by:</p>');
document.write('<p class="sponsoredBy">&nbsp;Sponsored by:</p>');

document.write(' <div class="spotify"><a href="' + prefix +'count/spotify.html" style="">'+
'<img class="spotify" alt="Spotify R&amp;D" src="' + prefix + 'images/logos/spotify-rnd-black.png"/>'+
'</a></div>');
document.write('<div class="pub">');
document.write(' <a href="' + prefix +'count/spotify.html" style="">');
document.write(' <img class="spotify" alt="Spotify R&amp;D" src="' + prefix + 'images/logos/spotify-rnd-black.png"/>');
document.write(' </a>');
document.write(' <a href="' + prefix +'count/exoscale.html" style="">');
document.write(' <img class="exoscale" alt="Exoscale" src="' + prefix + 'images/logos/exoscale.png"/>');
document.write(' </a>');

document.write(' <div><a href="' + prefix +'count/exoscale.html" style="">'+
'<img class="exoscale" alt="Exoscale" src="' + prefix + 'images/logos/exoscale.png"/>'+
'</a></div>');

document.write('</div>');

// close div.sponsor
document.write('</div>');

0 comments on commit 4d62979

Please sign in to comment.