diff --git a/.classpath b/.classpath
index bc5400f..1e3beac 100644
--- a/.classpath
+++ b/.classpath
@@ -7,5 +7,6 @@
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
+	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a951636
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/build
+/dist
+/build_demo
+/build_test
diff --git a/build.xml b/build.xml
index bff954f..d7ab12d 100644
--- a/build.xml
+++ b/build.xml
@@ -26,7 +26,7 @@
 
 	<!-- ******* build ******* -->
 	<target name="build_xid" depends="init">
-		<javac srcdir="${src}" destdir="${build}/classes" debug="${debug}" deprecation="on">
+		<javac srcdir="${src}" destdir="${build}/classes" debug="${debug}" deprecation="on" includeantruntime="false">
 			<classpath>
 				<fileset dir="lib" includes="**/*.jar"/>
 		        </classpath>
@@ -37,19 +37,19 @@
 	<!-- ****** dist_xid ****** -->
 	<target name="dist_xid" depends="build_xid">
 		<jar update="no" jarfile="dist/xid.jar">
-			<fileset dir="build/classes" includes="xid/**.class" />
-			<fileset dir="resources" includes="**" />
+			<fileset dir="build/classes" />
+			<fileset dir="resources" />
 		</jar>
 	</target>	
 
 
 	<!-- ******* build_test ******* -->
 	<target name="build_test" depends="dist_xid">
-		<javac srcdir="test" destdir="build_test/classes" debug="${debug}" deprecation="on">
+		<javac srcdir="test" destdir="build_test/classes" debug="${debug}" deprecation="on" includeantruntime="false">
 			<classpath>
 				<fileset dir="lib" includes="**/*.jar"/>
 				<pathelement path="dist/xid.jar"/>
-		        </classpath>
+		    </classpath>
 		</javac>
 	</target>
 
@@ -57,8 +57,8 @@
 	<!-- ****** dist_test ****** -->
 	<target name="dist_test" depends="build_test">
 		<jar update="no" jarfile="dist/test.jar">
-			<fileset dir="build_tests/classes" includes="xid/tests/**.class" />
-			<fileset dir="resources" includes="**" />
+			<fileset dir="build_test/classes" />
+			<fileset dir="resources" />
 		</jar>
 	</target>	
 
@@ -78,7 +78,7 @@
 
 	<!-- ******* build_demo ******* -->
 	<target name="build_demo" depends="dist_xid">
-		<javac srcdir="demo" destdir="build_demo/classes" debug="${debug}" deprecation="on">
+		<javac srcdir="demo" destdir="build_demo/classes" debug="${debug}" deprecation="on" includeantruntime="false">
 			<classpath>
 				<fileset dir="lib" includes="**/*.jar"/>
 				<pathelement path="dist/xid.jar"/>
@@ -90,8 +90,8 @@
 	<!-- ****** dist_demo ****** -->
 	<target name="dist_demo" depends="build_demo">
 		<jar update="no" jarfile="dist/demo.jar">
-			<fileset dir="build_demo/classes" includes="**.class" />
-			<fileset dir="resources" includes="**" />
+			<fileset dir="build_demo/classes" />
+			<fileset dir="resources" />
 		</jar>
 	</target>	
 
diff --git a/test/XidTest.java b/test/XidTest.java
index d005008..ddfeb8f 100644
--- a/test/XidTest.java
+++ b/test/XidTest.java
@@ -2,244 +2,259 @@
  * XidTest.
  */
 
-
-import fr.devinsy.xid.*;
+import fr.devinsy.xid.Data;
+import fr.devinsy.xid.IdData;
+import fr.devinsy.xid.StringPresenter;
 
 /**
  *
  */
 class XidTest
 {
-	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 (XidDemo.class);
+	public enum MONTHS
+	{
+		JANUARY,
+		FEBRUARY,
+		MARCH,
+		APRIL,
+		MAY,
+		JUNE,
+		JULY,
+		AUGUST,
+		SEPTEMBER,
+		OCTOBER,
+		NOVEMBRE,
+		DECEMBRE
 	}
 
- 
+	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);
+	}
 
 	/**
 	 *
 	 */
