March 2010 - Mapstoragemanager-commits - mailman.cloud.codelutin.com

r212 - in trunk/msm-fromtoXPP3/src: main/java/org/nuiton/mapstoragemanager/plugins/exporter main/java/org/nuiton/mapstoragemanager/plugins/importer test/java/org/nuiton/mapstoragemanager/plugins/exporter test/java/org/nuiton/mapstoragemanager/plugins/importer
by dlanglais＠users.nuiton.org 11 Mar '10

11 Mar '10

Author: dlanglais Date: 2010-03-11 08:30:09 +0100 (Thu, 11 Mar 2010) New Revision: 212 Log: Renommage de la classe de test FromXMLTest.java en FromXMLXPP3Test.java. Ajout d'un g?\195?\169n?\195?\169rateur. Test d'import/export avec 1 millions de lignes et 5 colonnes (un element par ligne) fichier produit de 150 Mo. - ?\195?\169criture ~= 20 secondes. - lecture ~= 15 secondes. Donc, largement plus raisonnable qu'avec le plugin utilisant JDom. Added: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3Test.java Removed: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-11 06:52:56 UTC (rev 211) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-11 07:30:09 UTC (rev 212) @@ -51,7 +51,7 @@ */ @Override public final void exportTo(final BigTable bigTable, final File file) { - + XmlSerializer serializer = null; /** * Initialisation of the serializer. @@ -64,9 +64,11 @@ } catch (XmlPullParserException ex) { LOG.fatal(ex, ex); } - + try { - + + final long t1 = System.currentTimeMillis(); + serializer.setOutput(new FileWriter(file)); serializer.startTag(NAMESPACE, "database"); @@ -82,6 +84,9 @@ serializer.endDocument(); serializer.flush(); + + final long t2 = System.currentTimeMillis(); + LOG.info("temps d'enregistrement : " + (t2 - t1) + " ms."); } catch (IOException ex) { LOG.fatal(ex, ex); } catch (IllegalArgumentException ex) { Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-11 06:52:56 UTC (rev 211) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-11 07:30:09 UTC (rev 212) @@ -55,6 +55,9 @@ public void importFrom(BigTable bigTable, File file) { try { + + final long t1 = System.currentTimeMillis(); + XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); //factory.setNamespaceAware(true); factory.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); @@ -67,6 +70,8 @@ xpp.setInput(new FileReader(file)); app.processDocument(bigTable, xpp); + final long t2 = System.currentTimeMillis(); + LOG.info("temps de chargement : " + (t2 - t1) + " ms."); } catch (FileNotFoundException ex) { LOG.fatal(ex, ex); } catch (IOException ex) { @@ -170,7 +175,7 @@ // attributes.get("value")); // } else { - LOG.info("Insert : " + attributes.get("table") + ":" + LOG.trace("Insert : " + attributes.get("table") + ":" + attributes.get("column") + ":" + attributes.get("key") + " -> " + attributes.get("value")); @@ -213,8 +218,8 @@ */ private boolean isState(ParsingState ... states) { boolean isState = false; - for (ParsingState state : states) { - if (this.state.equals(state)) { + for (ParsingState parsingState : states) { + if (this.state.equals(parsingState)) { isState = true; } } Added: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java =================================================================== --- trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java (rev 0) +++ trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/Generator.java 2010-03-11 07:30:09 UTC (rev 212) @@ -0,0 +1,75 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.plugins.exporter; + +import java.io.File; +import java.util.ArrayList; +import java.util.Random; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Exporter; +import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; +import org.nuiton.mapstoragemanager.plugins.getFile; + +/** + * + * @author Dorian Langlais + */ +public class Generator { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(Generator.class); + + public static void main(String[] args) { + + BigTable bt = new BigHashMapV2(); + String btName = "Random"; + ArrayList<String> columnsNames = new ArrayList<String>(); + columnsNames.add(0,"1er Quart"); + columnsNames.add(1,"2nd Quart"); + columnsNames.add(2,"3eme Quart"); + columnsNames.add(3,"4eme Quart"); + + bt.createTable(btName); + bt.createColumn(btName, "Iteration"); + bt.createColumn(btName, columnsNames.get(0)); + bt.createColumn(btName, columnsNames.get(1)); + bt.createColumn(btName, columnsNames.get(2)); + bt.createColumn(btName, columnsNames.get(3)); + + Set<String> columns = bt.getColumnsNames(btName); + Integer nbIteration = 1000000; + Random random = new java.util.Random(); + Double currentRandom; + int nbColumns = columns.size() - 1; + + while (nbIteration-->0) { + currentRandom = random.nextDouble(); + + bt.put( + btName, + "Iteration", + nbIteration.toString(), + nbIteration.toString()); + + bt.put( + btName, + columnsNames.get((int) (currentRandom * nbColumns)), + nbIteration.toString(), + currentRandom.toString()); + } + + Exporter exporter = new ToXMLXPP3(); + File exportTest = + getFile.getTestFile("/src/test/resources/generator.xml"); + exporter.exportTo(bt,exportTest); +// exportTest.delete(); + } +} Deleted: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-11 06:52:56 UTC (rev 211) +++ trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-11 07:30:09 UTC (rev 212) @@ -1,308 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.nuiton.mapstoragemanager.plugins.importer; - -import java.io.File; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; -import javax.swing.filechooser.FileNameExtensionFilter; -import junit.framework.Assert; -import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.BigTable; -import org.nuiton.mapstoragemanager.plugins.Plugin; -import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; -import org.nuiton.mapstoragemanager.plugins.getFile; - -/** - * - * @author Dorian Langlais - */ -public class FromXMLTest extends TestCase { - - /** - * Logger. - */ - private static final Log LOG = LogFactory.getLog(FromXMLTest.class); - -// public void testImportFrom() { -// Assert.fail(); -// } - - /** - * Import the database from the file fiveTables. - * Verify the content. - */ - public void testImportFromFiveTables() { - - File fiveTables = - getFile.getTestFile("/src/test/resources/fiveTables.xml"); - - // import fiveTables. - Importer importer = new FromXMLXPP3(); - BigTable bigTable = new BigHashMapV2(); - - importer.importFrom(bigTable, fiveTables); - - /************************ - * Test Tables * - ************************/ - Set<String> tableNamesExpected; - { - /** - * Init tableNames. - */ - tableNamesExpected = new HashSet<String>(); - tableNamesExpected.add("table1"); - tableNamesExpected.add("table2"); - tableNamesExpected.add("table3"); - tableNamesExpected.add("table4"); - tableNamesExpected.add("table5"); - } - Set<String> tableNamesActual = bigTable.getTablesNames(); - assertEquals(tableNamesExpected, tableNamesActual); - - - for (String tableName : tableNamesActual) { - Set<String> columnNamesExpected = new HashSet<String>(); - assertEquals(columnNamesExpected, - bigTable.getColumnsNames(tableName)); - } - } - - /** - * Import the database from the file fiveColumns. - * Verify the content. - */ - public void testImportFromFiveColumns() { - - File twoTablesFiveColumns = - getFile.getTestFile("/src/test/resources/fiveColumns.xml"); - - // import fiveTables. - Importer importer = new FromXMLXPP3(); - BigTable bigTable = new BigHashMapV2(); - - importer.importFrom(bigTable, twoTablesFiveColumns); - - /************************ - * Test Tables * - ************************/ - Set<String> tableNamesExpected; - { - /** - * Init tableNames. - */ - tableNamesExpected = new HashSet<String>(); - tableNamesExpected.add("table1"); - tableNamesExpected.add("table2"); - } - Set<String> tableNamesActual = bigTable.getTablesNames(); - assertEquals(tableNamesExpected, tableNamesActual); - - /************************ - * Test Columns * - ************************/ - Map<String, Set<String>> columnNamesExpected; - { - /** - * Init columnNames. - */ - columnNamesExpected = new HashMap<String, Set<String>>(); - Set<String> table1ColumnNames = new HashSet<String>(); - table1ColumnNames.add("column1"); - table1ColumnNames.add("column2"); - Set<String> table2ColumnNames = new HashSet<String>(); - table2ColumnNames.add("column3"); - table2ColumnNames.add("column4"); - table2ColumnNames.add("column5"); - columnNamesExpected.put("table1", table1ColumnNames); - columnNamesExpected.put("table2", table2ColumnNames); - } - - Set<String> columnNamesActual; - for (String tableName : tableNamesActual) { - columnNamesActual = bigTable.getColumnsNames(tableName); - assertEquals(columnNamesExpected.get(tableName), columnNamesActual); - } - } - - /** - * Import the database from the file tenCells. - * Verify the content. - */ - public void testImportFromThreeTenCells() { - - File twoTablesFiveColumns = - getFile.getTestFile("/src/test/resources/sixCells.xml"); - - // import fiveTables. - Importer importer = new FromXMLXPP3(); - BigTable bigTable = new BigHashMapV2(); - - importer.importFrom(bigTable, twoTablesFiveColumns); - - /************************ - * Test Tables * - ************************/ - Set<String> tableNamesExpected; - { - /** - * Init tableNames. - */ - tableNamesExpected = new HashSet<String>(); - tableNamesExpected.add("table1"); - tableNamesExpected.add("table2"); - } - Set<String> tableNamesActual = bigTable.getTablesNames(); - assertEquals(tableNamesExpected, tableNamesActual); - - /************************ - * Test Columns * - ************************/ - Map<String, Set<String>> columnNamesExpected; - { - /** - * Init columnNames. - */ - columnNamesExpected = new HashMap<String, Set<String>>(); - Set<String> table1ColumnNames = new HashSet<String>(); - table1ColumnNames.add("column1"); - Set<String> table2ColumnNames = new HashSet<String>(); - table2ColumnNames.add("column2"); - table2ColumnNames.add("column3"); - columnNamesExpected.put("table1", table1ColumnNames); - columnNamesExpected.put("table2", table2ColumnNames); - } - - Set<String> columnNamesActual; - for (String tableName : tableNamesActual) { - columnNamesActual = bigTable.getColumnsNames(tableName); - assertEquals(columnNamesExpected.get(tableName), columnNamesActual); - } - - /************************ - * Test Cells * - ************************/ - Map<String, Map<String, Map<String, String>>> CellContentExpected; - { - /** - * Init cellContent. - */ - CellContentExpected = new HashMap<String, - Map<String, Map<String, String>>>(); - // table 1. - Map<String, Map<String, String>> table1 = - new HashMap<String, Map<String, String>>(); - // column 1. - Map<String,String> column1 = new HashMap<String, String>(); - column1.put("111", "111"); - table1.put("column1", column1); - // table 2. - Map<String, Map<String, String>> table2 = - new HashMap<String, Map<String, String>>(); - // column 2. - Map<String,String> column2 = new HashMap<String, String>(); - column2.put("221", "221"); - column2.put("222", "222"); - table2.put("column2", column2); - // column 3. - Map<String,String> column3 = new HashMap<String, String>(); - column3.put("231", "231"); - column3.put("232", "232"); - column3.put("233", "233"); - table2.put("column3", column3); - - CellContentExpected.put("table1", table1); - CellContentExpected.put("table2", table2); - LOG.info(CellContentExpected); - } - - Set<String> tableKeys; - String cellContentActual; - String cellContentExpected = null; - for (String tableName : tableNamesActual) { - columnNamesActual = bigTable.getColumnsNames(tableName); - tableKeys = bigTable.getKeys(tableName); - for (String columnName : columnNamesActual) { - for (String cellKey : tableKeys) { - - try { - try{ - cellContentExpected = - CellContentExpected - .get(tableName) - .get(columnName) - .get(cellKey); - } catch (NullPointerException ex) { - LOG.trace(ex); - } - - LOG.info(tableName + ' ' - + columnName + ' ' - + cellKey + ' ' - + cellContentExpected); - - cellContentActual = - bigTable.get(tableName, columnName, cellKey); - assertEquals(cellContentExpected, cellContentActual); - } catch (NoSuchElementException ex) { - if(cellContentExpected != null) { - LOG.error(ex, ex); - Assert.fail(); - } else { - LOG.trace(ex); - } - } - } - } - } - } - - /** - * Test of getPluginName(). - */ - public void testGetPluginName() { - Plugin fromXML = new FromXMLXPP3(); - String expectedPluginName = fromXML.getClass().getSimpleName(); - String actualPluginName = fromXML.getPluginName(); - LOG.info("pluginName : {expected,'" + expectedPluginName - + "'} - {actual,'" + actualPluginName + "'}"); - assertEquals(expectedPluginName, actualPluginName); - } - - /** - * Test of getFileFilter. - */ - public void testGetFileFilter(){ - - Importer fromXML = new FromXMLXPP3(); - - FileNameExtensionFilter fileFilterExpected - = new FileNameExtensionFilter("Fichiers XML", "xml"); - FileNameExtensionFilter fileFilterActual = - (FileNameExtensionFilter) fromXML.getFileFilter(); - - /** Same Description */ - assertEquals(fileFilterExpected.getDescription(), - fileFilterActual.getDescription()); - - /** get extension Set and assertEquals */ - Set<String> acceptedExtensionExpected = new HashSet<String>(); - Set<String> acceptedExtensionActual = new HashSet<String>(); - for (String extension : fileFilterExpected.getExtensions()) { - acceptedExtensionExpected.add(extension); - } - for (String extension : fileFilterActual.getExtensions()) { - acceptedExtensionActual.add(extension); - } - assertEquals(acceptedExtensionExpected, acceptedExtensionActual); - } -} Added: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3Test.java =================================================================== --- trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3Test.java (rev 0) +++ trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3Test.java 2010-03-11 07:30:09 UTC (rev 212) @@ -0,0 +1,308 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.nuiton.mapstoragemanager.plugins.importer; + +import java.io.File; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import javax.swing.filechooser.FileNameExtensionFilter; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.BigTable; +import org.nuiton.mapstoragemanager.plugins.Plugin; +import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; +import org.nuiton.mapstoragemanager.plugins.getFile; + +/** + * + * @author Dorian Langlais + */ +public class FromXMLXPP3Test extends TestCase { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(FromXMLXPP3Test.class); + +// public void testImportFrom() { +// Assert.fail(); +// } + + /** + * Import the database from the file fiveTables. + * Verify the content. + */ + public void testImportFromFiveTables() { + + File fiveTables = + getFile.getTestFile("/src/test/resources/fiveTables.xml"); + + // import fiveTables. + Importer importer = new FromXMLXPP3(); + BigTable bigTable = new BigHashMapV2(); + + importer.importFrom(bigTable, fiveTables); + + /************************ + * Test Tables * + ************************/ + Set<String> tableNamesExpected; + { + /** + * Init tableNames. + */ + tableNamesExpected = new HashSet<String>(); + tableNamesExpected.add("table1"); + tableNamesExpected.add("table2"); + tableNamesExpected.add("table3"); + tableNamesExpected.add("table4"); + tableNamesExpected.add("table5"); + } + Set<String> tableNamesActual = bigTable.getTablesNames(); + assertEquals(tableNamesExpected, tableNamesActual); + + + for (String tableName : tableNamesActual) { + Set<String> columnNamesExpected = new HashSet<String>(); + assertEquals(columnNamesExpected, + bigTable.getColumnsNames(tableName)); + } + } + + /** + * Import the database from the file fiveColumns. + * Verify the content. + */ + public void testImportFromFiveColumns() { + + File twoTablesFiveColumns = + getFile.getTestFile("/src/test/resources/fiveColumns.xml"); + + // import fiveTables. + Importer importer = new FromXMLXPP3(); + BigTable bigTable = new BigHashMapV2(); + + importer.importFrom(bigTable, twoTablesFiveColumns); + + /************************ + * Test Tables * + ************************/ + Set<String> tableNamesExpected; + { + /** + * Init tableNames. + */ + tableNamesExpected = new HashSet<String>(); + tableNamesExpected.add("table1"); + tableNamesExpected.add("table2"); + } + Set<String> tableNamesActual = bigTable.getTablesNames(); + assertEquals(tableNamesExpected, tableNamesActual); + + /************************ + * Test Columns * + ************************/ + Map<String, Set<String>> columnNamesExpected; + { + /** + * Init columnNames. + */ + columnNamesExpected = new HashMap<String, Set<String>>(); + Set<String> table1ColumnNames = new HashSet<String>(); + table1ColumnNames.add("column1"); + table1ColumnNames.add("column2"); + Set<String> table2ColumnNames = new HashSet<String>(); + table2ColumnNames.add("column3"); + table2ColumnNames.add("column4"); + table2ColumnNames.add("column5"); + columnNamesExpected.put("table1", table1ColumnNames); + columnNamesExpected.put("table2", table2ColumnNames); + } + + Set<String> columnNamesActual; + for (String tableName : tableNamesActual) { + columnNamesActual = bigTable.getColumnsNames(tableName); + assertEquals(columnNamesExpected.get(tableName), columnNamesActual); + } + } + + /** + * Import the database from the file tenCells. + * Verify the content. + */ + public void testImportFromThreeTenCells() { + + File twoTablesFiveColumns = + getFile.getTestFile("/src/test/resources/sixCells.xml"); + + // import fiveTables. + Importer importer = new FromXMLXPP3(); + BigTable bigTable = new BigHashMapV2(); + + importer.importFrom(bigTable, twoTablesFiveColumns); + + /************************ + * Test Tables * + ************************/ + Set<String> tableNamesExpected; + { + /** + * Init tableNames. + */ + tableNamesExpected = new HashSet<String>(); + tableNamesExpected.add("table1"); + tableNamesExpected.add("table2"); + } + Set<String> tableNamesActual = bigTable.getTablesNames(); + assertEquals(tableNamesExpected, tableNamesActual); + + /************************ + * Test Columns * + ************************/ + Map<String, Set<String>> columnNamesExpected; + { + /** + * Init columnNames. + */ + columnNamesExpected = new HashMap<String, Set<String>>(); + Set<String> table1ColumnNames = new HashSet<String>(); + table1ColumnNames.add("column1"); + Set<String> table2ColumnNames = new HashSet<String>(); + table2ColumnNames.add("column2"); + table2ColumnNames.add("column3"); + columnNamesExpected.put("table1", table1ColumnNames); + columnNamesExpected.put("table2", table2ColumnNames); + } + + Set<String> columnNamesActual; + for (String tableName : tableNamesActual) { + columnNamesActual = bigTable.getColumnsNames(tableName); + assertEquals(columnNamesExpected.get(tableName), columnNamesActual); + } + + /************************ + * Test Cells * + ************************/ + Map<String, Map<String, Map<String, String>>> CellContentExpected; + { + /** + * Init cellContent. + */ + CellContentExpected = new HashMap<String, + Map<String, Map<String, String>>>(); + // table 1. + Map<String, Map<String, String>> table1 = + new HashMap<String, Map<String, String>>(); + // column 1. + Map<String,String> column1 = new HashMap<String, String>(); + column1.put("111", "111"); + table1.put("column1", column1); + // table 2. + Map<String, Map<String, String>> table2 = + new HashMap<String, Map<String, String>>(); + // column 2. + Map<String,String> column2 = new HashMap<String, String>(); + column2.put("221", "221"); + column2.put("222", "222"); + table2.put("column2", column2); + // column 3. + Map<String,String> column3 = new HashMap<String, String>(); + column3.put("231", "231"); + column3.put("232", "232"); + column3.put("233", "233"); + table2.put("column3", column3); + + CellContentExpected.put("table1", table1); + CellContentExpected.put("table2", table2); + LOG.info(CellContentExpected); + } + + Set<String> tableKeys; + String cellContentActual; + String cellContentExpected = null; + for (String tableName : tableNamesActual) { + columnNamesActual = bigTable.getColumnsNames(tableName); + tableKeys = bigTable.getKeys(tableName); + for (String columnName : columnNamesActual) { + for (String cellKey : tableKeys) { + + try { + try{ + cellContentExpected = + CellContentExpected + .get(tableName) + .get(columnName) + .get(cellKey); + } catch (NullPointerException ex) { + LOG.trace(ex); + } + + LOG.info(tableName + ' ' + + columnName + ' ' + + cellKey + ' ' + + cellContentExpected); + + cellContentActual = + bigTable.get(tableName, columnName, cellKey); + assertEquals(cellContentExpected, cellContentActual); + } catch (NoSuchElementException ex) { + if(cellContentExpected != null) { + LOG.error(ex, ex); + Assert.fail(); + } else { + LOG.trace(ex); + } + } + } + } + } + } + + /** + * Test of getPluginName(). + */ + public void testGetPluginName() { + Plugin fromXML = new FromXMLXPP3(); + String expectedPluginName = fromXML.getClass().getSimpleName(); + String actualPluginName = fromXML.getPluginName(); + LOG.info("pluginName : {expected,'" + expectedPluginName + + "'} - {actual,'" + actualPluginName + "'}"); + assertEquals(expectedPluginName, actualPluginName); + } + + /** + * Test of getFileFilter. + */ + public void testGetFileFilter(){ + + Importer fromXML = new FromXMLXPP3(); + + FileNameExtensionFilter fileFilterExpected + = new FileNameExtensionFilter("Fichiers XML", "xml"); + FileNameExtensionFilter fileFilterActual = + (FileNameExtensionFilter) fromXML.getFileFilter(); + + /** Same Description */ + assertEquals(fileFilterExpected.getDescription(), + fileFilterActual.getDescription()); + + /** get extension Set and assertEquals */ + Set<String> acceptedExtensionExpected = new HashSet<String>(); + Set<String> acceptedExtensionActual = new HashSet<String>(); + for (String extension : fileFilterExpected.getExtensions()) { + acceptedExtensionExpected.add(extension); + } + for (String extension : fileFilterActual.getExtensions()) { + acceptedExtensionActual.add(extension); + } + assertEquals(acceptedExtensionExpected, acceptedExtensionActual); + } +}

