update date of release

qos-ch · Dec 4, 2012 · 8923768 · 8923768
1 parent 7ab51f5
commit 8923768
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 63 deletions.
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java b/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java
@@ -33,18 +33,19 @@
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.status.InfoStatus;
 import ch.qos.logback.core.status.StatusManager;
+import ch.qos.logback.core.status.StatusUtil;
 import ch.qos.logback.core.status.WarnStatus;
 import ch.qos.logback.core.util.Loader;
 import ch.qos.logback.core.util.StatusPrinter;
 
 /**
  * A class that allows the LoggerFactory to access an environment-based
  * LoggerContext.
- * 
+ * <p/>
  * To add in catalina.sh
- * 
+ * <p/>
  * JAVA_OPTS="$JAVA_OPTS "-Dlogback.ContextSelector=JNDI""
- * 
+ *
  * @author Ceki G&uuml;lc&uuml;
  * @author S&eacute;bastien Pennec
  */
@@ -57,7 +58,7 @@ public class ContextJNDISelector implements ContextSelector {
 
   public ContextJNDISelector(LoggerContext context) {
     synchronizedContextMap = Collections
-        .synchronizedMap(new HashMap<String, LoggerContext>());
+            .synchronizedMap(new HashMap<String, LoggerContext>());
     defaultContext = context;
   }
 
@@ -109,7 +110,9 @@ public LoggerContext getLoggerContext() {
           } catch (JoranException je) {
           }
         }
-        StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext);
+        // logback-292
+        if (!StatusUtil.contextHasStatusListener(loggerContext))
+          StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext);
       }
       return loggerContext;
     }
