ow

Author: ceki

logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LevelAction.java

@@ -48,7 +48,6 @@ protected boolean validPreconditions(InterpretationContext interpcont, String na
 	@Override
 	protected Model buildCurrentModel(InterpretationContext interpretationContext, String name, Attributes attributes) {
 		LevelModel lm = new LevelModel();
-		
 		String value = attributes.getValue(JoranConstants.VALUE_ATTR);
 		lm.setValue(value);
 

logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java

@@ -41,6 +41,7 @@ protected Model buildCurrentModel(InterpretationContext interpretationContext, S
 
 		LoggerModel loggerModel = new LoggerModel();
 
+		
 		String nameStr = attributes.getValue(NAME_ATTRIBUTE);
 		loggerModel.setName(nameStr);
 

logback-classic/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java

@@ -30,7 +30,6 @@ public class RootLoggerAction extends BaseModelAction {
 	@Override
 	protected Model buildCurrentModel(InterpretationContext interpretationContext, String name, Attributes attributes) {
 		RootLoggerModel rootLoggerModel = new RootLoggerModel();
-		
 		String levelStr = attributes.getValue(JoranConstants.LEVEL_ATTRIBUTE);
 		rootLoggerModel.setLevel(levelStr);
 

logback-classic/src/main/java/ch/qos/logback/classic/model/ContextNameModel.java

@@ -1,7 +1,6 @@
 package ch.qos.logback.classic.model;
 
-import ch.qos.logback.core.model.Model;
-
-public class ContextNameModel extends Model {
+import ch.qos.logback.core.model.NamedModel;
 
+public class ContextNameModel extends NamedModel {
 }

logback-classic/src/main/java/ch/qos/logback/classic/model/processor/ContextNameModelHandler.java

@@ -21,7 +21,9 @@ protected Class<ContextNameModel> getSupportedModelClass() {
 	@Override
 	public void handle(InterpretationContext intercon, Model model) throws ModelHandlerException {
 		ContextNameModel contextNameModel = (ContextNameModel) model;
-
+		
+		fix me 
+		
 		String finalBody = intercon.subst(contextNameModel.getBodyText());
         addInfo("Setting logger context name as [" + finalBody + "]");
         try {

logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java

@@ -33,7 +33,6 @@ protected boolean validPreconditions(InterpretationContext intercon, String name
 	@Override
 	protected Model buildCurrentModel(InterpretationContext interpretationContext, String name, Attributes attributes) {
 		AppenderRefModel arm = new AppenderRefModel();
-		
         String ref = attributes.getValue(JoranConstants.REF_ATTRIBUTE);
 		arm.setRef(ref);
 		return arm;

logback-core/src/main/java/ch/qos/logback/core/joran/action/BaseModelAction.java

@@ -51,8 +51,7 @@ protected boolean validPreconditions(InterpretationContext intercon, String name
 
     @Override
     public void body(InterpretationContext ec, String body) {
-        String finalBody = ec.subst(body);
-        currentModel.addText(finalBody);
+    	currentModel.addText(body);
     }
 
     @Override

logback-core/src/main/java/ch/qos/logback/core/model/AppenderModel.java

@@ -1,16 +1,4 @@
 package ch.qos.logback.core.model;
 
-public class AppenderModel extends ComponentModel {
-
-	String name;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	
+public class AppenderModel extends NamedComponentModel {
 }

logback-core/src/main/java/ch/qos/logback/core/model/DefineModel.java

@@ -1,18 +1,9 @@
 package ch.qos.logback.core.model;
 
-public class DefineModel extends ComponentModel {
+public class DefineModel extends NamedComponentModel {
 
-    String name;
     String scopeStr;
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getScopeStr() {
         return scopeStr;
     }

logback-core/src/main/java/ch/qos/logback/core/model/INamedModel.java

@@ -0,0 +1,8 @@
+package ch.qos.logback.core.model;
+
+public interface INamedModel {
+
+	public String getName();
+	public void setName(String name);
+	
+}

logback-core/src/main/java/ch/qos/logback/core/model/Model.java

@@ -3,13 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import ch.qos.logback.core.spi.ContextAwareBase;
+
 /**
  * Abstract representation of configuration elements
  * 
  * @author Ceki Gülcü
  * @since 1.3.0
  */
-public class Model {
+public class Model  {
 
 	// this state should not be here but should be treated via listeners
 	// between processors and ModelHandlers

logback-core/src/main/java/ch/qos/logback/core/model/NamedComponentModel.java

@@ -0,0 +1,14 @@
+package ch.qos.logback.core.model;
+
+public class NamedComponentModel extends ComponentModel implements INamedModel {
+
+	String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

logback-core/src/main/java/ch/qos/logback/core/model/NamedModel.java

@@ -0,0 +1,14 @@
+package ch.qos.logback.core.model;
+
+public class NamedModel extends Model implements INamedModel {
+
+    String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

logback-core/src/main/java/ch/qos/logback/core/model/ParamModel.java

@@ -1,16 +1,9 @@
 package ch.qos.logback.core.model;
 
-public class ParamModel extends Model {
+public class ParamModel extends NamedModel {
 
-	String name;
 	String value;
-	
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
+
 	public String getValue() {
 		return value;
 	}

logback-core/src/main/java/ch/qos/logback/core/model/PropertyModel.java

@@ -1,21 +1,14 @@
 package ch.qos.logback.core.model;
 
-public class PropertyModel extends Model {
+public class PropertyModel extends NamedModel {
+
 
-    String name;
     String value;
     String scopeStr;
 
     String file;
     String resource;
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 
     public String getValue() {
         return value;

logback-core/src/main/java/ch/qos/logback/core/model/TimestampModel.java

@@ -1,20 +1,18 @@
 package ch.qos.logback.core.model;
 
-public class TimestampModel extends Model {
+public class TimestampModel extends NamedModel {
 
     public static final String CONTEXT_BIRTH = "contextBirth";
 
-    
-    String key;
     String datePattern;
     String timeReference;
     String scopeStr;
 
     public String getKey() {
-        return key;
+        return getName();
     }
     public void setKey(String key) {
-        this.key = key;
+    	this.setName(key);
     }
     public String getDatePattern() {
         return datePattern;

logback-site/src/site/pages/templates/right.js

@@ -1,11 +1,14 @@
-document.write('      <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>');
-//      <!-- SLF4J -->
-document.write('      <ins class="adsbygoogle"');
-document.write('           style="display:block"');
-document.write('           data-ad-client="ca-pub-7471410671306824"');
-document.write('           data-ad-slot="6377851613"');
-document.write('           data-ad-format="auto"></ins>');
-document.write('      <script>');
-document.write('        (adsbygoogle = window.adsbygoogle || []).push({});');
-document.write('      </script>');
+//document.write('      <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>');
+////      <!-- SLF4J -->
+//document.write('      <ins class="adsbygoogle"');
+//document.write('           style="display:block"');
+//document.write('           data-ad-client="ca-pub-7471410671306824"');
+//document.write('           data-ad-slot="6377851613"');
+//document.write('           data-ad-format="auto"></ins>');
+//document.write('      <script>');
+//document.write('        (adsbygoogle = window.adsbygoogle || []).push({});');
+//document.write('      </script>');
+
+
+document.write('<a href="http://brocante.qos.ch/"><img src="http://brocante.qos.ch/images/vg10.jpeg" width="150" alt="brocante vide grenier &agrave; Vouvry (le Chablais)""/></a>');