-	public static String check (String title, StringBuffer source, String model)
+	public static String check(final String title, final StringBuffer source, final String model)
 	{
 		String result;
 
-		if (source.indexOf (model) == -1)
+		if (source.indexOf(model) == -1)
 		{
-			result = String.format ("%-40s  ->  KO  <-", title) + "\nGet:\n" + source + "\nWaiting:\n" + model;
+			result = String.format("%-40s  ->  KO  <-", title) + "\nGet:\n" + source + "\nWaiting:\n" + model;
 
 		}
 		else
 		{
-			result = String.format ("%-40s    [ OK ]  ", title);
+			result = String.format("%-40s    [ OK ]  ", title);
 		}
 
-
 		//
 		return (result);
-	}
-
-	public enum MONTHS {JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBRE, DECEMBRE};
+	};
 
 	/**
 	 *
 	 */
-	public static void main(String[] args)
+	public static void main(final String[] args)
 	{
 		System.out.println("Automatic test action for Xid!");
 
-
 		Data datas;
 		IdData tag;
 
-
 		String htmlSource;
 		StringBuffer html;
 
 		// Populate attributes of Test 03.
-		System.out.println ("----------------------------");
-		datas = new Data ();
-		datas.setContent ("name", "Superman");
-	    try
-	    {
-	    	html = StringPresenter.doXid ("<div id='name'>a name</div >", datas);
-	    }
-	    catch (Exception exception)
-	    {
-	    	System.out.println(exception.getMessage());
-	    	html = null;
-	    }
-
-		System.out.println (check ("only content change", html, "<div id=\"name\">Superman</div>"));
+		System.out.println("----------------------------");
+		datas = new Data();
+		datas.setContent("name", "Superman");
+		try
+		{
+			html = StringPresenter.doXid("<div id='name'>a name</div >", datas);
+		}
+		catch (Exception exception)
+		{
+			System.out.println(exception.getMessage());
+			html = null;
+		}
 
+		System.out.println(check("only content change", html, "<div id=\"name\">Superman</div>"));
 
 		// Populate attributes of Test 03.
-		System.out.println ("----------------------------");
-		datas = new Data ();
-		datas.setContent ("lastname", "Spiderman");
-		datas.appendAttribute ("lastname", "style", "background: blue;");
-		datas.appendAttribute ("lastname", "style", "foreground: red;");
-		datas.setAttribute ("lastname", "class", "nameClass");
+		System.out.println("----------------------------");
+		datas = new Data();
+		datas.setContent("lastname", "Spiderman");
+		datas.appendAttribute("lastname", "style", "background: blue;");
+		datas.appendAttribute("lastname", "style", "foreground: red;");
+		datas.setAttribute("lastname", "class", "nameClass");
 
-	    try
-	    {
-		html = StringPresenter.doXid ("<div id='lastname'>a last name</div >", datas);
-	    }
-	    catch (Exception exception)
-	    {
-	    	System.out.println(exception.getMessage());
-	    	html = null;
-	    }
-		System.out.println (check ("content and attributes", html, "<div id=\"lastname\" style=\"background: blue;foreground: red;\" class=\"nameClass\">Spiderman</div>"));
+		try
+		{
+			html = StringPresenter.doXid("<div id='lastname'>a last name</div >", datas);
+		}
+		catch (Exception exception)
+		{
+			System.out.println(exception.getMessage());
+			html = null;
+		}
+		System.out.println(check("content and attributes", html,
+				"<div id=\"lastname\" style=\"background: blue;foreground: red;\" class=\"nameClass\">Spiderman</div>"));
 
 		// Populate attributes of Test 03.
-		System.out.println ("----------------------------");
-		datas = new Data ();
-		datas.setContent ("words", 0, "alpha");
-		datas.setContent ("words", 1, "bravo");
-		datas.setContent ("words", 2, "charlie");
-		datas.setContent ("words", 3, "delta");
-		datas.setContent ("words", 4, "echo");
-		datas.setContent ("words", 5, "fox");
+		System.out.println("----------------------------");
+		datas = new Data();
+		datas.setContent("words", 0, "alpha");
+		datas.setContent("words", 1, "bravo");
+		datas.setContent("words", 2, "charlie");
+		datas.setContent("words", 3, "delta");
+		datas.setContent("words", 4, "echo");
+		datas.setContent("words", 5, "fox");
 
-	    try
-	    {
-		html = StringPresenter.doXid ("<ul>\n  <li id='words'>a word</li>\n</ul>", datas);
-	    }
-	    catch (Exception exception)
-	    {
-	    	System.out.println(exception.getMessage());
-	    	html = null;
-	    }
+		try
+		{
+			html = StringPresenter.doXid("<ul>\n  <li id='words'>a word</li>\n</ul>", datas);
+		}
+		catch (Exception exception)
+		{
+			System.out.println(exception.getMessage());
+			html = null;
+		}
 
-		System.out.println (check ("list assertion 1", html, "<li id=\"words_0\">alpha</li>"));
-		System.out.println (check ("list assertion 2", html, "<li id=\"words_1\">bravo</li>"));
-		System.out.println (check ("list assertion 3", html, "<li id=\"words_2\">charlie</li>"));
-		System.out.println (check ("list assertion 4", html, "<li id=\"words_3\">delta</li>"));
-		System.out.println (check ("list assertion 5", html, "<li id=\"words_4\">echo</li>"));
-		System.out.println (check ("list assertion 6", html, "<li id=\"words_5\">fox</li>"));
+		System.out.println(check("list assertion 1", html, "<li id=\"words_0\">alpha</li>"));
+		System.out.println(check("list assertion 2", html, "<li id=\"words_1\">bravo</li>"));
+		System.out.println(check("list assertion 3", html, "<li id=\"words_2\">charlie</li>"));
+		System.out.println(check("list assertion 4", html, "<li id=\"words_3\">delta</li>"));
+		System.out.println(check("list assertion 5", html, "<li id=\"words_4\">echo</li>"));
+		System.out.println(check("list assertion 6", html, "<li id=\"words_5\">fox</li>"));
 
 		// Populate attributes of Test 03.
-		System.out.println ("----------------------------");
-		datas = new Data ();
-		datas.setContent ("identity", 0, "nom", "Jemba");
-		datas.setContent ("identity", 0, "prenom", "Epo");
-		datas.setContent ("identity", 1, "nom", "Momon");
-		datas.setContent ("identity", 1, "prenom", "Christian");
-		datas.setContent ("identity", 2, "nom", "Tronche");
-		datas.setContent ("identity", 2, "prenom", "Christophe");
+		System.out.println("----------------------------");
+		datas = new Data();
+		datas.setContent("identity", 0, "nom", "Jemba");
+		datas.setContent("identity", 0, "prenom", "Epo");
+		datas.setContent("identity", 1, "nom", "Momon");
+		datas.setContent("identity", 1, "prenom", "Christian");
+		datas.setContent("identity", 2, "nom", "Tronche");
+		datas.setContent("identity", 2, "prenom", "Christophe");
 
-		StringBuffer source = new StringBuffer ();
-		source.append ("<table>\n");
-		source.append (" <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
-		source.append ("</table>");
-		htmlSource = source.toString ();
-	    try
-	    {
-		html = StringPresenter.doXid (htmlSource, datas);
-	    }
-	    catch (Exception exception)
-	    {
-	    	System.out.println(exception.getMessage());
-	    	html = null;
-	    }
+		StringBuffer source = new StringBuffer();
+		source.append("<table>\n");
+		source.append(" <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
+		source.append("</table>");
+		htmlSource = source.toString();
+		try
+		{
+			html = StringPresenter.doXid(htmlSource, datas);
+		}
+		catch (Exception exception)
+		{
+			System.out.println(exception.getMessage());
+			html = null;
+		}
 
-		System.out.println (check ("table 1 assertion 1", html, "<tr id=\"identity_0\"><td>noid</td><td id=\"nom_0\">Jemba</td><td id=\"prenom_0\">Epo</td></tr>"));
-		System.out.println (check ("table 1 assertion 2", html, "<tr id=\"identity_1\"><td>noid</td><td id=\"nom_1\">Momon</td><td id=\"prenom_1\">Christian</td></tr>"));
-		System.out.println (check ("table 1 assertion 3", html, "<tr id=\"identity_2\"><td>noid</td><td id=\"nom_2\">Tronche</td><td id=\"prenom_2\">Christophe</td></tr>"));
+		System.out
+				.println(check("table 1 assertion 1", html, "<tr id=\"identity_0\"><td>noid</td><td id=\"nom_0\">Jemba</td><td id=\"prenom_0\">Epo</td></tr>"));
+		System.out.println(check("table 1 assertion 2", html,
+				"<tr id=\"identity_1\"><td>noid</td><td id=\"nom_1\">Momon</td><td id=\"prenom_1\">Christian</td></tr>"));
+		System.out.println(check("table 1 assertion 3", html,
+				"<tr id=\"identity_2\"><td>noid</td><td id=\"nom_2\">Tronche</td><td id=\"prenom_2\">Christophe</td></tr>"));
 
 		/*
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("identity", 0, "nom", "Jemba");
-    datas.setContent ("identity", 0, "prenom", "Epo");
-    datas.setContent ("identity", 1, "nom", "Momon");
-    datas.setContent ("identity", 1, "prenom", "Christian");
-    datas.setContent ("identity", 2, "nom", "Tronche");
-    datas.setContent ("identity", 2, "prenom", "Christophe");
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
-
-
-    errorMessage = new StringBuffer ();
-    source = new StringBuffer ();
-    source.append ("<table>\n");
-    source.append ("  <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
-    source.append ("  <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>un prenom</td></tr>\n");
-    source.append ("  <tr><td>noid</td><td id='nom3'>un nom</td><td id='prenom3'>un prenom</td></tr>\n");
-    source.append ("</table>");
-    htmlSource = source.toString ();
-
-    System.out.println ("datas = new Data ();");
-    System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");");
-    System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");");
-    System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");");
-    System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");");
-    System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");");
-    System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");");
-
-    System.out.println ("+");
-    System.out.println (htmlSource);
-    System.out.println ("=>");
-
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
-    System.out.println ("ONLY_FIRST_ROW:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
-    System.out.println ("ONLY_ROWS_WITH_ID:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
-    System.out.println ("ONLY_ROWS_WITHOUT_ID:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
-    System.out.println ("ALL_ROWS:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setAttribute ("<div>", "class", "aDivClass");
-    datas.setAttribute ("<div>", "style", "background-color: #000000;");
-    datas.setAttribute ("number", "style", "background-color: #0000FF;");
-
-    errorMessage = new StringBuffer ();
-    source = new StringBuffer ();
-    source.append ("<div>\n");
-    source.append ("  <h1>one</h1>\n");
-    source.append ("</div>\n");
-    source.append ("<div id=\"number\">\n");
-    source.append ("  <h1>three</h1>\n");
-    source.append ("</div>");
-    htmlSource = source.toString ();
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-
-    System.out.println (htmlSource);
-    System.out.println ("+");
-    System.out.println ("datas = new Data ();");
-    System.out.println ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
-    System.out.println ("datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");");
-    System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");");
-
-    System.out.println ("=>");
-    System.out.println (html);
+		 * // Populate attributes of Test 03. System.out.println
+		 * ("----------------------------"); datas = new Data ();
+		 * datas.setContent ("identity", 0, "nom", "Jemba"); datas.setContent
+		 * ("identity", 0, "prenom", "Epo"); datas.setContent ("identity", 1,
+		 * "nom", "Momon"); datas.setContent ("identity", 1, "prenom",
+		 * "Christian"); datas.setContent ("identity", 2, "nom", "Tronche");
+		 * datas.setContent ("identity", 2, "prenom", "Christophe");
+		 * datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
+		 * //datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
+		 * //datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
+		 * //datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ALL_ROWS);
+		 * 
+		 * 
+		 * errorMessage = new StringBuffer (); source = new StringBuffer ();
+		 * source.append ("<table>\n"); source.append (
+		 * "  <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n"
+		 * ); source.append (
+		 * "  <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>un prenom</td></tr>\n"
+		 * ); source.append (
+		 * "  <tr><td>noid</td><td id='nom3'>un nom</td><td id='prenom3'>un prenom</td></tr>\n"
+		 * ); source.append ("</table>"); htmlSource = source.toString ();
+		 * 
+		 * System.out.println ("datas = new Data ();"); System.out.println
+		 * ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");");
+		 * System.out.println
+		 * ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");");
+		 * System.out.println
+		 * ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");");
+		 * System.out.println
+		 * ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");");
+		 * System.out.println
+		 * ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");");
+		 * System.out.println
+		 * ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");");
+		 * 
+		 * System.out.println ("+"); System.out.println (htmlSource);
+		 * System.out.println ("=>");
+		 * 
+		 * 
+		 * datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); System.out.println
+		 * ("ONLY_FIRST_ROW:"); html = Presenter.doXid (htmlSource, datas, "",
+		 * errorMessage); System.out.println (html);
+		 * 
+		 * datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
+		 * System.out.println ("ONLY_ROWS_WITH_ID:"); html = Presenter.doXid
+		 * (htmlSource, datas, "", errorMessage); System.out.println (html);
+		 * 
+		 * datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
+		 * System.out.println ("ONLY_ROWS_WITHOUT_ID:"); html = Presenter.doXid
+		 * (htmlSource, datas, "", errorMessage); System.out.println (html);
+		 * 
+		 * datas.setIterationStrategy ("identity",
+		 * IdsDataByIndex.IterationStrategy.ALL_ROWS); System.out.println
+		 * ("ALL_ROWS:"); html = Presenter.doXid (htmlSource, datas, "",
+		 * errorMessage); System.out.println (html);
+		 * 
+		 * 
+		 * 
+		 * // Populate attributes of Test 03. System.out.println
+		 * ("----------------------------"); datas = new Data ();
+		 * datas.setAttribute ("<div>", "class", "aDivClass");
+		 * datas.setAttribute ("<div>", "style", "background-color: #000000;");
+		 * datas.setAttribute ("number", "style", "background-color: #0000FF;");
+		 * 
+		 * errorMessage = new StringBuffer (); source = new StringBuffer ();
+		 * source.append ("<div>\n"); source.append ("  <h1>one</h1>\n");
+		 * source.append ("</div>\n"); source.append ("<div id=\"number\">\n");
+		 * source.append ("  <h1>three</h1>\n"); source.append ("</div>");
+		 * htmlSource = source.toString (); html = Presenter.doXid (htmlSource,
+		 * datas, "", errorMessage);
+		 * 
+		 * System.out.println (htmlSource); System.out.println ("+");
+		 * System.out.println ("datas = new Data ();"); System.out.println
+		 * ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
+		 * System.out.println (
+		 * "datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");"
+		 * ); System.out.println (
+		 * "datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");"
+		 * );
+		 * 
+		 * System.out.println ("=>"); System.out.println (html);
 		 */
 	}
 }