Migrate to SLF4J. Add test support.

.classpath

@@ -11,5 +11,9 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.5.jar"/>
+	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

build.properties

@@ -1,3 +1,3 @@
 product.name=xidyn
-product.revision.major=0
-product.revision.minor=2
+product.revision.major=1
+product.revision.minor=0

demo/XidynDemo.java

@@ -3,6 +3,8 @@
  */
 
 import org.apache.log4j.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import fr.devinsy.xidyn.SimpleTagData;
 import fr.devinsy.xidyn.StringPresenter;
@@ -13,15 +15,12 @@ import fr.devinsy.xidyn.TagDataManager;
  */
 class XidynDemo
 {
+	static private Logger logger = LoggerFactory.getLogger(XidynDemo.class);
 	static
 	{
 		// Initialize logger.
 		org.apache.log4j.BasicConfigurator.configure();
-
-		org.apache.log4j.Logger logger = null;
-		logger = org.apache.log4j.Logger.getRootLogger();
-		logger.setLevel(Level.INFO);
-		logger = org.apache.log4j.Logger.getLogger(XidynDemo.class);
+		org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
 	}
 
 	/**

lib/README

@@ -0,0 +1,8 @@
+Description of used libraries:
+- activation: STU
+- hamcrest-core: required by junit
+- junit: unit tests API
+- log4j: log API
+- servlet-api: servlet API
+- slf4j-api: facade log API
+- slf4j-log4j12: adaptation layer between slf4j and log4j

rundemo

@@ -1,2 +1,11 @@
-#$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.14.jar:lib/mail.jar:servlet-api.jar:dist/xid.jar:dist/demo.jar XidDemo
-$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.17.jar:lib/mail.jar:servlet-api.jar:build/classes:build/demo-classes/:demo.jar:xidyn*.jar  XidynDemo
+$JAVA_HOME/bin/java -classpath \
+lib/activation.jar:\
+lib/log4j-1.2.17.jar:\
+lib/slf4j-api-1.7.5.jar:\
+lib/slf4j-log4j-1.2.5.jar:\
+lib/mail.jar:\
+servlet-api.jar:\
+build/classes:\
+build/demo-classes/:\
+demo.jar\
+ XidynDemo

src/fr/devinsy/xidyn/DomPresenter.java

@@ -2,6 +2,8 @@ package fr.devinsy.xidyn;
 
 import java.io.StringWriter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 /**
@@ -11,7 +13,7 @@ public class DomPresenter extends Presenter
 {
 	static final public char INDEX_SEPARATOR = '_';
 
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(DomPresenter.class);
+	static private Logger logger = LoggerFactory.getLogger(DomPresenter.class);
 	protected Document doc;
 
 	/**

src/fr/devinsy/xidyn/FilePresenter.java

@@ -5,12 +5,15 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.StringWriter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  */
 public class FilePresenter extends DomPresenter
 {
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(FilePresenter.class);
+	static private Logger logger = LoggerFactory.getLogger(FilePresenter.class);
 
 	private String sourceFilePathname;
 	private long sourceFileTime;
@@ -38,15 +41,6 @@ public class FilePresenter extends DomPresenter
 		this.doctype = "";
 	}
 
-	/**
-	 *
-	 */
-	@Override
-	public StringBuffer dynamize(final TagDataManager datas) throws Exception
-	{
-		return (dynamize(datas.getIdsDataById()));
-	}
-
 	/**
 	 * No need to be synchronized.
 	 */
@@ -90,6 +84,15 @@ public class FilePresenter extends DomPresenter
 		return (result);
 	}
 
+	/**
+	 *
+	 */
+	@Override
+	public StringBuffer dynamize(final TagDataManager datas) throws Exception
+	{
+		return (dynamize(datas.getIdsDataById()));
+	}
+
 	/**
 	 *
 	 */

src/fr/devinsy/xidyn/FilePresenters.java