@@ -123,29 +126,29 @@ private URL findConfigFileURL(Context ctx, LoggerContext loggerContext) {
     StatusManager sm = loggerContext.getStatusManager();
 
     String jndiEntryForConfigResource = JNDIUtil.lookup(ctx,
-        JNDI_CONFIGURATION_RESOURCE);
+            JNDI_CONFIGURATION_RESOURCE);
     // Do we have a dedicated configuration file?
     if (jndiEntryForConfigResource != null) {
       sm.add(new InfoStatus("Searching for [" + jndiEntryForConfigResource
-          + "]", this));
+              + "]", this));
       URL url = urlByResourceName(sm, jndiEntryForConfigResource);
       if (url == null) {
         String msg = "The jndi resource [" + jndiEntryForConfigResource
-            + "] for context [" + loggerContext.getName()
-            + "] does not lead to a valid file";
+                + "] for context [" + loggerContext.getName()
+                + "] does not lead to a valid file";
         sm.add(new WarnStatus(msg, this));
       }
       return url;
     } else {
       String resourceByConvention = conventionalConfigFileName(loggerContext
-          .getName());
+              .getName());
       return urlByResourceName(sm, resourceByConvention);
     }
   }
 
   private URL urlByResourceName(StatusManager sm, String resourceName) {
     sm.add(new InfoStatus("Searching for [" + resourceName + "]",
-        this));
+            this));
     URL url = Loader.getResource(resourceName, Loader.getTCL());
     if (url != null) {
       return url;
@@ -176,7 +179,7 @@ public LoggerContext getLoggerContext(String name) {
 
   /**
    * Returns the number of managed contexts Used for testing purposes
-   * 
+   *
    * @return the number of managed contexts
    */
   public int getCount() {
@@ -185,10 +188,10 @@ public int getCount() {
 
   /**
    * These methods are used by the LoggerContextFilter.
-   * 
+   * <p/>
    * They provide a way to tell the selector which context to use, thus saving
    * the cost of a JNDI call at each new request.
-   * 
+   *
    * @param context
    */
   public void setLocalContext(LoggerContext context) {

diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java b/logback-classic/src/main/java/ch/qos/logback/classic/selector/DefaultContextSelector.java
@@ -20,31 +20,31 @@
 
 public class DefaultContextSelector implements ContextSelector {
 
-  private LoggerContext context;
+  private LoggerContext defaultLoggerContext;
 
   public DefaultContextSelector(LoggerContext context) {
-    this.context = context;
+    this.defaultLoggerContext = context;
   }
 
   public LoggerContext getLoggerContext() {
     return getDefaultLoggerContext();
   }
 
   public LoggerContext getDefaultLoggerContext() {
-    return context;
+    return defaultLoggerContext;
   }
 
   public LoggerContext detachLoggerContext(String loggerContextName) {
-    return context;
+    return defaultLoggerContext;
   }
 
   public List<String> getContextNames() {
-    return Arrays.asList(context.getName());
+    return Arrays.asList(defaultLoggerContext.getName());
   }
 
   public LoggerContext getLoggerContext(String name) {
-    if (context.getName().equals(name)) {
-      return context;
+    if (defaultLoggerContext.getName().equals(name)) {
+      return defaultLoggerContext;
     } else {
       return null;
     }

diff --git a/logback-site/src/site/pages/css/screen.css b/logback-site/src/site/pages/css/screen.css
@@ -39,7 +39,7 @@ p.menu {
 }
 
 
-#left {
+#leftOld {
   position: absolute;
   font-size: 80%;
   left: 0px;
@@ -54,6 +54,26 @@ p.menu {
   border-radius: 3px;
 }
 
+#left {
+  position: absolute;
+  left: 0px;
+  width: 15em;
+  margin: 4px 0px 0px 4px; 
+  padding: 0px;
+  font-size: 80%;
+  background-color: #ffffff;
+}
+
+.menuGroup {
+  border: 1px solid #cccccc;  
+  background-color: #fff8e8;
+  color: #564b47;
+  border: 1px solid #cccccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
 #left a, #right a {
   display: block; 
   width: 95.5%; 

diff --git a/logback-site/src/site/pages/job.html b/logback-site/src/site/pages/job.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>Logback Home</title>
+    <title>Carrer at QOS.ch</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" />
@@ -34,57 +34,44 @@
     <div id="content">
 
 
-		<h2>Ingénieur Informatique</h2>
+		<h2>Software developer</h2>
 
-    <p>QoS.ch, ou Quality Open Software, est une société de conception
-    et de développement informatique basée à Lausanne - Suisse.</p>
+    <p>QoS.ch or Quality Open Software is a software development
+    company based in Lausanne, Switzerland.</p>
 
-    <p>Nous avons une grande expérience dans la réalisation de
-    logiciels d'entreprise en langage Java. Nous sommes également
-    fondateurs ou contributeurs actifs dans plusieurs projets open
-    source, notamment cal10n, logback, log4j, mistletoe et SLF4J.
+    <p>We have extensive experience building mission-critical
+    enterprise software in the Java language. We are also founding
+    contributors of several open source projects, namely log4j, slf4j,
+    mistletoe, cal10n and logback.
     </p>
 
-
-    <p>Afin de compléter notre équipe de développeurs pour la
-    réalisation de divers projets, autant open source que pour
-    répondre aux demandes de nos clients, nous recherchons un
-    ingénieur informatique ayant une excellente capacité de
-    développement logiciel. Dans un premier temps vous serez emmené à
-    travailler sur les projets slf4j et logback.
+    <p>We are looking for software engineers with excellent software
+    development skills.
     </p>
 
-    <h3>Votre profil:</h3>
+    <h3>Required qualifications</h3>
 
     <ul>
-      <li>Formation universitaire ou jugée équivalente</li>
-      <li>Grande capacité d'analyse et d'apprentissage</li>
-      <li>Capacité de rédaction en anglais </li> 
-      <li>Autonome et enthousiaste dans le développement</li>
-      <li>Intérêt marqué pour le développement collaboratif</li>
-    </ul>
-
+      <li>University graduate</li> 
+
+      <li>Strong analytical skills</li> 
+
+      <li>Good experience in object-oriented programming, preferably
+      Java</li>
 
-    <h3>Connaissances souhaitables:</h3>
-
-    <ul>
-      <li>Bonne expérience de programmation orienté objet, de préférence Java</li>
-      <li>Connaissances de développement Web avec des outils tels que
-      Struts, Wicket ou Tapestry</li>
-      <li>Affinité pour les méthodologies agiles, en particulier le TDD</li>
     </ul>
-
-
-    <p>Vous correspondez à ces critères et êtes désireux de mettre à
-    profit vos aptitudes, nous vous proposons un environnement
-    dynamique et évolutif avec des conditions avantageuses.</p>
-
-    <p>Merci de nous adresser votre dossier de candidature par email à
-    l'adresse hr@qos.ch. Si possible joignez une liste des projets
-    auxquels vous avez participé.
+
+    <p>We offer excellent working conditions with many oppurtunities
+    to improve your software development skills.
     </p>
 
-    <script src="templates/footer.js" type="text/javascript"></script>	
+    <script type="text/javascript">
+AAT = '@';
+DOOTT = '.';
+document.write('<p>Please send your application by email to <b>hr'+ AAT +'qos'+ DOOTT+'ch</b>. If applicable, ');
+document.write('include a list of software projects to which you contibuted.</p>') 
+    </script>
+
     </div>
   </body>
 </html>
diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html
@@ -30,7 +30,7 @@ <h2>Logback News</h2>
 
      <hr width="80%" align="center" />
 
-    <h3>November 13th, 2012 - Release of version 1.0.8</h3>
+    <h3>December 4th, 2012 - Release of version 1.0.8</h3>
 
     <p>Fixed incorrect <code>BufferStream</code> assignment after
     recovery in <code>ResilientFileOutputStream</code>. This issue was

diff --git a/logback-site/src/site/pages/templates/left.js b/logback-site/src/site/pages/templates/left.js
@@ -1,4 +1,5 @@
 
+document.write('<div class="menuGroup">');
 document.write('<p class="menu_header">Logback project</p>');
 document.write('<p class="menu"><a href="' + prefix + 'index.html">Introduction</a></p>');
 document.write('<p class="menu"><a href="' + prefix + 'download.html">Download</a></p>');
@@ -23,4 +24,6 @@ document.write('<p class="menu"><a href="http://logback.qos.ch/translator/">log4
 document.write('<p class="menu"><a href="http://logback.qos.ch/translator/asGroovy.html">logback.XML to Groovy</a>');
 
 document.write('</p>');
+document.write('</div>');
 
+document.write('<div><p>assgggdfdasd</p></div>');