1 0

r211 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm/src/main/resources/i18n msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org 11 Mar '10

11 Mar '10

Author: dlanglais Date: 2010-03-11 07:52:56 +0100 (Thu, 11 Mar 2010) New Revision: 211 Log: Modification de l'int?\195?\169gration des plugins d'import/export dans l'application : - Suppression des JInternalFrame contenant un menu d?\195?\169roulant (noms des plugins d'im/export) et un bouton permettant de lancer l'im/export ; - Remplac?\195?\169 par deux sous-menu fichier Im/Export contenant un JMenuItem pour chaque plugin assurant l'im/export. Am?\195?\169lioration (avec JOptionPane) : - Il n'est plus possible de im/exporter une base si l'on n'est pas connect?\195?\169 ?\195?\160 une base (cela g?\195?\169n?\195?\169rait une NullPointerException...), - V?\195?\169rification que le plugin d'im/export est bien trouv?\195?\169, - ?\195?\160 la fin de l'import/export on avertit l'utilisateur du succ?\195?\168s ou de l'echec de l'op?\195?\169ration. Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-03-11 06:52:56 UTC (rev 211) @@ -49,14 +49,14 @@ mnemonic:D; } -#menuImport { +#menuImport, #menuImportBis { text:"mapstoragemanager.action.import"; toolTipText:"mapstoragemanager.action.import.tip"; actionIcon:"databaseImport_16"; mnemonic:I; } -#menuExport { +#menuExport, #menuExportBis { text:"mapstoragemanager.action.export"; toolTipText:"mapstoragemanager.action.export.tip"; actionIcon:"databaseExport_16"; Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-11 06:52:56 UTC (rev 211) @@ -95,6 +95,14 @@ m.start(); } +public void doActionPerformed__on__menuImport2(java.awt.event.ActionEvent event) { + engine.showImportFrame(); +} + +public void doActionPerformed__on__menuExport2(java.awt.event.ActionEvent event) { + engine.showExportFrame(); +} + /** * Test. */ @@ -117,10 +125,13 @@ <JMenuItem id='menuDisconnect' enabled='false' onActionPerformed='engine.disposeToolBar()'/> <JSeparator/> - <JMenuItem id='menuImport' +  + <JMenu id='menuImportBis' enabled='false'/> + <JMenu id='menuExportBis' enabled='false'/> <JSeparator/> <JMenuItem id='menuExit' onActionPerformed='engine.close()'/> Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-11 06:52:56 UTC (rev 211) @@ -1,12 +1,15 @@ package org.nuiton.mapstoragemanager.ui.gui; import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; import java.util.Properties; import javax.swing.JFileChooser; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; @@ -130,18 +133,40 @@ ui.getNameBase().setSelectedItem(bigTableItem); } for (Plugin imPlugin : pluginLoader.getAllPlugin(Importer.class)) { - String imName = imPlugin.getPluginName(); - jaxx.runtime.swing.Item importerItem = - new jaxx.runtime.swing.Item(imName, null, imName, true); - ui.getImporter().addItem(importerItem); - ui.getImporter().setSelectedItem(importerItem); + final String imName = imPlugin.getPluginName(); +// jaxx.runtime.swing.Item importerItem = +// new jaxx.runtime.swing.Item(imName, null, imName, true); +// ui.getImporter().addItem(importerItem); +// ui.getImporter().setSelectedItem(importerItem); + + JMenuItem menuItem = new JMenuItem(imName); + menuItem.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + importBase(imName); + } + }); + ui.getMenuImportBis().add(menuItem); + ui.getMenuImportBis ().setEnabled(true); } for (Plugin exPlugin : pluginLoader.getAllPlugin(Exporter.class)) { - String exName = exPlugin.getPluginName(); - jaxx.runtime.swing.Item exporterItem = - new jaxx.runtime.swing.Item(exName, null, exName, true); - ui.getExporter().addItem(exporterItem); - ui.getExporter().setSelectedItem(exporterItem); + final String exName = exPlugin.getPluginName(); +// jaxx.runtime.swing.Item exporterItem = +// new jaxx.runtime.swing.Item(exName, null, exName, true); +// ui.getExporter().addItem(exporterItem); +// ui.getExporter().setSelectedItem(exporterItem); + + JMenuItem menuItem = new JMenuItem(exName); + menuItem.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + exportBase(exName); + } + }); + ui.getMenuExportBis().add(menuItem); + ui.getMenuExportBis().setEnabled(true); } for (Plugin exPlugin : pluginLoader.getAllPlugin(Monitoring.class)) { Monitoring monitor = (Monitoring) exPlugin; @@ -413,57 +438,179 @@ Item selectedItem = ui.getImporter().getSelectedJaxxItem(); String importerName = selectedItem.getValue().toString(); + this.importBase(importerName); +// Importer importer = (Importer) pluginLoader.getPlugin(importerName); +// +// /** Create FileChooser and set FileFilter. */ +// JFileChooser jfc = new JFileChooser(lastPath); +// jfc.setFileFilter(importer.getFileFilter()); +// +// /** ShowOpenDialog and get the return value. */ +// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); +// +// if( JFileChooser.APPROVE_OPTION == jfcReturn ) { +// +// lastPath = jfc.getSelectedFile().getAbsolutePath(); +// +// File importFile = jfc.getSelectedFile(); +// LOG.info("chosen file for import : " + importFile.getPath()); +// +// /** Import. */ +// importer.importFrom(bigTable, importFile); +// clean(ui); +// uptableNavigationTree(ui.getNavigation(), importFile.getName()); +// } + } + + /** + * Export the database into a file. + */ + public void exportBase() { + + /** Get exporter plugin. */ + MainUI ui = MainUI.getInstance(); + Item selectedItem = ui.getExporter().getSelectedJaxxItem(); + String exporterName = selectedItem.getValue().toString(); + + this.exportBase(exporterName); +// Exporter exporter = (Exporter) pluginLoader.getPlugin(exporterName); +// +// /** Create FileChooser and set FileFilter. */ +// JFileChooser jfc = new JFileChooser(lastPath); +// jfc.setFileFilter(exporter.getFileFilter()); +// +// /** ShowOpenDialog and get the return value. */ +// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); +// +// if (JFileChooser.APPROVE_OPTION == jfcReturn) { +// +// lastPath = jfc.getSelectedFile().getAbsolutePath(); +// +// File importFile = jfc.getSelectedFile(); +// LOG.info("chosen file for export : " + importFile.getPath()); +// +// /** Export */ +// exporter.exportTo(bigTable, importFile); +// } + } + + /** + * Import database from a file. + * @param importName the name of the importer plugin. + */ + public void importBase(final String importerName) { + + /** Get importer plugin. */ Importer importer = (Importer) pluginLoader.getPlugin(importerName); - /** Create FileChooser and set FileFilter. */ - JFileChooser jfc = new JFileChooser(lastPath); - jfc.setFileFilter(importer.getFileFilter()); - - /** ShowOpenDialog and get the return value. */ - int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); - - if( JFileChooser.APPROVE_OPTION == jfcReturn ) { + if (importer == null) { + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("notFoundPlugin.JOptionPaneTitle"), + _("notFoundPlugin.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); + } else if (! bigTableIsSet()) { + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("unconnectedError.JOptionPaneTitle"), + _("unconnectedError.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); - lastPath = jfc.getSelectedFile().getAbsolutePath(); + } else { - File importFile = jfc.getSelectedFile(); - LOG.info("chosen file for import : " + importFile.getPath()); + /** Create FileChooser and set FileFilter. */ + JFileChooser jfc = new JFileChooser(lastPath); + jfc.setFileFilter(importer.getFileFilter()); - /** Import. */ - importer.importFrom(bigTable, importFile); - clean(ui); - uptableNavigationTree(ui.getNavigation(), importFile.getName()); + /** ShowOpenDialog and get the return value. */ + int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); + + if( JFileChooser.APPROVE_OPTION == jfcReturn ) { + + lastPath = jfc.getSelectedFile().getAbsolutePath(); + + File importFile = jfc.getSelectedFile(); + LOG.info("chosen file for import : " + importFile.getPath()); + + try { + /** Import. */ + importer.importFrom(bigTable, importFile); + MainUI ui = MainUI.getInstance(); + clean(ui); + uptableNavigationTree(ui.getNavigation(), + importFile.getName()); + + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("importSuccessfull.JOptionPaneTitle"), + _("importSuccessfull.JOptionPaneMessage"), + JOptionPane.INFORMATION_MESSAGE); + } catch (Exception ex) { + LOG.error(ex, ex); + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("importUnsuccessfull.JOptionPaneTitle"), + _("importUnsuccessfull.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); + } + } } } /** * Export the database into a file. + * @param exporterName the name of the exporter plugin. */ - public void exportBase() { + public void exportBase(final String exporterName) { /** Get exporter plugin. */ - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getExporter().getSelectedJaxxItem(); - String exporterName = selectedItem.getValue().toString(); - Exporter exporter = (Exporter) pluginLoader.getPlugin(exporterName); - /** Create FileChooser and set FileFilter. */ - JFileChooser jfc = new JFileChooser(lastPath); - jfc.setFileFilter(exporter.getFileFilter()); + if (exporter == null) { + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("notFoundPlugin.JOptionPaneTitle"), + _("notFoundPlugin.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); + } else if (! bigTableIsSet()) { + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("unconnectedError.JOptionPaneTitle"), + _("unconnectedError.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); + } else { - /** ShowOpenDialog and get the return value. */ - int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); + /** Create FileChooser and set FileFilter. */ + JFileChooser jfc = new JFileChooser(lastPath); + jfc.setFileFilter(exporter.getFileFilter()); - if (JFileChooser.APPROVE_OPTION == jfcReturn) { + /** ShowOpenDialog and get the return value. */ + int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); - lastPath = jfc.getSelectedFile().getAbsolutePath(); + if (JFileChooser.APPROVE_OPTION == jfcReturn) { - File importFile = jfc.getSelectedFile(); - LOG.info("chosen file for export : " + importFile.getPath()); + lastPath = jfc.getSelectedFile().getAbsolutePath(); - /** Export */ - exporter.exportTo(bigTable, importFile); + File importFile = jfc.getSelectedFile(); + LOG.info("chosen file for export : " + importFile.getPath()); + + try { + /** Export */ + exporter.exportTo(bigTable, importFile); + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("exportSuccessfull.JOptionPaneTitle"), + _("exportSuccessfull.JOptionPaneMessage"), + JOptionPane.INFORMATION_MESSAGE); + } catch (Exception ex) { + LOG.error(ex, ex); + JOptionPane.showMessageDialog(MainUI.getInstance(), + _("exportUnsuccessfull.JOptionPaneTitle"), + _("exportUnsuccessfull.JOptionPaneMessage"), + JOptionPane.ERROR_MESSAGE); + } + } } } + + /** + * Method to control if the bigtable is set. + * @return true if bigTable is set, false otherwise. + */ + public boolean bigTableIsSet() { + return this.bigTable != null; + } } Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-11 06:52:56 UTC (rev 211) @@ -19,7 +19,7 @@ mapstoragemanager.action.exit=Exit mapstoragemanager.action.exit.tip= mapstoragemanager.action.export=Export -mapstoragemanager.action.export.tip= +mapstoragemanager.action.export.tip=Export the base mapstoragemanager.action.file=File mapstoragemanager.action.file.tip= mapstoragemanager.action.fr=French @@ -27,7 +27,7 @@ mapstoragemanager.action.help=Help mapstoragemanager.action.help.tip= mapstoragemanager.action.import=Import -mapstoragemanager.action.import.tip= +mapstoragemanager.action.import.tip=Import the base mapstoragemanager.action.language=Choose language mapstoragemanager.action.language.tip= mapstoragemanager.action.menuHelp=Help @@ -52,3 +52,16 @@ table.keys=Keys table.values=Values welcome.MapStorageManager=Welcome to MapStorageManager + +unconnectedError.JOptionPaneTitle=No bigtable connected ! +unconnectedError.JOptionPaneMessage=No bigtable connected ! +notFoundPlugin.JOptionPaneTitle=Plugin not found ! +notFoundPlugin.JOptionPaneMessage=Plugin not found ! +importSuccessfull.JOptionPaneTitle=Import successfully proceded. +importSuccessfull.JOptionPaneMessage=Import successfully proceded. +exportSuccessfull.JOptionPaneTitle=Export successfully proceded. +exportSuccessfull.JOptionPaneMessage=Export successfully proceded. +importUnsuccessfull.JOptionPaneTitle=Exception while import. +importUnsuccessfull.JOptionPaneMessage=An exception occured while import database. +exportUnsuccessfull.JOptionPaneTitle=Exception while export. +exportUnsuccessfull.JOptionPaneMessage=An exception occured while export database. \ No newline at end of file Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-11 06:52:56 UTC (rev 211) @@ -19,7 +19,7 @@ mapstoragemanager.action.exit=Quitter mapstoragemanager.action.exit.tip=Quitte l'application mapstoragemanager.action.export=Exporter -mapstoragemanager.action.export.tip= +mapstoragemanager.action.export.tip=Exporter la base mapstoragemanager.action.file=Fichier mapstoragemanager.action.file.tip= mapstoragemanager.action.fr=Fran\u00E7ais @@ -27,7 +27,7 @@ mapstoragemanager.action.help=Aide mapstoragemanager.action.help.tip= mapstoragemanager.action.import=Importer -mapstoragemanager.action.import.tip= +mapstoragemanager.action.import.tip=Import la base mapstoragemanager.action.language=Choisir la langue mapstoragemanager.action.language.tip= mapstoragemanager.action.menuHelp=Aide @@ -52,3 +52,16 @@ table.keys=Cl\u00E9s table.values=Valeurs welcome.MapStorageManager=Bienvenue dans MapStorageManager + +unconnectedError.JOptionPaneTitle=Connect\u00E9 \u00E0 aucune base ! +unconnectedError.JOptionPaneMessage=Connect\u00E9 \u00E0 aucune base ! +notFoundPlugin.JOptionPaneTitle=Plugin non trouv\u00E9 ! +notFoundPlugin.JOptionPaneMessage=Plugin non trouv\u00E9 ! +importSuccessfull.JOptionPaneTitle=Import r\u00E9alis\u00E9 avec succ\u00E8s. +importSuccessfull.JOptionPaneMessage=Import r\u00E9alis\u00E9 avec succ\u00E8s. +exportSuccessfull.JOptionPaneTitle=Export r\u00E9alis\u00E9 avec succ\u00E8s. +exportSuccessfull.JOptionPaneMessage=Export r\u00E9alis\u00E9 avec succ\u00E8s. +importUnsuccessfull.JOptionPaneTitle=Exception durant l'import. +importUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'import de la base. +exportUnsuccessfull.JOptionPaneTitle=Exception durant l'export. +exportUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'export de la base. \ No newline at end of file Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-11 01:13:57 UTC (rev 210) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-11 06:52:56 UTC (rev 211) @@ -80,7 +80,8 @@ serializer.endTag(NAMESPACE, "database"); serializer.endDocument(); - + + serializer.flush(); } catch (IOException ex) { LOG.fatal(ex, ex); } catch (IllegalArgumentException ex) {

