Author: dlanglais Date: 2010-02-07 02:17:05 +0100 (Sun, 07 Feb 2010) New Revision: 58 Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: remplacement de tous les System.out.println() par log.info(). Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 01:05:18 UTC (rev 57) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-02-07 01:17:05 UTC (rev 58) @@ -1,9 +1,13 @@ package org.nuiton.mapstoragemanager.core; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import org.nuiton.mapstoragemanager.plugins.BigTable; public class MainTestCore { + private static final Log log = LogFactory.getLog(MainTestCore.class); + /** * test for plugins loading and basic functions. * @param args args @@ -11,17 +15,17 @@ public static void main(final String[] args) { Core core = new Core(); - - System.out.println("Plugins disponibles"); + + log.info("Plugins disponibles"); for (String base : core.listPlugins()) { - System.out.println("* " + base); + log.info("* " + base); } /* Test du plugins */ for (BigTable bigTable : core.getAvailableBases()) { bigTable.put("clé", "valeur"); - System.out.println(bigTable.get("clé")); + log.info(bigTable.get("clé")); } } Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 01:05:18 UTC (rev 57) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-02-07 01:17:05 UTC (rev 58) @@ -1,6 +1,8 @@ package org.nuiton.mapstoragemanager.core; import java.net.MalformedURLException; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; /** * @author fdesbois @@ -9,12 +11,13 @@ @Deprecated public class TestServiceLoader { + private static final Log log = LogFactory.getLog(TestServiceLoader.class); + public TestServiceLoader() { try { BigTableLoader p = - new BigTableLoader("plugins", - this.getClass().getClassLoader()); - System.out.println(p.getBigTable()); + new BigTableLoader("plugins", this.getClass().getClassLoader()); + log.info(p.getBigTable()); } catch (MalformedURLException e) { // TODO Auto-generated catch block e.printStackTrace(); Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 01:05:18 UTC (rev 57) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-02-07 01:17:05 UTC (rev 58) @@ -1,6 +1,8 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -14,6 +16,8 @@ public class HBase implements BigTable { + + private static final Log log = LogFactory.getLog(BigTable.class); private HBaseConfiguration config; private HTable table; @@ -28,7 +32,7 @@ // be found on the CLASSPATH org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(); config = new HBaseConfiguration(conf); - System.out.println("test"); + log.info("test"); selectTable(tableName); put("test", "val"); put("test", "val2"); Modified: trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-07 01:05:18 UTC (rev 57) +++ trunk/mapstoragemanagerarch/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-02-07 01:17:05 UTC (rev 58) @@ -3,6 +3,8 @@ import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JOptionPane; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; /** * Engine Class with methods for application user interface. @@ -11,6 +13,8 @@ */ public class ApplicationEngine { + private static final Log log = LogFactory.getLog(ApplicationEngine.class); + Locale currentLocale; ResourceBundle messages; @@ -42,7 +46,6 @@ public void setLocale(String language, String country) { currentLocale= new Locale(language,country); messages = ResourceBundle.getBundle("mapstoragemanager",currentLocale); - System.out.println(messages.getString("ok")); - + log.info("ok"); } }