@@ -8,13 +8,16 @@ package fr.devinsy.xidyn;
 
 import java.util.Vector;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  */
 public class FilePresenters extends Vector<FilePresenter>
 {
 	private static final long serialVersionUID = 7058868685681354293L;
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(FilePresenters.class);
+	static private Logger logger = LoggerFactory.getLogger(FilePresenters.class);
 
 	/**
 	 *

src/fr/devinsy/xidyn/FilePresentersProxy.java

@@ -1,11 +1,14 @@
 package fr.devinsy.xidyn;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  */
 public class FilePresentersProxy
 {
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(FilePresentersProxy.class);
+	static private Logger logger = LoggerFactory.getLogger(FilePresentersProxy.class);
 
 	private static FilePresentersProxy instance = null;
 	private FilePresenters presenters = null;

src/fr/devinsy/xidyn/Presenter.java

@@ -14,6 +14,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
@@ -27,14 +29,9 @@ import org.xml.sax.SAXException;
  */
 public class Presenter
 {
+	static private Logger logger = LoggerFactory.getLogger(Presenter.class);
 	static final public char INDEX_SEPARATOR = '_';
 
-	static private org.apache.log4j.Logger logger;
-	static
-	{
-		logger = org.apache.log4j.Logger.getLogger(Presenter.class);
-	}
-
 	/**
 	 *
 	 */

src/fr/devinsy/xidyn/StringPresenter.java

@@ -3,16 +3,15 @@ package fr.devinsy.xidyn;
 import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  */
 public class StringPresenter extends DomPresenter
 {
-	static private org.apache.log4j.Logger logger;
-	static
-	{
-		logger = org.apache.log4j.Logger.getLogger(StringPresenter.class);
-	}
+	static private Logger logger = LoggerFactory.getLogger(StringPresenter.class);
 
 	private String html;
 
@@ -35,15 +34,6 @@ public class StringPresenter extends DomPresenter
 		this.html = html;
 	}
 
-	/**
-	 *
-	 */
-	@Override
-	public StringBuffer dynamize(final TagDataManager datas) throws Exception
-	{
-		return (dynamize(datas.getIdsDataById()));
-	}
-
 	/**
 	 *
 	 */
@@ -105,6 +95,15 @@ public class StringPresenter extends DomPresenter
 		return (result);
 	}
 
+	/**
+	 *
+	 */
+	@Override
+	public StringBuffer dynamize(final TagDataManager datas) throws Exception
+	{
+		return (dynamize(datas.getIdsDataById()));
+	}
+
 	/**
 	 *
 	 */
@@ -128,14 +127,6 @@ public class StringPresenter extends DomPresenter
 		return (result);
 	}
 
-	/**
-	 *
-	 */
-	static public StringBuffer dynamize(final String html, final TagDataManager datas) throws Exception
-	{
-		return (dynamize(html, datas.getIdsDataById()));
-	}
-
 	/**
 	 * Xid a string with html in.
 	 */
@@ -150,4 +141,12 @@ public class StringPresenter extends DomPresenter
 		//
 		return (result);
 	}
+
+	/**
+	 *
+	 */
+	static public StringBuffer dynamize(final String html, final TagDataManager datas) throws Exception
+	{
+		return (dynamize(html, datas.getIdsDataById()));
+	}
 }

test/XidynTest.java

@@ -2,28 +2,30 @@
  * XidTest.
  */
 
-import fr.devinsy.xidyn.TagDataManager;
+import org.apache.log4j.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.devinsy.xidyn.SimpleTagData;
 import fr.devinsy.xidyn.StringPresenter;
+import fr.devinsy.xidyn.TagDataManager;
 
 /**
  *
  */
-class XidTest
+class XidynTest
 {
 	public enum MONTHS
 	{
 		JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBRE, DECEMBRE
 	}
 
+	static private Logger logger = LoggerFactory.getLogger(XidynTest.class);
 	static
 	{
 		// Initialize logger.
 		org.apache.log4j.BasicConfigurator.configure();
-
-		org.apache.log4j.Logger log = null;
-		log = org.apache.log4j.Logger.getRootLogger();
-		log = org.apache.log4j.Logger.getLogger(XidTest.class);
+		org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
 	}
 
 	/**

test/one/Foo2Test.java

@@ -0,0 +1,21 @@
+package one;
+
+import org.junit.Test;
+
+public class Foo2Test
+{
+	// private Logger logger =
+	// LoggerFactory.getLogger(PdfGenerationAmqpServiceInjectedTest.class);
+
+	/**
+     * 
+     */
+	@Test
+	public void test2a()
+	{
+		// logger.debug("===== test starting...");
+
+		// logger.debug("===== test done.");
+	}
+
+}