1 0

r210 - trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring
by dlanglais＠users.nuiton.org 11 Mar '10

11 Mar '10

Author: dlanglais Date: 2010-03-11 02:13:57 +0100 (Thu, 11 Mar 2010) New Revision: 210 Log: modification : - Arrondi des espaces m?\195?\169moires en Go (2 chiffres apr?\195?\168s la virgule). - Suppression magic numbers. Correction : - la fermeture de la fen?\195?\170tre du plugin fermait l'application enti?\195?\168re.. Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 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-10 22:50:08 UTC (rev 209) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-11 01:13:57 UTC (rev 210) @@ -2,6 +2,7 @@ import java.awt.GridLayout; import java.io.File; +import java.text.DecimalFormat; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; @@ -17,64 +18,94 @@ * 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; + + /** * Constructor. */ - public ShowDiskSpace(){ + public ShowDiskSpace() { } - + /** * Display. */ @Override - public void display(){ - this.setTitle("Plugin ShowDiskSpace"); - this.setSize(300, 300); - this.setLocationRelativeTo(null); - this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + public void display() { - JPanel content = new JPanel(); - File f = new File(new File("").getAbsolutePath()).getParentFile(); - if (f.exists()) { - long freeSpaceByte = f.getFreeSpace(); - long totalSpaceByte = f.getTotalSpace(); - long usableSpaceByte = f.getUsableSpace(); - double freeSpaceMb = freeSpaceByte / (DIV * DIV); - double totalSpaceMb = totalSpaceByte / (DIV * DIV); - double usableSpaceMb = usableSpaceByte / (DIV * DIV); - double freeSpaceGb = freeSpaceMb / DIV; - double totalSpaceGb = totalSpaceMb / DIV; - double usableSpaceGb = usableSpaceMb / DIV; - content.setLayout(new GridLayout(7,1)); + this.setTitle("Plugin ShowDiskSpace"); + this.setSize(FRAME_WIDTH, FRAME_HEIGHT); + this.setLocationRelativeTo(null); +// this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // exit MSM... + + JPanel content = new JPanel(); + File f = new File(new File("").getAbsolutePath()).getParentFile(); + if (f.exists()) { + + final long freeSpaceByte = f.getFreeSpace(); + final long totalSpaceByte = f.getTotalSpace(); + final long usableSpaceByte = f.getUsableSpace(); + + final double freeSpaceMb = freeSpaceByte / (DIV * DIV); + final double totalSpaceMb = totalSpaceByte / (DIV * DIV); + final double usableSpaceMb = usableSpaceByte / (DIV * DIV); + + final double freeSpaceGb = freeSpaceMb / DIV; + final double totalSpaceGb = totalSpaceMb / DIV; + final double usableSpaceGb = usableSpaceMb / DIV; + + final int rows = 7, cols = 1; + content.setLayout(new GridLayout(rows, cols)); + content.add(new JLabel( - "freeSpace : " + freeSpaceMb + " Mb (" + freeSpaceGb + " Gb)")); + "freeSpace : " + freeSpaceMb + " Mb (" + + new DecimalFormat("0.00").format(freeSpaceGb) + " Gb)")); content.add(new JLabel( - "totalSpace : " + totalSpaceMb + " Mb (" + totalSpaceGb + " Gb)")); + "totalSpace : " + totalSpaceMb + " Mb (" + + new DecimalFormat("0.00").format(totalSpaceGb) + " Gb)")); content.add(new JLabel( - "usableSpace : " + usableSpaceMb + " Mb (" + usableSpaceGb + " Gb)")); + "usableSpace : " + usableSpaceMb + " Mb (" + + new DecimalFormat("0.00").format(usableSpaceGb) + " Gb)")); content.add(new JLabel("")); - } - Runtime runtime = Runtime.getRuntime(); - long freeMemoryByte = runtime.freeMemory(); - long totalMemoryByte = runtime.totalMemory(); - long maxMemoryByte = runtime.maxMemory(); - double freeMemoryMb = freeMemoryByte/(DIV*DIV); - double totalMemoryMb = totalMemoryByte/(DIV*DIV); - double maxMemoryMb = maxMemoryByte/(DIV*DIV); - double freeMemoryGb = freeMemoryMb/DIV; - double totalMemoryGb = totalMemoryMb/DIV; - double maxMemoryGb = maxMemoryMb/DIV; - content.add(new JLabel( - "freeMemory : " + freeMemoryMb + " Mb (" + freeMemoryGb + " Gb)")); - content.add(new JLabel( - "totalMemory : " + totalMemoryMb + " Mb (" + totalMemoryGb + " Gb)")); - content.add(new JLabel( - "maxMemory : " + maxMemoryMb + " Mb (" + maxMemoryGb + " Gb)")); - this.setContentPane(content); - this.pack(); - this.setVisible(true); + } else { + final int rows = 3, cols = 1; + content.setLayout(new GridLayout(rows, cols)); + } + + Runtime runtime = Runtime.getRuntime(); + + final long freeMemoryByte = runtime.freeMemory(); + final long totalMemoryByte = runtime.totalMemory(); + final long maxMemoryByte = runtime.maxMemory(); + + final double freeMemoryMb = freeMemoryByte / (DIV * DIV); + final double totalMemoryMb = totalMemoryByte / (DIV * DIV); + final double maxMemoryMb = maxMemoryByte / (DIV * DIV); + + final double freeMemoryGb = freeMemoryMb / DIV; + final double totalMemoryGb = totalMemoryMb / DIV; + final double maxMemoryGb = maxMemoryMb / DIV; + + content.add(new JLabel( + "freeMemory : " + freeMemoryMb + " Mb (" + + new DecimalFormat("0.00").format(freeMemoryGb) + " Gb)")); + content.add(new JLabel( + "totalMemory : " + totalMemoryMb + " Mb (" + + new DecimalFormat("0.00").format(totalMemoryGb) + " Gb)")); + content.add(new JLabel( + "maxMemory : " + maxMemoryMb + " Mb (" + + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); + + this.setContentPane(content); + this.pack(); + this.setVisible(true); } public String getPluginName() {

