[GIT] SLF4J: Simple Logging Facade for Java branch, master, updated. v1.5.11-1-gbc8b8f8
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 "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via bc8b8f8eae7b16ff0227165e6e477f983f0f27eb (commit) from 00fe6c619057d7791180edc6c38d9151ed6f3d28 (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=slf4j.git;a=commit;h=bc8b8f8eae7b16ff0227165e6e4... http://github.com/ceki/slf4j/commit/bc8b8f8eae7b16ff0227165e6e477f983f0f27eb commit bc8b8f8eae7b16ff0227165e6e477f983f0f27eb Author: Ceki Gulcu <ceki@qos.ch> Date: Fri Mar 19 09:40:14 2010 +0100 - added popup asking users to subscribe to the announce mailing list - edits to the faq diff --git a/slf4j-site/src/site/pages/css/site.css b/slf4j-site/src/site/pages/css/site.css index 9208a75..e0fcc88 100644 --- a/slf4j-site/src/site/pages/css/site.css +++ b/slf4j-site/src/site/pages/css/site.css @@ -74,7 +74,7 @@ h2 { } h3 { - padding-top:10px; + padding-top: 5px; background-color: transparent; font-weight: normal; font-size: large; @@ -238,7 +238,7 @@ code { } .highlight { - width: 300px; + width: 300px; float: right; display: inline; font-weight: bolder; @@ -251,7 +251,15 @@ code { margin-right: 3em; } +.survey { + font-weight: bolder; + font-size: larger; + border:1px solid #cccccc; + background:#FFCC99; + padding-left: 1ex; + padding-right: 1ex; +} /* ========== body table ============ */ table.bodyTable { padding: 0px; @@ -295,3 +303,71 @@ table.bodyTable tr.alt { } /* EOF =============== bodyTable =============== */ + + +/* =========== 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/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index 3207e28..0ae95f7 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -7,20 +7,41 @@ <title>SLF4J Binary files</title> <link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> </head> - <body> + <body onload="centerPopup(); loadPopup();"> <script type="text/javascript">prefix='';</script> - + + <script type="text/javascript" src="http://jqueryjs.googlecode.com/files/jquery-1.2.6.min.js" ></script> + <script type="text/javascript" src="js/jquery.cookies.2.2.0.js"></script> + <script type="text/javascript" src="js/popup.js" ></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"> + <div id="popupContents"> + <h3>Would you like to subscribe to the QOS.CH announcements mailing + list?</h3> + + <p>The list is reserved for announcements related to QOS.CH + projects.</p> + <br/> + <table width="100%"> + <tr> + <td><a class="popupLink" id="announce">Yes, I'd like to subscribe.</a></td> + <td><a class="popupLink" id="popupContentsClose">No, thanks.</a></td> + </tr> + </table> + </div> + <div id="backgroundPopup"></div> + <div id="content"> + <h2>Latest official SLF4J distribution</h2> + <p>Download version ${project.version} including <i>full source code</i>, class files and documentation in ZIP or TAR.GZ format: </p> @@ -28,8 +49,7 @@ <li><a href="dist/slf4j-${project.version}.tar.gz"><b>slf4j-${project.version}.tar.gz</b></a> </li> <li><a href="dist/slf4j-${project.version}.zip"><b>slf4j-${project.version}.zip</b></a> </li> </ul> - - + <h3>Previous versions</h3> <p>Previous versions of SLF4J can be downloaded from the <a diff --git a/slf4j-site/src/site/pages/faq.html b/slf4j-site/src/site/pages/faq.html index eb9661c..fec33de 100644 --- a/slf4j-site/src/site/pages/faq.html +++ b/slf4j-site/src/site/pages/faq.html @@ -545,12 +545,6 @@ org.slf4j.impl.StaticLoggerBinder.SINGLETON from class org.slf4j.LoggerFactory which is an indirection in itself. </p> - <p>While one can come up with a seemingly working SLF4J-wrapper - within hours, many small technical issues will emerge over time - which Wombat developers will have to deal with. Note that SLF4J - has evolved over several years and has 170 bug reports filed - against it.</p> - <p>It is reasonable to assume that in most projects Wombat will be one dependency among many. If each library had its own logging wrapper, then each wrapper would presumably need to be @@ -558,15 +552,28 @@ org.slf4j.impl.StaticLoggerBinder.SINGLETON from class org.slf4j.LoggerFactory logging framework, namely SLF4J, the user of Wombat would have to detail with Wombat's logging wrapper as well. The problem will be compounded by each framework that comes up with its own - wrapper in order to make SLF4J optional. (Configuring 5 - different logging wrappers is not exactly exciting nor - endearing.) - </p> - - <p>For this reason, developers of frameworks should resist the - temptation to write their own logging wrapper. Not only is it a - waste of time of the developer, it will actually make life more - difficult for the users of said frameworks. + wrapper in order to make SLF4J optional. (Configuring or + dealing with the intricacies of five different logging wrappers + is not exactly exciting nor endearing.) + </p> + + <p>Some projects try to detect the presence of SLF4J on the + class path and switch to it if present. While this approach + seems transperent enough, it will result in erroneous location + information. Underlying logging frameworks will print the + location (class name and line number) of the wrapper instead of + the real caller. Then there is the question of API coverage as + SLF4J support MDC and markers in addition to parameterized + logging. While one can come up with a seemingly working + SLF4J-wrapper within hours, many qtechnical issues will emerge + over time which Wombat developers will have to deal with. Note + that SLF4J has evolved over several years and has 170 bug + reports filed against it.</p> + + <p>For the above reasons, developers of frameworks should resist + the temptation to write their own logging wrapper. Not only is + it a waste of time of the developer, it will actually make life + more difficult for the users of said frameworks. </p> </dd> diff --git a/slf4j-site/src/site/pages/js/jquery.cookies.2.2.0.js b/slf4j-site/src/site/pages/js/jquery.cookies.2.2.0.js new file mode 100644 index 0000000..c6dec07 --- /dev/null +++ b/slf4j-site/src/site/pages/js/jquery.cookies.2.2.0.js @@ -0,0 +1,450 @@ +/** + * Copyright (c) 2005 - 2010, James Auldridge + * All rights reserved. + * + * Licensed under the BSD, MIT, and GPL (your choice!) Licenses: + * http://code.google.com/p/cookies/wiki/License + * + */ +var jaaulde = window.jaaulde || {}; +jaaulde.utils = jaaulde.utils || {}; +jaaulde.utils.cookies = ( function() +{ + var resolveOptions, assembleOptionsString, parseCookies, constructor, defaultOptions = { + expiresAt: null, + path: '/', + domain: null, + secure: false + }; + /** + * resolveOptions - receive an options object and ensure all options are present and valid, replacing with defaults where necessary + * + * @access private + * @static + * @parameter Object options - optional options to start with + * @return Object complete and valid options object + */ + resolveOptions = function( options ) + { + var returnValue, expireDate; + + if( typeof options !== 'object' || options === null ) + { + returnValue = defaultOptions; + } + else + { + returnValue = { + expiresAt: defaultOptions.expiresAt, + path: defaultOptions.path, + domain: defaultOptions.domain, + secure: defaultOptions.secure + }; + + if( typeof options.expiresAt === 'object' && options.expiresAt instanceof Date ) + { + returnValue.expiresAt = options.expiresAt; + } + else if( typeof options.hoursToLive === 'number' && options.hoursToLive !== 0 ) + { + expireDate = new Date(); + expireDate.setTime( expireDate.getTime() + ( options.hoursToLive * 60 * 60 * 1000 ) ); + returnValue.expiresAt = expireDate; + } + + if( typeof options.path === 'string' && options.path !== '' ) + { + returnValue.path = options.path; + } + + if( typeof options.domain === 'string' && options.domain !== '' ) + { + returnValue.domain = options.domain; + } + + if( options.secure === true ) + { + returnValue.secure = options.secure; + } + } + + return returnValue; + }; + /** + * assembleOptionsString - analyze options and assemble appropriate string for setting a cookie with those options + * + * @access private + * @static + * @parameter options OBJECT - optional options to start with + * @return STRING - complete and valid cookie setting options + */ + assembleOptionsString = function( options ) + { + options = resolveOptions( options ); + + return ( + ( typeof options.expiresAt === 'object' && options.expiresAt instanceof Date ? '; expires=' + options.expiresAt.toGMTString() : '' ) + + '; path=' + options.path + + ( typeof options.domain === 'string' ? '; domain=' + options.domain : '' ) + + ( options.secure === true ? '; secure' : '' ) + ); + }; + /** + * parseCookies - retrieve document.cookie string and break it into a hash with values decoded and unserialized + * + * @access private + * @static + * @return OBJECT - hash of cookies from document.cookie + */ + parseCookies = function() + { + var cookies = {}, i, pair, name, value, separated = document.cookie.split( ';' ), unparsedValue; + for( i = 0; i < separated.length; i = i + 1 ) + { + pair = separated[i].split( '=' ); + name = pair[0].replace( /^\s*/, '' ).replace( /\s*$/, '' ); + + try + { + value = decodeURIComponent( pair[1] ); + } + catch( e1 ) + { + value = pair[1]; + } + + if( typeof JSON === 'object' && JSON !== null && typeof JSON.parse === 'function' ) + { + try + { + unparsedValue = value; + value = JSON.parse( value ); + } + catch( e2 ) + { + value = unparsedValue; + } + } + + cookies[name] = value; + } + return cookies; + }; + + constructor = function(){}; + + /** + * get - get one, several, or all cookies + * + * @access public + * @paramater Mixed cookieName - String:name of single cookie; Array:list of multiple cookie names; Void (no param):if you want all cookies + * @return Mixed - Value of cookie as set; Null:if only one cookie is requested and is not found; Object:hash of multiple or all cookies (if multiple or all requested); + */ + constructor.prototype.get = function( cookieName ) + { + var returnValue, item, cookies = parseCookies(); + + if( typeof cookieName === 'string' ) + { + returnValue = ( typeof cookies[cookieName] !== 'undefined' ) ? cookies[cookieName] : null; + } + else if( typeof cookieName === 'object' && cookieName !== null ) + { + returnValue = {}; + for( item in cookieName ) + { + if( typeof cookies[cookieName[item]] !== 'undefined' ) + { + returnValue[cookieName[item]] = cookies[cookieName[item]]; + } + else + { + returnValue[cookieName[item]] = null; + } + } + } + else + { + returnValue = cookies; + } + + return returnValue; + }; + /** + * filter - get array of cookies whose names match the provided RegExp + * + * @access public + * @paramater Object RegExp - The regular expression to match against cookie names + * @return Mixed - Object:hash of cookies whose names match the RegExp + */ + constructor.prototype.filter = function( cookieNameRegExp ) + { + var cookieName, returnValue = {}, cookies = parseCookies(); + + if( typeof cookieNameRegExp === 'string' ) + { + cookieNameRegExp = new RegExp( cookieNameRegExp ); + } + + for( cookieName in cookies ) + { + if( cookieName.match( cookieNameRegExp ) ) + { + returnValue[cookieName] = cookies[cookieName]; + } + } + + return returnValue; + }; + /** + * set - set or delete a cookie with desired options + * + * @access public + * @paramater String cookieName - name of cookie to set + * @paramater Mixed value - Any JS value. If not a string, will be JSON encoded; NULL to delete + * @paramater Object options - optional list of cookie options to specify + * @return void + */ + constructor.prototype.set = function( cookieName, value, options ) + { + if( typeof options !== 'object' || options === null ) + { + options = {}; + } + + if( typeof value === 'undefined' || value === null ) + { + value = ''; + options.hoursToLive = -8760; + } + + else if( typeof value !== 'string' ) + { + if( typeof JSON === 'object' && JSON !== null && typeof JSON.stringify === 'function' ) + { + value = JSON.stringify( value ); + } + else + { + throw new Error( 'cookies.set() received non-string value and could not serialize.' ); + } + } + + + var optionsString = assembleOptionsString( options ); + + document.cookie = cookieName + '=' + encodeURIComponent( value ) + optionsString; + }; + /** + * del - delete a cookie (domain and path options must match those with which the cookie was set; this is really an alias for set() with parameters simplified for this use) + * + * @access public + * @paramater MIxed cookieName - String name of cookie to delete, or Bool true to delete all + * @paramater Object options - optional list of cookie options to specify ( path, domain ) + * @return void + */ + constructor.prototype.del = function( cookieName, options ) + { + var allCookies = {}, name; + + if( typeof options !== 'object' || options === null ) + { + options = {}; + } + + if( typeof cookieName === 'boolean' && cookieName === true ) + { + allCookies = this.get(); + } + else if( typeof cookieName === 'string' ) + { + allCookies[cookieName] = true; + } + + for( name in allCookies ) + { + if( typeof name === 'string' && name !== '' ) + { + this.set( name, null, options ); + } + } + }; + /** + * test - test whether the browser is accepting cookies + * + * @access public + * @return Boolean + */ + constructor.prototype.test = function() + { + var returnValue = false, testName = 'cT', testValue = 'data'; + + this.set( testName, testValue ); + + if( this.get( testName ) === testValue ) + { + this.del( testName ); + returnValue = true; + } + + return returnValue; + }; + /** + * setOptions - set default options for calls to cookie methods + * + * @access public + * @param Object options - list of cookie options to specify + * @return void + */ + constructor.prototype.setOptions = function( options ) + { + if( typeof options !== 'object' ) + { + options = null; + } + + defaultOptions = resolveOptions( options ); + }; + + return new constructor(); +} )(); + +( function() +{ + if( window.jQuery ) + { + ( function( $ ) + { + $.cookies = jaaulde.utils.cookies; + + var extensions = { + /** + * $( 'selector' ).cookify - set the value of an input field, or the innerHTML of an element, to a cookie by the name or id of the field or element + * (field or element MUST have name or id attribute) + * + * @access public + * @param options OBJECT - list of cookie options to specify + * @return jQuery + */ + cookify: function( options ) + { + return this.each( function() + { + var i, nameAttrs = ['name', 'id'], name, $this = $( this ), value; + + for( i in nameAttrs ) + { + if( ! isNaN( i ) ) + { + name = $this.attr( nameAttrs[ i ] ); + if( typeof name === 'string' && name !== '' ) + { + if( $this.is( ':checkbox, :radio' ) ) + { + if( $this.attr( 'checked' ) ) + { + value = $this.val(); + } + } + else if( $this.is( ':input' ) ) + { + value = $this.val(); + } + else + { + value = $this.html(); + } + + if( typeof value !== 'string' || value === '' ) + { + value = null; + } + + $.cookies.set( name, value, options ); + + break; + } + } + } + } ); + }, + /** + * $( 'selector' ).cookieFill - set the value of an input field or the innerHTML of an element from a cookie by the name or id of the field or element + * + * @access public + * @return jQuery + */ + cookieFill: function() + { + return this.each( function() + { + var n, getN, nameAttrs = ['name', 'id'], name, $this = $( this ), value; + + getN = function() + { + n = nameAttrs.pop(); + return !! n; + }; + + while( getN() ) + { + name = $this.attr( n ); + if( typeof name === 'string' && name !== '' ) + { + value = $.cookies.get( name ); + if( value !== null ) + { + if( $this.is( ':checkbox, :radio' ) ) + { + if( $this.val() === value ) + { + $this.attr( 'checked', 'checked' ); + } + else + { + $this.removeAttr( 'checked' ); + } + } + else if( $this.is( ':input' ) ) + { + $this.val( value ); + } + else + { + $this.html( value ); + } + } + + break; + } + } + } ); + }, + /** + * $( 'selector' ).cookieBind - call cookie fill on matching elements, and bind their change events to cookify() + * + * @access public + * @param options OBJECT - list of cookie options to specify + * @return jQuery + */ + cookieBind: function( options ) + { + return this.each( function() + { + var $this = $( this ); + $this.cookieFill().change( function() + { + $this.cookify( options ); + } ); + } ); + } + }; + + $.each( extensions, function( i ) + { + $.fn[i] = this; + } ); + + } )( window.jQuery ); + } +} )(); \ No newline at end of file diff --git a/slf4j-site/src/site/pages/js/popup.js b/slf4j-site/src/site/pages/js/popup.js new file mode 100644 index 0000000..788a6de --- /dev/null +++ b/slf4j-site/src/site/pages/js/popup.js @@ -0,0 +1,102 @@ +/***************************/ +//@Author: Adrian "yEnS" Mato Gondelle +//@website: www.yensdesign.com +//@email: yensamg@gmail.com +//@license: Feel free to use it, but keep this credits please! +/***************************/ + +//SETTING UP OUR POPUP +//0 means disabled; 1 means enabled; +var popupStatus = 0; + +//loading popup with jQuery magic! +function loadPopup() { + var surveyCookie = $.cookies.get("SURVEY"); + if(surveyCookie) { + popupStatus = 0; + return; + } + //loads popup only if it is disabled + if(popupStatus==0){ + $("#backgroundPopup").css({ + "opacity": "0.7" + }); + $("#backgroundPopup").fadeIn("slow"); + $("#popupContents").fadeIn("slow"); + popupStatus = 1; + } +} + +function getDateInSixMonths() { + var date = new Date(); + date.setDate(date.getDate()+180); + return date; +} + +//disabling popup with jQuery magic! +function disablePopup(){ + //disables popup only if it is enabled + if(popupStatus==1){ + $("#backgroundPopup").fadeOut("slow"); + $("#popupContents").fadeOut("slow"); + popupStatus = 0; + $.cookies.set("SURVEY", "NO", {expiresAt: getDateInSixMonths()}); + } +} + +//centering popup +function centerPopup(){ + //request data for centering + var windowWidth = document.documentElement.clientWidth; + var windowHeight = document.documentElement.clientHeight; + var popupHeight = $("#popupContents").height(); + var popupWidth = $("#popupContents").width(); + //centering + $("#popupContents").css({ + "position": "absolute", + "top": windowHeight/2-popupHeight/2, + "left": windowWidth/2-popupWidth/2 + }); + //only need force for IE6 + + $("#backgroundPopup").css({ + "height": windowHeight + }); + +} + + +//CONTROLLING EVENTS IN jQuery +$(document).ready(function(){ + + //LOADING POPUP + //Click the button event! + $("#button").click(function(){ + //centering with css + centerPopup(); + //load popup + loadPopup(); + }); + + //CLOSING POPUP + //Click the x event! + $("#popupContentsClose").click(function(){ + disablePopup(); + }); + //Click out event! + $("#backgroundPopup").click(function(){ + //disablePopup(); + }); + //Press Escape event! + $(document).keypress(function(e){ + if(e.keyCode==27 && popupStatus==1){ + disablePopup(); + } + }); + + $("#announce").click(function(){ + $.cookies.set("SURVEY", "YES", {expiresAt: getDateInSixMonths()}); + window.location='http://www.qos.ch/mailman/listinfo/announce'; + }); +}); + diff --git a/slf4j-site/src/site/pages/templates/left.js b/slf4j-site/src/site/pages/templates/left.js index 276d5de..77cbc6e 100644 --- a/slf4j-site/src/site/pages/templates/left.js +++ b/slf4j-site/src/site/pages/templates/left.js @@ -31,8 +31,13 @@ document.write(' </p>'); document.write('</div>'); document.write('<p> </p>'); +document.write('<p class="survey">Take our <a href="http://ceki.questionform.com/public/slf4j">two question survey</a>.</p>'); + +document.write('<p> </p>'); document.write('<p class="pub">'); document.write(' <a href="https://www.qos.ch/shop/products/log4jManual">'); document.write(' <img src="images/buyDirect.jpg" border="0" title="" alt="buy direct from the developer"/>'); document.write(' </a>'); -document.write('</p>'); \ No newline at end of file +document.write('</p>'); + + ----------------------------------------------------------------------- Summary of changes: slf4j-site/src/site/pages/css/site.css | 80 ++++- slf4j-site/src/site/pages/download.html | 30 ++- slf4j-site/src/site/pages/faq.html | 33 +- .../src/site/pages/js/jquery.cookies.2.2.0.js | 450 ++++++++++++++++++++ slf4j-site/src/site/pages/js/popup.js | 102 +++++ slf4j-site/src/site/pages/templates/left.js | 7 +- 6 files changed, 681 insertions(+), 21 deletions(-) create mode 100644 slf4j-site/src/site/pages/js/jquery.cookies.2.2.0.js create mode 100644 slf4j-site/src/site/pages/js/popup.js hooks/post-receive -- SLF4J: Simple Logging Facade for Java
participants (1)
-
git-noreply＠pixie.qos.ch