Author: dlanglais Date: 2010-03-17 15:00:03 +0100 (Wed, 17 Mar 2010) New Revision: 249 Log: Suppression de la classe BigTableLoaderTest.java (inutile). Nettoyage code. Am?\195?\169lioration code PluginLoader. Removed: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/MsmConfig.java 2010-03-17 14:00:03 UTC (rev 249) @@ -42,15 +42,17 @@ try { p.load(stream); for (Object k : p.keySet()) { - String key = k + ""; - Object value = p.get(k); - if (LOG.isDebugEnabled()) { - LOG.debug("install properties " + k + " : " + value); - } - setDefaultOption(key, "" + value); + String key = (String) k; + String value = (String) p.get(k); + + setDefaultOption(key, value); + + // if (LOG.isDebugEnabled()) + LOG.debug("install properties " + k + " : " + value); } } catch (IOException ex) { - throw new RuntimeException(ex); + LOG.fatal(ex, ex); +// throw new RuntimeException(ex); } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-17 14:00:03 UTC (rev 249) @@ -2,6 +2,7 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.net.MalformedURLException; @@ -14,6 +15,8 @@ import java.util.Properties; import java.util.ServiceLoader; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.logging.Log; @@ -62,11 +65,21 @@ /** Load properties file of the folder. */ properties = new Properties(); + propertiesFile = new File(pluginsFolderPath, ".properties"); try { - propertiesFile = new File(pluginsFolderPath, ".properties"); - properties.load(new FileInputStream(propertiesFile)); + FileInputStream fis = new FileInputStream(propertiesFile); + properties.load(fis); + } catch (FileNotFoundException e) { + try { + FileOutputStream fos = new FileOutputStream(propertiesFile); + properties.store(fos , null); + } catch (FileNotFoundException ex) { + LOG.fatal(ex, ex); + } catch (IOException ex) { + LOG.fatal(ex, ex); + } } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } /** For each file if the propertie is not false */ @@ -147,7 +160,7 @@ try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } } @@ -218,38 +231,45 @@ */ public static final void setActive(Plugin plugin, boolean active) { - properties.put(plugin.getPluginName(), Boolean.toString(active)); + final String pluginName = plugin.getPluginName(); + + properties.put(pluginName, active); try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { -// LOG.error(ex, ex); + LOG.error(ex, ex); } - if (active == true) { + if (active) { plugin.load(); } else { plugin.unload(); } } + /** + * Control if the plugin have to be loaded. + * @param plugin the plugin to control. + */ public static void controlLoadPlugin(Plugin plugin) { - if (!"false".equals(properties.getProperty(plugin.getPluginName()))) { - plugins.put(plugin.getPluginName(), plugin); + + final String pluginName = plugin.getPluginName(); + final String pluginProperty = properties.getProperty(pluginName); + plugins.put(pluginName, plugin); + + if ("true".equals(pluginProperty)) { + /** If plugin must be loaded */ plugin.load(); - properties.put(plugin.getPluginName(), "true"); + } else if(!"false".equals(pluginProperty)) { + /** If plugin is not in .properties, + * it is load and writted in .properties */ + plugin.load(); + properties.put(pluginName, "true"); try { properties.store(new FileOutputStream(propertiesFile), null); } catch (IOException ex) { - // LOG.error(ex, ex); + LOG.error(ex, ex); } - } else { - plugins.put(plugin.getPluginName(), plugin); - properties.put(plugin.getPluginName(), "false"); - try { - properties.store(new FileOutputStream(propertiesFile), null); - } catch (IOException ex) { - // LOG.error(ex, ex); - } } } } Deleted: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/BigTableLoaderTest.java 2010-03-17 14:00:03 UTC (rev 249) @@ -1,67 +0,0 @@ -package org.nuiton.mapstoragemanager.core; - -import java.net.MalformedURLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Created: 28 janv. 2010 - * - * @author fdesbois - * @version $Revision: 36 $ - * - * Mise a jour: $Date: 2010-01-28 22:02:49 +0100 (jeu., 28 janv. 2010) $ - * par : $Author$ - */ -public class BigTableLoaderTest { - - private static final Log log = LogFactory.getLog(BigTableLoaderTest.class); - - public BigTableLoaderTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - /** - * Test of getBigTable method, of class BigTableLoader. - * @throws MalformedURLException - */ - @Test - public void testGetBigTable() throws MalformedURLException { - log.info("getBigTable"); - //BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); - - // FIXME-FD20100128 NPE : - // java.lang.NullPointerException at org.nuiton.mapstoragemanager.core.BigTableLoader.<init>(BigTableLoader.java:34) - - //Assert.assertNotNull(p.getBigTable()); - } - - /** - * Test of getBigTableSetLoader method, of class BigTableLoader. - */ - //@Test - public void testGetBigTableSetLoader() { - log.info("getBigTableSetLoader"); - } -} Modified: trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java =================================================================== --- trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm/src/test/java/org/nuiton/mapstoragemanager/core/PluginLoaderTest.java 2010-03-17 14:00:03 UTC (rev 249) @@ -5,6 +5,7 @@ package org.nuiton.mapstoragemanager.core; +import com.opensymphony.xwork2.interceptor.annotations.After; import java.io.File; import java.lang.reflect.Field; import java.net.MalformedURLException; @@ -51,7 +52,9 @@ * Initialisation. */ try { - pl = new PluginLoader(new File("").getAbsolutePath(), + String basedir = new File("").getAbsolutePath(); + File pluginFolder = new File(basedir, "/src/test/resources"); + pl = new PluginLoader(pluginFolder.getAbsolutePath(), this.getClass().getClassLoader()); Field fPlugins = pl.getClass().getDeclaredField("plugins"); fPlugins.setAccessible(true); @@ -77,6 +80,17 @@ } } + /** + * + */ + @Override + @After + public void tearDown() { + String basedir = new File("").getAbsolutePath(); + File properties = new File(basedir, "/src/test/resources/.properties"); + properties.deleteOnExit(); + } + public void testGetAllPluginNames() { this.setUp(); Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-17 14:00:03 UTC (rev 249) @@ -23,14 +23,14 @@ * Number for division byte -> Mb -> Gb. */ private static final int DIV = 1024; - /** - * Width of the frame. - */ - private static final int FRAME_WIDTH = 300; - /** - * Height of the frame. - */ - private static final int FRAME_HEIGHT = 300; +// /** +// * Width of the frame. +// */ +// private static final int FRAME_WIDTH = 300; +// /** +// * Height of the frame. +// */ +// private static final int FRAME_HEIGHT = 300; /** * Constructor. Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-17 08:40:41 UTC (rev 248) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-17 14:00:03 UTC (rev 249) @@ -13,7 +13,7 @@ * This class is used to get the view of a plugin. * @author Dorian Langlais */ -public class PluginView { +public final class PluginView { /** * Private Constructor.