1 0

r209 - trunk/src/site/doc/rapport
by afages＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: afages Date: 2010-03-10 23:50:08 +0100 (Wed, 10 Mar 2010) New Revision: 209 Log: Continuation rapport Modified: trunk/src/site/doc/rapport/rapport.rst Modified: trunk/src/site/doc/rapport/rapport.rst =================================================================== --- trunk/src/site/doc/rapport/rapport.rst 2010-03-10 22:11:29 UTC (rev 208) +++ trunk/src/site/doc/rapport/rapport.rst 2010-03-10 22:50:08 UTC (rev 209) @@ -12,8 +12,8 @@ ------------------------------------------------------ -Spécification préliminaire -========================== +Spécifications : préliminaires +============================== Demandeur --------- @@ -104,8 +104,8 @@ - Communication : Maillist de Nuiton pour le développement, l'utilisation et le commit. -Organisation ------------- +Chiffrage et organisation +------------------------- Planning prévisionnel @@ -127,3 +127,41 @@ Spécifications : analyse ======================== + +analyse des technologies +------------------------ + +JAXX, JMX + +analyse du domaine +------------------ +BigTable... + +usecase1 +-------- + +usecase2 +-------- + +usecase3 +-------- + +usecase4 +-------- + +usecase5 +-------- + +usecase6 +-------- + +Modèles et architecture du domaine +---------------------------------- + +Package +MSM (Core) +Plugin +GUI + +Conception +==========

1 0

r208 - in trunk: msm-monitoring-plugins src/site/doc src/site/doc/analyse src/site/doc/rapport
by afages＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: afages Date: 2010-03-10 23:11:29 +0100 (Wed, 10 Mar 2010) New Revision: 208 Log: Continuation rapport Added: trunk/src/site/doc/analyse/exampleHBase.rst trunk/src/site/doc/analyse/schemaIHM.JPG Removed: trunk/src/site/doc/exampleHBase.rst trunk/src/site/doc/schemaIHM.JPG Modified: trunk/msm-monitoring-plugins/ trunk/src/site/doc/analyse/msm.zargo trunk/src/site/doc/rapport/rapport.rst Property changes on: trunk/msm-monitoring-plugins ___________________________________________________________________ Added: svn:ignore + target Copied: trunk/src/site/doc/analyse/exampleHBase.rst (from rev 207, trunk/src/site/doc/exampleHBase.rst) =================================================================== --- trunk/src/site/doc/analyse/exampleHBase.rst (rev 0) +++ trunk/src/site/doc/analyse/exampleHBase.rst 2010-03-10 22:11:29 UTC (rev 208) @@ -0,0 +1,15 @@ + + +Exemple d'utilisation de HBase +============================== + +le projet Sharengo : +http://wiki.sharengo.org/xwiki2/bin/view/Main/WebHome + +svn de sharengo : +http://svn.sharengo.org/svn/ +login : anonymous +mdp : anon + +sources de test (lance un serveur HBase notamment) : +http://svn.sharengo.org/svn/wikengo/trunk/core/wikitty/wikitty-hbase-impl/src/test/java/org/sharengo/wikitty/hbase/test/ \ No newline at end of file Modified: trunk/src/site/doc/analyse/msm.zargo =================================================================== (Binary files differ) Copied: trunk/src/site/doc/analyse/schemaIHM.JPG (from rev 207, trunk/src/site/doc/schemaIHM.JPG) =================================================================== (Binary files differ) Deleted: trunk/src/site/doc/exampleHBase.rst =================================================================== --- trunk/src/site/doc/exampleHBase.rst 2010-03-10 18:00:13 UTC (rev 207) +++ trunk/src/site/doc/exampleHBase.rst 2010-03-10 22:11:29 UTC (rev 208) @@ -1,15 +0,0 @@ - - -Exemple d'utilisation de HBase -============================== - -le projet Sharengo : -http://wiki.sharengo.org/xwiki2/bin/view/Main/WebHome - -svn de sharengo : -http://svn.sharengo.org/svn/ -login : anonymous -mdp : anon - -sources de test (lance un serveur HBase notamment) : -http://svn.sharengo.org/svn/wikengo/trunk/core/wikitty/wikitty-hbase-impl/src/test/java/org/sharengo/wikitty/hbase/test/ \ No newline at end of file Modified: trunk/src/site/doc/rapport/rapport.rst =================================================================== --- trunk/src/site/doc/rapport/rapport.rst 2010-03-10 18:00:13 UTC (rev 207) +++ trunk/src/site/doc/rapport/rapport.rst 2010-03-10 22:11:29 UTC (rev 208) @@ -1,4 +1,4 @@ -Rapport du projet de fin d'étude : Map Storage Manager +Rapport de projet de fin d'étude : Map Storage Manager ====================================================== :Authors: @@ -17,3 +17,113 @@ Demandeur --------- + +Code Lutin, Société de Service en Logiciel Libre + +Créée en 2002, spécialiste des environnements libres, la SSLL1) Code Lutin, basée à Nantes développe son activité dans la région du Grand Ouest. + +Code Lutin est spécialisée autour des technologies Java JEE et UML: conception, architectures JEE, outils JEE, MDA (Model Driven Architecture), développement/migration d’applications JEE, formation. + +Code Lutin propose une gamme de services adaptée aux demandes spécifiques. +L’offre de service de Code Lutin comprend: + + * du développement de logiciel (forfait ou régie) + * de l’intégration et de la maintenance de systèmes clés en main + * du support + * du conseil et de la veille technologique + +Code Lutin a construit au fil de l’expérience acquise un processus propre hautement outillé avec des objectifs tels que l’obtention d’un produit fidèle au besoin exprimé par le client, l’amélioration constante de la qualité du logiciel, l’assurance de conformité et de non régression grâce aux tests unitaires, le respect des délais. + +Libre Entreprise + +Ce réseau regroupe des entreprises ayant des spécialités proches ou +complémentaires, en particulier dans le domaine du logiciel libre. Toutes +partagent les mêmes valeurs et modes de fonctionnement, basés sur la +clarté et la compétence. Le groupe est présent dans toute la France +(Biarritz, Lille, Montpellier, Nantes, Paris, Tours, Liévin, Ganges, +Bourges, Toulouse, Grenoble et Laval) + +Alliance Libre + +Alliance Libre est le pôle d’expertise en logiciels libres +de la région nantaise. L’association a été créée au début de l’année +2007, à l’initiative d’entreprises et d’indépendants engagés depuis des +années dans le développement et la promotion du logiciel libre +professionnel. Nous nous sommes regroupés pour promouvoir nos savoir- +faire, améliorer notre visibilité et accroître notre notoriété. + +April + +Code Lutin est membre de l’April qui a pour vocation de promouvoir et +défendre le logiciel libre depuis 1996. Forte de ses 4567 adhérents +(individus, associations, organisations et entreprises), l’April est un +acteur majeur de la diffusion et de la démocratisation du logiciel libre +auprès d’un large public de professionnels, particuliers et institutions +en France. + +La demande +---------- + +Voyons voir ce qui se cache derrière le nom de code MSM +(Map Storage Manager) : + +Il se trouve que Facebook, Amazone etc. utilisent depuis déjà un moment +une spécification d'un système de gestion de base de données +innovant. Il s'agit de la spécification BigTable créée par Google Corp. +Parmis les implémentations existantes de cette spécification, on trouve +diverses bases telle que Hbase, Cassandra (Facebook)... Le concept +est relativement simple puisqu'il repose sur un principe <clé, valeur> +de type HashMap. + +Il existe dors et déjà des systèmes en ligne de commande. Toutefois, Code +Lutin souhaite réaliser une application graphique permettant de visualiser +et manipuler les données au sein de telles bases, principalement HBase. +De plus, nous devons prévoir le fait que des implémentations de BigTable +naissent régulièrement et qu'un utilisateur expert de MSM pourrait +souhaiter utiliser une nouvelle base. Il s'agit donc d'une architecture +à plugins sous-jacente. + +Objectifs +--------- + +- Accroître la productivié des utilisateurs de HBase et autres +- Permettre une adaptation rapide aux nouvelles bases +- Fournir un produit fonctionnel, ergonomique et performant + +Outils +---------------------- + +- Technologies : Java, JAXX, JMX +- SVN : Dépôt de Code Lutin prévu à cet effet. + - Architecture Maven comportant un pom.xml natif à Code Lutin + permettant l'utilisation d'artifact JAXX notamment. +- Intégration continue : Hudson + - Site répertoriant un ensemble de statistiques sur chaque projet + et effectuant compilation et jeux de tests à chaque validation sur + le dépôt de manière automatique. +- Communication : Maillist de Nuiton pour le développement, l'utilisation +et le commit. + +Organisation +------------ + +Planning prévisionnel + +[Image du planning] + +Planning de réunions jalons prévues avec M. Benjamin Poussin : + +- 26/01/2010 +- 1/02/2010 +- 9/02/2010 +- 18/02/2010 +- 04/03/2010 + +Permettant à chaque fois de faire le point sur le travail réalisé et le +travail à faire. + +Un compte rendu symbolisé par les rectangles noirs en fin de semaine +suit chaque réunion. + +Spécifications : analyse +======================== Deleted: trunk/src/site/doc/schemaIHM.JPG =================================================================== (Binary files differ)

1 0

r207 - in trunk/msm-hbase/src: main/java/org/nuiton/mapstoragemanager/plugins/hbase test/java/org/nuiton/mapstoragemanager/plugins/hbase
by gcrieloue＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: gcrieloue Date: 2010-03-10 19:00:13 +0100 (Wed, 10 Mar 2010) New Revision: 207 Log: Avancement (mineur) sur le plugin hbase. Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-10 14:18:42 UTC (rev 206) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-10 18:00:13 UTC (rev 207) @@ -80,9 +80,10 @@ // @Override public void createTable(String table) { HTableDescriptor hTableDescriptor = new HTableDescriptor(table); + try { hBaseAdmin.createTable(hTableDescriptor); - + hBaseAdmin.enableTable(table); LOG.trace("table " + table + " created."); } catch (TableExistsException e) { @@ -134,12 +135,14 @@ // @Override public void createColumn(String table, String column) { HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); + try { - hBaseAdmin.disableTable(table); - hBaseAdmin.addColumn(table, hColumnDescriptor); + //hBaseAdmin.disableTable(table); + hBaseAdmin.getTableDescriptor(table.getBytes()).addFamily(hColumnDescriptor); + //hBaseAdmin.addColumn(table, hColumnDescriptor); LOG.trace("colum " + column + " created in table " + table + "."); - hBaseAdmin.enableTable(table); + //hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java (rev 0) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-10 18:00:13 UTC (rev 207) @@ -0,0 +1,32 @@ + +package org.nuiton.mapstoragemanager.plugins.hbase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.MasterNotRunningException; + + + +public class Main { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(HBase.class); + + public static void main(String[] args){ + String tableName = "myTable"; + String columnName = "myColumn"; + String contentValue = "val"; + String keyValue="key"; + try { + HBase hb = new HBase(); + hb.createTable(tableName); + hb.createColumn(tableName, columnName); + hb.put(tableName, columnName, keyValue, contentValue); + //LOG.trace(hb.get(tableName, columnName, keyValue)); + } catch (MasterNotRunningException ex) { + LOG.fatal(ex, ex); + } + } +} \ No newline at end of file Modified: trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java =================================================================== --- trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-10 14:18:42 UTC (rev 206) +++ trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-10 18:00:13 UTC (rev 207) @@ -3,9 +3,13 @@ import java.net.MalformedURLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.MasterNotRunningException; +import org.apache.hadoop.hbase.client.HBaseAdmin; import org.junit.After; import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -26,6 +30,11 @@ @BeforeClass public static void setUpClass() throws Exception { +// org.apache.hadoop.conf.Configuration conf = +// new org.apache.hadoop.conf.Configuration(); +// HBaseConfiguration config = new HBaseConfiguration(conf); +// HBaseAdmin hBaseAdmin = new HBaseAdmin(config); +// Assume.assumeTrue(hBaseAdmin.isMasterRunning()); } @AfterClass @@ -46,20 +55,19 @@ */ @Test public void testHBase() throws MalformedURLException { - String tableName = "myTable"; - String columnName = "myColumn"; - String contentValue = "val"; - String keyValue="key"; - try { - HBase hb = new HBase(); - hb.createTable(tableName); - hb.createColumn(tableName, columnName); - hb.put(tableName, columnName, keyValue, contentValue); - LOG.trace(hb.get(tableName, columnName, keyValue)); - } catch (MasterNotRunningException ex) { - LOG.fatal(ex, ex); - } +// String tableName = "myTable"; +// String columnName = "myColumn"; +// String contentValue = "val"; +// String keyValue="key"; +// try { +// HBase hb = new HBase(); +// hb.createTable(tableName); +// hb.createColumn(tableName, columnName); +// hb.put(tableName, columnName, keyValue, contentValue); +// LOG.trace(hb.get(tableName, columnName, keyValue)); +// } catch (MasterNotRunningException ex) { +// LOG.fatal(ex, ex); +// } + } - - }

1 0

r206 - in trunk/msm-fromtoXPP3/src: main/java/org/nuiton/mapstoragemanager/plugins/exporter main/java/org/nuiton/mapstoragemanager/plugins/importer test/java/org/nuiton/mapstoragemanager/plugins/exporter test/resources
by dlanglais＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: dlanglais Date: 2010-03-10 15:18:42 +0100 (Wed, 10 Mar 2010) New Revision: 206 Log: gestion d'?\195?\169tat pour le parser XML XPP3 Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java trunk/msm-fromtoXPP3/src/test/resources/fiveColumns.xml Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-10 13:28:21 UTC (rev 205) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-10 14:18:42 UTC (rev 206) @@ -5,16 +5,12 @@ package org.nuiton.mapstoragemanager.plugins.exporter; import java.io.File; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdom.Document; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.BigTable; @@ -34,10 +30,6 @@ */ private static final Log LOG = LogFactory.getLog(ToXMLXPP3.class); /** - * the jdom document. - */ - private static Document document; - /** * the fileFilter. */ private static FileFilter fileFilter; Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-10 13:28:21 UTC (rev 205) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-10 14:18:42 UTC (rev 206) @@ -30,7 +30,7 @@ /** * Parsing State. */ -// private ParsingState state; + private ParsingState state; /** * Current Table, needed when create the database to know in which table * we are to add a new column. @@ -90,7 +90,7 @@ do { if(eventType == XmlPullParser.START_DOCUMENT) { LOG.info("Start document"); -// state = ParsingState.START; + state = ParsingState.START; } else if(eventType == XmlPullParser.END_DOCUMENT) { LOG.info("End document"); } else if(eventType == XmlPullParser.START_TAG) { @@ -123,26 +123,42 @@ "\tAttributes : " + attributes.toString()); - if("describe".equals(elementName)) { /** Element Describe */ -// state = ParsingState.START_DESCRIBE_DATABASE; - } else if ("table".equals(elementName)) { /** Element Table */ -// state = ParsingState.START_DESCRIBE_TABLE; + if(isState(ParsingState.START) + && "describe".equals(elementName)) { /** Element Describe */ + + state = ParsingState.START_DESCRIBE_DATABASE; + + } else if (isState(ParsingState.START_DESCRIBE_DATABASE, + ParsingState.END_DESCRIBE_TABLE) + && "table".equals(elementName)) { /** Element Table */ + + state = ParsingState.START_DESCRIBE_TABLE; { final String tableName = attributes.get("tableName"); LOG.info("Create Table : " + tableName); bigTable.createTable(tableName); currentTable = tableName; } - } else if ("column".equals(elementName)) { /** Element Column */ -// state = ParsingState.START_DESCRIBE_COLUMN; + + } else if (isState(ParsingState.START_DESCRIBE_TABLE, + ParsingState.END_DESCRIBE_COLUMN) + && "column".equals(elementName)) { /** Element Column */ + + state = ParsingState.START_DESCRIBE_COLUMN; { final String columnName = attributes.get("columnName"); LOG.info("Create Column : " + currentTable + ":" + columnName); bigTable.createColumn(currentTable, columnName); } - } else if ("insert".equals(elementName)) { /** Element Insert */ -// state = ParsingState.START_INSERT_DATA; - } else if ("element".equals(elementName)) { /** Element Element */ + + } else if (isState(ParsingState.END_DESCRIBE_DATABASE) + && "insert".equals(elementName)) { /** Element Insert */ + + state = ParsingState.INSERT_DATA; + + } else if (isState(ParsingState.INSERT_DATA) + && "element".equals(elementName)) { /** Element Element */ + // state = ParsingState.INSERT_DATA; { // if(attributes.keySet().contains("version")) { @@ -165,6 +181,7 @@ attributes.get("value")); // } } + } } @@ -177,15 +194,15 @@ final String elementName = xpp.getName(); if("describe".equals(elementName)) { /** Element Describe */ -// state = ParsingState.END_DESCRIBE_DATABASE; + state = ParsingState.END_DESCRIBE_DATABASE; } else if ("table".equals(elementName)) { /** Element Table */ -// state = ParsingState.END_DESCRIBE_TABLE; + state = ParsingState.END_DESCRIBE_TABLE; } else if ("column".equals(elementName)) { /** Element Column */ -// state = ParsingState.END_DESCRIBE_COLUMN; + state = ParsingState.END_DESCRIBE_COLUMN; } else if ("insert".equals(elementName)) { /** Element Insert */ -// state = ParsingState.END_INSERT_DATA; + state = ParsingState.END_INSERT_DATA; } else if ("element".equals(elementName)) { /** Element Element */ -// state = ParsingState.INSERT_DATA; + state = ParsingState.INSERT_DATA; } } @@ -194,15 +211,15 @@ * @param states set of state * @return true if actual state is in <b>states</b>. */ -// private boolean isState(ParsingState ... states) { -// boolean isState = false; -// for (ParsingState state : states) { -// if (this.state.equals(state)) { -// isState = true; -// } -// } -// return isState; -// } + private boolean isState(ParsingState ... states) { + boolean isState = false; + for (ParsingState state : states) { + if (this.state.equals(state)) { + isState = true; + } + } + return isState; + } /** * {@inheritDoc} Modified: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java =================================================================== --- trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java 2010-03-10 13:28:21 UTC (rev 205) +++ trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java 2010-03-10 14:18:42 UTC (rev 206) @@ -6,12 +6,16 @@ package org.nuiton.mapstoragemanager.plugins.exporter; import java.io.File; +import java.util.HashSet; +import java.util.Set; +import javax.swing.filechooser.FileNameExtensionFilter; import junit.framework.TestCase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; +import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; import org.nuiton.mapstoragemanager.plugins.importer.FromXMLXPP3; @@ -192,6 +196,50 @@ exportTest.delete(); } + /** + * Test of getPluginName(). + */ + public void testGetPluginName() { + Plugin fromXML = new FromXMLXPP3(); + String expectedPluginName = fromXML.getClass().getSimpleName(); + String actualPluginName = fromXML.getPluginName(); + LOG.info("pluginName : {expected,'" + expectedPluginName + + "'} - {actual,'" + actualPluginName + "'}"); + assertEquals(expectedPluginName, actualPluginName); + } + + /** + * Test of getFileFilter. + */ + public void testGetFileFilter(){ + + Importer fromXML = new FromXMLXPP3(); + + FileNameExtensionFilter fileFilterExpected + = new FileNameExtensionFilter("Fichiers XML", "xml"); + FileNameExtensionFilter fileFilterActual = + (FileNameExtensionFilter) fromXML.getFileFilter(); + + /** Same Description */ + assertEquals(fileFilterExpected.getDescription(), + fileFilterActual.getDescription()); + + /** get extension Set and assertEquals */ + Set<String> acceptedExtensionExpected = new HashSet<String>(); + Set<String> acceptedExtensionActual = new HashSet<String>(); + for (String extension : fileFilterExpected.getExtensions()) { + acceptedExtensionExpected.add(extension); + } + for (String extension : fileFilterActual.getExtensions()) { + acceptedExtensionActual.add(extension); + } + assertEquals(acceptedExtensionExpected, acceptedExtensionActual); + } + + /** + * Main to test... + * @param args args. + */ public static void main(String[] args) { Exporter exporter = new ToXMLXPP3(); Modified: trunk/msm-fromtoXPP3/src/test/resources/fiveColumns.xml =================================================================== --- trunk/msm-fromtoXPP3/src/test/resources/fiveColumns.xml 2010-03-10 13:28:21 UTC (rev 205) +++ trunk/msm-fromtoXPP3/src/test/resources/fiveColumns.xml 2010-03-10 14:18:42 UTC (rev 206) @@ -9,6 +9,7 @@ <column columnName="column3" /> <column columnName="column4" /> <column columnName="column5" /> - </table></describe> + </table> + </describe> </database>

1 0

r205 - in trunk: . msm/src/main/java/org/nuiton/mapstoragemanager
by tchemit＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: tchemit Date: 2010-03-10 14:28:21 +0100 (Wed, 10 Mar 2010) New Revision: 205 Log: use nuiton-utils 1.2 and nuiton-i18n 1.1 Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/pom.xml Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-10 03:51:00 UTC (rev 204) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-10 13:28:21 UTC (rev 205) @@ -5,6 +5,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.mapstoragemanager.ui.MainUI; import java.util.Locale; @@ -40,7 +41,7 @@ */ private Main(final String... args) { try { - I18n.setUniqueBundleName("msm-i18n"); + I18n.setInitializer(new DefaultI18nInitializer("msm-i18n")); I18n.init(locale); try { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-10 03:51:00 UTC (rev 204) +++ trunk/pom.xml 2010-03-10 13:28:21 UTC (rev 205) @@ -107,8 +107,8 @@ <projectId>mapstoragemanager</projectId> <jaxx.version>2.0.0-beta-5</jaxx.version> - <nuitonutils.version>1.1.0</nuitonutils.version> - <i18n.version>1.0.1</i18n.version> + <nuitonutils.version>1.2</nuitonutils.version> + <i18n.version>1.1</i18n.version> <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class>

1 0

r204 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm/src/main/resources/i18n msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase msm-monitoring-plugins/src/main/java/org/nuiton/monitoring
by dlanglais＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: dlanglais Date: 2010-03-10 04:51:00 +0100 (Wed, 10 Mar 2010) New Revision: 204 Log: Am?\195?\169lioration qualit?\195?\169... Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/package-info.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-10 03:51:00 UTC (rev 204) @@ -8,5 +8,5 @@ /** * display. */ - public void display(); + void display(); } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-10 03:51:00 UTC (rev 204) @@ -1,12 +1,9 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.awt.Color; import java.awt.Dimension; import javax.swing.JLabel; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.border.Border; -import javax.swing.border.LineBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; @@ -49,7 +46,7 @@ jTable.setFillsViewportHeight(true); int height = (int)ui.getTableContent().getSize().getHeight(); int width = (int)ui.getTableContent().getSize().getWidth(); - Dimension screen = new Dimension(width-100, height-100); + Dimension screen = new Dimension(width - 100, height - 100); jTable.setPreferredScrollableViewportSize(screen); //we check attributes and values of the select table Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-10 03:51:00 UTC (rev 204) @@ -1,54 +1,54 @@ -Empty=Empty -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=The connection attempt to failed, please retry \! -connectionValid=The connection is established -jaxxdemo.message.goto.site=Visit site -login\ \:=Login -mapstoragemanager.action.aboutUs=About us -mapstoragemanager.action.aboutUs.tip=About Code Lutin -mapstoragemanager.action.connect=Connect -mapstoragemanager.action.connect.tip=Start a new connection -mapstoragemanager.action.disconnect=Disconnect -mapstoragemanager.action.disconnect.tip=Disconnect the current session -mapstoragemanager.action.edit=Edit -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Exit -mapstoragemanager.action.exit.tip= -mapstoragemanager.action.export=Export -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=File -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=French -mapstoragemanager.action.fr.tip=Change to french language -mapstoragemanager.action.help=Help -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import=Import -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choose language -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Help -mapstoragemanager.action.menuHelp.tip= -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=Load -mapstoragemanager.action.pluginload.tip=Load plugins -mapstoragemanager.action.pluginshow=Show -mapstoragemanager.action.pluginshow.tip=Show plugins -mapstoragemanager.action.preferences=Preferences -mapstoragemanager.action.preferences.tip= -mapstoragemanager.action.uk=English -mapstoragemanager.action.uk.tip=Change to english language -mapstoragemanager.action.visitSite=Visit our site -mapstoragemanager.action.visitSite.tip= -messageEntry=Welcome to MapStorageManager -name\ base\ \:=Name base -no.help=No help today, sorry \! -ok=Validate -password\ \:=Password -table.keys=Keys -table.values=Values -welcome.MapStorageManager=Welcome to MapStorageManager +Empty=Empty +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established +jaxxdemo.message.goto.site=Visit site +login\ \:=Login +mapstoragemanager.action.aboutUs=About us +mapstoragemanager.action.aboutUs.tip=About Code Lutin +mapstoragemanager.action.connect=Connect +mapstoragemanager.action.connect.tip=Start a new connection +mapstoragemanager.action.disconnect=Disconnect +mapstoragemanager.action.disconnect.tip=Disconnect the current session +mapstoragemanager.action.edit=Edit +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Exit +mapstoragemanager.action.exit.tip= +mapstoragemanager.action.export=Export +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=File +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=French +mapstoragemanager.action.fr.tip=Change to french language +mapstoragemanager.action.help=Help +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import=Import +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choose language +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Help +mapstoragemanager.action.menuHelp.tip= +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=Load +mapstoragemanager.action.pluginload.tip=Load plugins +mapstoragemanager.action.pluginshow=Show +mapstoragemanager.action.pluginshow.tip=Show plugins +mapstoragemanager.action.preferences=Preferences +mapstoragemanager.action.preferences.tip= +mapstoragemanager.action.uk=English +mapstoragemanager.action.uk.tip=Change to english language +mapstoragemanager.action.visitSite=Visit our site +mapstoragemanager.action.visitSite.tip= +messageEntry=Welcome to MapStorageManager +name\ base\ \:=Name base +no.help=No help today, sorry \! +ok=Validate +password\ \:=Password +table.keys=Keys +table.values=Values +welcome.MapStorageManager=Welcome to MapStorageManager Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-10 03:51:00 UTC (rev 204) @@ -1,54 +1,54 @@ -Empty=Vide -Export\ Database= -Exporter\ \:= -Import\ Database= -Importer\ \:= -Map\ Storage\ Manager=Map Storage Manager -connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! -connectionValid=La connexion est \u00E9tablie -jaxxdemo.message.goto.site=Visitez le site -login\ \:=Identifiant -mapstoragemanager.action.aboutUs=A propos -mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin -mapstoragemanager.action.connect=Connexion -mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion -mapstoragemanager.action.disconnect=D\u00E9connexion -mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante -mapstoragemanager.action.edit=Edition -mapstoragemanager.action.edit.tip= -mapstoragemanager.action.exit=Quitter -mapstoragemanager.action.exit.tip=Quitte l'application -mapstoragemanager.action.export=Exporter -mapstoragemanager.action.export.tip= -mapstoragemanager.action.file=Fichier -mapstoragemanager.action.file.tip= -mapstoragemanager.action.fr=Fran\u00E7ais -mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais -mapstoragemanager.action.help=Aide -mapstoragemanager.action.help.tip= -mapstoragemanager.action.import=Importer -mapstoragemanager.action.import.tip= -mapstoragemanager.action.language=Choisir la langue -mapstoragemanager.action.language.tip= -mapstoragemanager.action.menuHelp=Aide -mapstoragemanager.action.menuHelp.tip=Aide contextuelle -mapstoragemanager.action.plugin=Plugins -mapstoragemanager.action.plugin.tip= -mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer -mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier -mapstoragemanager.action.pluginshow=Lister -mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible -mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences -mapstoragemanager.action.preferences.tip=Configurer l'application -mapstoragemanager.action.uk=Anglais -mapstoragemanager.action.uk.tip=Changer la langue en anglais -mapstoragemanager.action.visitSite=Visiter notre site -mapstoragemanager.action.visitSite.tip= -messageEntry=Bienvenue dans MapStorageManager -name\ base\ \:=Nom de la base -no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! -ok=Valider -password\ \:=Mot de passe -table.keys=Cl\u00E9s -table.values=Valeurs -welcome.MapStorageManager=Bienvenue dans MapStorageManager +Empty=Vide +Export\ Database= +Exporter\ \:= +Import\ Database= +Importer\ \:= +Map\ Storage\ Manager=Map Storage Manager +connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie +jaxxdemo.message.goto.site=Visitez le site +login\ \:=Identifiant +mapstoragemanager.action.aboutUs=A propos +mapstoragemanager.action.aboutUs.tip=A propos de Code Lutin +mapstoragemanager.action.connect=Connexion +mapstoragemanager.action.connect.tip=Etablir une nouvelle connexion +mapstoragemanager.action.disconnect=D\u00E9connexion +mapstoragemanager.action.disconnect.tip=D\u00E9connecte la session courante +mapstoragemanager.action.edit=Edition +mapstoragemanager.action.edit.tip= +mapstoragemanager.action.exit=Quitter +mapstoragemanager.action.exit.tip=Quitte l'application +mapstoragemanager.action.export=Exporter +mapstoragemanager.action.export.tip= +mapstoragemanager.action.file=Fichier +mapstoragemanager.action.file.tip= +mapstoragemanager.action.fr=Fran\u00E7ais +mapstoragemanager.action.fr.tip=Changer la langue en fran\u00E7ais +mapstoragemanager.action.help=Aide +mapstoragemanager.action.help.tip= +mapstoragemanager.action.import=Importer +mapstoragemanager.action.import.tip= +mapstoragemanager.action.language=Choisir la langue +mapstoragemanager.action.language.tip= +mapstoragemanager.action.menuHelp=Aide +mapstoragemanager.action.menuHelp.tip=Aide contextuelle +mapstoragemanager.action.plugin=Plugins +mapstoragemanager.action.plugin.tip= +mapstoragemanager.action.pluginload=R\u00E9cup\u00E9rer +mapstoragemanager.action.pluginload.tip=R\u00E9cup\u00E9ration des plugins \u00E0 partir d'un dossier +mapstoragemanager.action.pluginshow=Lister +mapstoragemanager.action.pluginshow.tip=Liste des plugins disponible +mapstoragemanager.action.preferences=Pr\u00E9f\u00E9rences +mapstoragemanager.action.preferences.tip=Configurer l'application +mapstoragemanager.action.uk=Anglais +mapstoragemanager.action.uk.tip=Changer la langue en anglais +mapstoragemanager.action.visitSite=Visiter notre site +mapstoragemanager.action.visitSite.tip= +messageEntry=Bienvenue dans MapStorageManager +name\ base\ \:=Nom de la base +no.help=Pas d'aide pour l'instant, d\u00E9sol\u00E9 \! +ok=Valider +password\ \:=Mot de passe +table.keys=Cl\u00E9s +table.values=Valeurs +welcome.MapStorageManager=Bienvenue dans MapStorageManager Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-10 03:51:00 UTC (rev 204) @@ -104,8 +104,7 @@ * @param serializer the xmlSerializer. */ private void describe(final BigTable bigTable, final XmlSerializer - serializer) throws IllegalArgumentException, IllegalStateException, - IOException { + serializer) throws IOException { serializer.startTag(NAMESPACE, "describe"); @@ -134,8 +133,7 @@ * @param serializer the xmlSerializer. */ private void insert(final BigTable bigTable, final XmlSerializer - serializer) throws IllegalArgumentException, IllegalStateException, - IOException { + serializer) throws IOException { String value; @@ -169,39 +167,6 @@ } /** - * toSreen(). - * show the XML content on System.out - */ - static void toSreen() { - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - output.output(document, System.out); - } catch (java.io.IOException e) { - LOG.error(e, e); - } - } - - /** - * Method to save the file. - * @param file the file in which we save the database. - */ - private static void save(final File file) { - long t1 = System.currentTimeMillis(); - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - FileOutputStream fos = new FileOutputStream(file); -// GZIPOutputStream gzos = new GZIPOutputStream(fos); -// output.output(document, gzos); - output.output(document, fos); - fos.close(); - long t2 = System.currentTimeMillis(); - LOG.info("temps d'enregistrement : " + (t2 - t1) + " ms."); - } catch (IOException ex) { - LOG.error(ex, ex); - } - } - - /** * {@inheritDoc} */ @Override Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-10 03:51:00 UTC (rev 204) @@ -30,7 +30,7 @@ /** * Parsing State. */ - private ParsingState state; +// private ParsingState state; /** * Current Table, needed when create the database to know in which table * we are to add a new column. @@ -90,13 +90,13 @@ do { if(eventType == XmlPullParser.START_DOCUMENT) { LOG.info("Start document"); - state = ParsingState.START; +// state = ParsingState.START; } else if(eventType == XmlPullParser.END_DOCUMENT) { LOG.info("End document"); } else if(eventType == XmlPullParser.START_TAG) { processStartElement(bigTable, xpp); -// } else if(eventType == XmlPullParser.END_TAG) { -// processEndElement(xpp); + } else if(eventType == XmlPullParser.END_TAG) { + processEndElement(xpp); // } else if(eventType == XmlPullParser.TEXT) { // processText(xpp); } @@ -124,9 +124,9 @@ if("describe".equals(elementName)) { /** Element Describe */ - state = ParsingState.START_DESCRIBE_DATABASE; +// state = ParsingState.START_DESCRIBE_DATABASE; } else if ("table".equals(elementName)) { /** Element Table */ - state = ParsingState.START_DESCRIBE_TABLE; +// state = ParsingState.START_DESCRIBE_TABLE; { final String tableName = attributes.get("tableName"); LOG.info("Create Table : " + tableName); @@ -134,16 +134,16 @@ currentTable = tableName; } } else if ("column".equals(elementName)) { /** Element Column */ - state = ParsingState.START_DESCRIBE_COLUMN; +// state = ParsingState.START_DESCRIBE_COLUMN; { final String columnName = attributes.get("columnName"); LOG.info("Create Column : " + currentTable + ":" + columnName); bigTable.createColumn(currentTable, columnName); } } else if ("insert".equals(elementName)) { /** Element Insert */ - state = ParsingState.START_INSERT_DATA; +// state = ParsingState.START_INSERT_DATA; } else if ("element".equals(elementName)) { /** Element Element */ - state = ParsingState.INSERT_DATA; +// state = ParsingState.INSERT_DATA; { // if(attributes.keySet().contains("version")) { // bigTable.put( @@ -167,8 +167,44 @@ } } } + + /** + * Process an end element. + * @param xpp XmlPullParser. + */ + private void processEndElement(XmlPullParser xpp) { + final String elementName = xpp.getName(); + + if("describe".equals(elementName)) { /** Element Describe */ +// state = ParsingState.END_DESCRIBE_DATABASE; + } else if ("table".equals(elementName)) { /** Element Table */ +// state = ParsingState.END_DESCRIBE_TABLE; + } else if ("column".equals(elementName)) { /** Element Column */ +// state = ParsingState.END_DESCRIBE_COLUMN; + } else if ("insert".equals(elementName)) { /** Element Insert */ +// state = ParsingState.END_INSERT_DATA; + } else if ("element".equals(elementName)) { /** Element Element */ +// state = ParsingState.INSERT_DATA; + } + } + /** + * Controle if actual state is one of <b>states</b>. + * @param states set of state + * @return true if actual state is in <b>states</b>. + */ +// private boolean isState(ParsingState ... states) { +// boolean isState = false; +// for (ParsingState state : states) { +// if (this.state.equals(state)) { +// isState = true; +// } +// } +// return isState; +// } + + /** * {@inheritDoc} */ public FileFilter getFileFilter() { Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-10 03:51:00 UTC (rev 204) @@ -9,7 +9,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; -import org.nuiton.mapstoragemanager.plugins.BigTable; +//import org.nuiton.mapstoragemanager.plugins.BigTable; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; 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-09 21:40:35 UTC (rev 203) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-10 03:51:00 UTC (rev 204) @@ -16,7 +16,7 @@ /** * Number for division byte -> Mb -> Gb. */ - public static int DIV = 1024; + private static final int DIV = 1024; /** * Constructor. @@ -40,16 +40,19 @@ long freeSpaceByte = f.getFreeSpace(); long totalSpaceByte = f.getTotalSpace(); long usableSpaceByte = f.getUsableSpace(); - double freeSpaceMb = freeSpaceByte/(DIV*DIV); - double totalSpaceMb = totalSpaceByte/(DIV*DIV); - double usableSpaceMb = usableSpaceByte/(DIV*DIV); - double freeSpaceGb = freeSpaceMb/DIV; - double totalSpaceGb = totalSpaceMb/DIV; - double usableSpaceGb = usableSpaceMb/DIV; + double freeSpaceMb = freeSpaceByte / (DIV * DIV); + double totalSpaceMb = totalSpaceByte / (DIV * DIV); + double usableSpaceMb = usableSpaceByte / (DIV * DIV); + double freeSpaceGb = freeSpaceMb / DIV; + double totalSpaceGb = totalSpaceMb / DIV; + double usableSpaceGb = usableSpaceMb / DIV; content.setLayout(new GridLayout(7,1)); - content.add(new JLabel("freeSpace : "+freeSpaceMb+" Mb ("+freeSpaceGb+" Gb)")); - content.add(new JLabel("totalSpace : "+totalSpaceMb+" Mb ("+totalSpaceGb+" Gb)")); - content.add(new JLabel("usableSpace : "+usableSpaceMb+" Mb ("+usableSpaceGb+" Gb)")); + content.add(new JLabel( + "freeSpace : " + freeSpaceMb + " Mb (" + freeSpaceGb + " Gb)")); + content.add(new JLabel( + "totalSpace : " + totalSpaceMb + " Mb (" + totalSpaceGb + " Gb)")); + content.add(new JLabel( + "usableSpace : " + usableSpaceMb + " Mb (" + usableSpaceGb + " Gb)")); content.add(new JLabel("")); } Runtime runtime = Runtime.getRuntime(); @@ -62,9 +65,12 @@ double freeMemoryGb = freeMemoryMb/DIV; double totalMemoryGb = totalMemoryMb/DIV; double maxMemoryGb = maxMemoryMb/DIV; - content.add(new JLabel("freeMemory : "+freeMemoryMb+" Mb ("+freeMemoryGb+" Gb)")); - content.add(new JLabel("totalMemory : "+totalMemoryMb+" Mb ("+totalMemoryGb+" Gb)")); - content.add(new JLabel("maxMemory : "+maxMemoryMb+" Mb ("+maxMemoryGb+" Gb)")); + content.add(new JLabel( + "freeMemory : " + freeMemoryMb + " Mb (" + freeMemoryGb + " Gb)")); + content.add(new JLabel( + "totalMemory : " + totalMemoryMb + " Mb (" + totalMemoryGb + " Gb)")); + content.add(new JLabel( + "maxMemory : " + maxMemoryMb + " Mb (" + maxMemoryGb + " Gb)")); this.setContentPane(content); this.pack(); Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/package-info.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/package-info.java 2010-03-09 21:40:35 UTC (rev 203) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/package-info.java 2010-03-10 03:51:00 UTC (rev 204) @@ -2,4 +2,4 @@ * Package org.pluginDiskSpace. * contains an ui plugin for mapstoragemanager. */ -package org.pluginDiskSpace; \ No newline at end of file +package org.nuiton.monitoring; \ No newline at end of file

1 0

r203 - in trunk/msm-hbase/src: main/java/org/nuiton/mapstoragemanager/plugins/hbase test/java/org/nuiton/mapstoragemanager/plugins/hbase
by dlanglais＠users.nuiton.org 09 Mar '10

09 Mar '10

Author: dlanglais Date: 2010-03-09 22:40:35 +0100 (Tue, 09 Mar 2010) New Revision: 203 Log: petites modifs mineures : - ajout r?\195?\169activation table apr?\195?\168s ajout/suppression colonne ; - d?\195?\169sactivation table avant suppression colonne.. Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-09 16:07:14 UTC (rev 202) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-09 21:40:35 UTC (rev 203) @@ -6,8 +6,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -141,6 +139,7 @@ hBaseAdmin.disableTable(table); hBaseAdmin.addColumn(table, hColumnDescriptor); LOG.trace("colum " + column + " created in table " + table + "."); + hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } @@ -152,8 +151,10 @@ // @Override public void deleteColumn(String table, String column) { try { + hBaseAdmin.disableTable(table); hBaseAdmin.deleteColumn(table, column); LOG.trace("colum " + column + " deleted from table " + table + "."); + hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } Modified: trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java =================================================================== --- trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-09 16:07:14 UTC (rev 202) +++ trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-09 21:40:35 UTC (rev 203) @@ -1,8 +1,6 @@ package org.nuiton.mapstoragemanager.plugins.hbase; import java.net.MalformedURLException; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -11,7 +9,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.mapstoragemanager.plugins.hbase.HBase; /** * An HBase test class. @@ -19,7 +16,10 @@ */ public class HBaseTest { - private static final Log log = LogFactory.getLog(HBaseTest.class); + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(HBaseTest.class); public HBaseTest() { } @@ -55,9 +55,9 @@ hb.createTable(tableName); hb.createColumn(tableName, columnName); hb.put(tableName, columnName, keyValue, contentValue); - log.trace(hb.get(tableName, columnName, keyValue)); + LOG.trace(hb.get(tableName, columnName, keyValue)); } catch (MasterNotRunningException ex) { - Logger.getLogger(HBase.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } }

1 0