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

r209 - trunk/src/site/doc/rapport
by afages＠users.nuiton.org March 10, 2010

March 10, 2010

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 March 10, 2010

March 10, 2010

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 March 10, 2010

March 10, 2010

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 March 10, 2010

March 10, 2010

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 March 10, 2010

March 10, 2010

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 March 10, 2010

March 10, 2010

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 March 9, 2010

March 9, 2010

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

r202 - in trunk/msm-hbase/src: main/java/org/nuiton/mapstoragemanager/plugins/hbase test/java/org/nuiton/mapstoragemanager/plugins/hbase
by gcrieloue＠users.nuiton.org March 9, 2010

March 9, 2010

Author: gcrieloue Date: 2010-03-09 17:07:14 +0100 (Tue, 09 Mar 2010) New Revision: 202 Log: Ajout d'une classe de tests pour hbase Added: 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 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 11:37:24 UTC (rev 201) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-09 16:07:14 UTC (rev 202) @@ -6,6 +6,8 @@ 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; @@ -14,6 +16,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -22,9 +25,9 @@ /** * A plugin for MSM using HBase API. - * @author Dorian Langlais + * @author Dorian Langlais, Crieloue Gilles */ -public class HBase implements BigTable { +public class HBase /*implements BigTable*/ { /** * Logger. @@ -68,7 +71,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public boolean connect(Properties properties) { throw new UnsupportedOperationException("Not supported yet."); } @@ -76,21 +79,26 @@ /** * {@inheritDoc} */ - @Override +// @Override public void createTable(String table) { HTableDescriptor hTableDescriptor = new HTableDescriptor(table); try { hBaseAdmin.createTable(hTableDescriptor); + LOG.trace("table " + table + " created."); + + } catch (TableExistsException e) { + LOG.trace("table " + table + " already created."); } catch (IOException ex) { LOG.error(ex, ex); - } + } + } /** * {@inheritDoc} */ - @Override +// @Override public void deleteTable(String table) { try { // to delete a table, we have to disable it. @@ -105,7 +113,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public Set<String> getTablesNames() { Set<String> tablesNames = new HashSet<String>(); try { @@ -115,7 +123,7 @@ for (int i = 0 ; i < hTablesDescriptor.length ; i++) { tablesNames.add(hTablesDescriptor[i].getNameAsString()); } - + } catch (IOException ex) { LOG.error(ex, ex); } @@ -125,10 +133,12 @@ /** * {@inheritDoc} */ - @Override +// @Override public void createColumn(String table, String column) { HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); + try { + hBaseAdmin.disableTable(table); hBaseAdmin.addColumn(table, hColumnDescriptor); LOG.trace("colum " + column + " created in table " + table + "."); } catch (IOException ex) { @@ -139,7 +149,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public void deleteColumn(String table, String column) { try { hBaseAdmin.deleteColumn(table, column); @@ -152,41 +162,41 @@ /** * {@inheritDoc} */ - @Override +// @Override public Set<String> getColumnsNames(String table) { Set<String> columnsNames = new HashSet<String>(); - try { - if (hBaseAdmin.tableExists(table)) { - HTableDescriptor hTableDescriptor; - hTableDescriptor = - hBaseAdmin.getTableDescriptor(table.getBytes()); - - HColumnDescriptor[] hColumnsDescriptor; - hColumnsDescriptor = hTableDescriptor.getColumnFamilies(); - - for (int i = 0 ; i < hColumnsDescriptor.length ; i++) { - columnsNames.add(hColumnsDescriptor[i].getNameAsString()); - } - - } else { - try { - throw new NoSuchTableException(table); - } catch (NoSuchTableException ex) { - LOG.error(ex, ex); - } - } - } catch (MasterNotRunningException ex) { - LOG.error(ex, ex); - } catch (IOException ex) { - LOG.error(ex, ex); - } +// try { +// if (hBaseAdmin.tableExists(table)) { +// HTableDescriptor hTableDescriptor; +// hTableDescriptor = +// hBaseAdmin.getTableDescriptor(table.getBytes()); +// +// HColumnDescriptor[] hColumnsDescriptor; +// hColumnsDescriptor = hTableDescriptor.getColumnFamilies(); +// +// for (int i = 0 ; i < hColumnsDescriptor.length ; i++) { +// columnsNames.add(hColumnsDescriptor[i].getNameAsString()); +// } +// +// } else { +// try { +// throw new NoSuchTableException(table); +// } catch (NoSuchTableException ex) { +// LOG.error(ex, ex); +// } +// } +// } catch (MasterNotRunningException ex) { +// LOG.error(ex, ex); +// } catch (IOException ex) { +// LOG.error(ex, ex); +// } return columnsNames; } /** * {@inheritDoc} */ - @Override +// @Override public void put(String table, String column, String key, String content) { try { Put put = new Put(key.getBytes()); @@ -207,7 +217,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public String get(String table, String column, String key) { String ret = ""; try { @@ -233,7 +243,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public String get(String table, String column, String key, int version) { String ret = ""; try { @@ -261,7 +271,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public Map<String, String> getRow(String table, String key) { Map<String, String> ret = new HashMap<String, String>(); try { @@ -275,7 +285,7 @@ this.selectTable(table); result = this.selectedTable.get(get); } - + String columnContent = result.getCellValue().toString(); ret.put(column, columnContent); @@ -292,11 +302,11 @@ /** * {@inheritDoc} */ - @Override +// @Override public Set<String> getKeys(String table) { Set<String> ret = new HashSet<String>(); try { - + synchronized (selectedTable) { this.selectTable(table); Set<byte[]> familiesKeys; @@ -306,7 +316,7 @@ ret.add(key.toString()); } } - + } catch (IOException ex) { LOG.error(ex, ex); } @@ -316,7 +326,7 @@ /** * {@inheritDoc} */ - @Override +// @Override public void selectTable(String table) { try { selectedTable = new HTable(config, table); @@ -328,8 +338,9 @@ /** * {@inheritDoc} */ - @Override +// @Override public String getPluginName() { return this.getClass().getSimpleName(); } + } Added: 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 (rev 0) +++ trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-09 16:07:14 UTC (rev 202) @@ -0,0 +1,65 @@ +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; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.mapstoragemanager.plugins.hbase.HBase; + +/** + * An HBase test class. + * @author Crieloue Gilles + */ +public class HBaseTest { + + private static final Log log = LogFactory.getLog(HBaseTest.class); + + public HBaseTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test + * @throws MalformedURLException + */ + @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) { + Logger.getLogger(HBase.class.getName()).log(Level.SEVERE, null, ex); + } + } + + +}

1 0

r201 - in trunk/msm-fromtoXPP3: . src/main/java/org/nuiton/mapstoragemanager/plugins/exporter src/test/java/org/nuiton/mapstoragemanager/plugins/exporter
by dlanglais＠users.nuiton.org March 9, 2010

March 9, 2010

Author: dlanglais Date: 2010-03-09 12:37:24 +0100 (Tue, 09 Mar 2010) New Revision: 201 Log: Export ?\195?\160 l'aide de XPP3 fait et test?\195?\169 Added: trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java Modified: trunk/msm-fromtoXPP3/ trunk/msm-fromtoXPP3/pom.xml trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java Property changes on: trunk/msm-fromtoXPP3 ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/msm-fromtoXPP3/pom.xml =================================================================== --- trunk/msm-fromtoXPP3/pom.xml 2010-03-09 10:53:28 UTC (rev 200) +++ trunk/msm-fromtoXPP3/pom.xml 2010-03-09 11:37:24 UTC (rev 201) @@ -83,7 +83,8 @@ <name>MSM-FromToXPP3</name> - <description>Plugin for MapStorageManager to work with actuals HBase</description> + <description>Plugin to import/export database content from/to xml files + using XPP3.</description> <inceptionYear>2010</inceptionYear> <developers> 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 10:53:28 UTC (rev 200) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-09 11:37:24 UTC (rev 201) @@ -1,15 +1,30 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ package org.nuiton.mapstoragemanager.plugins.exporter; -import org.nuiton.mapstoragemanager.plugins.importer.*; 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; -import org.nuiton.mapstoragemanager.plugins.Exporter; + +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; +import org.xmlpull.v1.XmlSerializer; + + /** - * A XML Parser - using pullparsing - to import database from xml files. + * A Class to export in xml files the content of Hbase database. * @author Dorian Langlais */ public class ToXMLXPP3 implements Exporter { @@ -18,46 +33,187 @@ * Logger. */ private static final Log LOG = LogFactory.getLog(ToXMLXPP3.class); - /** - * Parsing State. + * the jdom document. */ - private ParsingState state; + private static Document document; /** - * Current Table, needed when create the database to know in which table - * we are to add a new column. - */ - private String currentTable; - /** * the fileFilter. */ private static FileFilter fileFilter; /** + * NameSpace. + */ + private static final String NAMESPACE = ""; + + /** * Constructor. */ { fileFilter = new FileNameExtensionFilter("Fichiers XML", "xml"); } + /** + * {@inheritDoc} + */ + @Override + public final void exportTo(final BigTable bigTable, final File file) { + + XmlSerializer serializer = null; + /** + * Initialisation of the serializer. + */ + try { + XmlPullParserFactory factory = + XmlPullParserFactory.newInstance( + System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); + serializer = factory.newSerializer(); + } catch (XmlPullParserException ex) { + LOG.fatal(ex, ex); + } + + try { + + serializer.setOutput(new FileWriter(file)); + + serializer.startTag(NAMESPACE, "database"); + + { + this.describe(bigTable, serializer); + + this.insert(bigTable, serializer); + } + + serializer.endTag(NAMESPACE, "database"); + + serializer.endDocument(); + + } catch (IOException ex) { + LOG.fatal(ex, ex); + } catch (IllegalArgumentException ex) { + LOG.fatal(ex, ex); + } catch (IllegalStateException ex) { + LOG.fatal(ex, ex); + } + } + /** - * {@inheritDoc} + * Write the description of the database. + * @param bigTable the bigTable. + * @param serializer the xmlSerializer. */ - public void exportTo(BigTable bigTable, File file) { - throw new UnsupportedOperationException("Not supported yet."); + private void describe(final BigTable bigTable, final XmlSerializer + serializer) throws IllegalArgumentException, IllegalStateException, + IOException { + + serializer.startTag(NAMESPACE, "describe"); + + /** for each Table */ + for (String tableName : bigTable.getTablesNames()) { + + serializer.startTag(NAMESPACE, "table"); + serializer.attribute(NAMESPACE, "tableName", tableName); + + /** for each Column */ + for (String columnName : bigTable.getColumnsNames(tableName)) { + serializer.startTag(NAMESPACE, "column") + .attribute(null, "columnName", columnName) + .endTag(NAMESPACE, "column"); + + } + + serializer.endTag(NAMESPACE, "table"); + } + serializer.endTag(NAMESPACE, "describe"); } /** - * {@inheritDoc} + * Write the elements of the database. + * @param bigTable the bigTable. + * @param serializer the xmlSerializer. */ - public FileFilter getFileFilter() { - return fileFilter; + private void insert(final BigTable bigTable, final XmlSerializer + serializer) throws IllegalArgumentException, IllegalStateException, + IOException { + + String value; + + serializer.startTag(NAMESPACE, "insert"); + + /** for each Table */ + for (String tableName : bigTable.getTablesNames()) { + + /** for each Column */ + for (String columnName : bigTable.getColumnsNames(tableName)) { + + /** for each Key */ + for (String key : bigTable.getKeys(tableName)) { + value = bigTable.get(tableName, columnName, key); + + /** if not "void" */ + if (value != null && !"".equals(value)) { + + serializer.startTag(NAMESPACE, "element") + .attribute(NAMESPACE, "table", tableName) + .attribute(NAMESPACE, "column", columnName) + .attribute(NAMESPACE, "key", key) + .attribute(NAMESPACE, "value", value) + .endTag(NAMESPACE, "element"); + } + } + + } + } + serializer.endTag(NAMESPACE, "insert"); } /** + * 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} */ - public String getPluginName() { + @Override + public final String getPluginName() { return this.getClass().getSimpleName(); } + + /** + * {@inheritDoc} + */ + @Override + public final FileFilter getFileFilter() { + return fileFilter; + } } Added: 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 (rev 0) +++ trunk/msm-fromtoXPP3/src/test/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3Test.java 2010-03-09 11:37:24 UTC (rev 201) @@ -0,0 +1,227 @@ +/* + * 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 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.bighashmapv2.BigHashMapV2; +import org.nuiton.mapstoragemanager.plugins.getFile; +import org.nuiton.mapstoragemanager.plugins.importer.FromXMLXPP3; + +/** + * + * @author E054030D + */ +public class ToXMLXPP3Test extends TestCase { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(ToXMLXPP3Test.class); + + /** + * BigTable actual. + */ + BigTable actual; + /** + * BigTable expected. + */ + BigTable expected; + + + /** + * Test to export a bigTable database with empty Tables. + */ + public void testEmptyTables() { + + Exporter exporter = new ToXMLXPP3(); + + expected = new BigHashMapV2(); + actual = new BigHashMapV2(); + { + expected.createTable("table1"); + expected.createTable("table2"); + } + + File exportTest = + getFile.getTestFile("/src/test/resources/exportTest.xml"); + + exporter.exportTo(expected,exportTest); + + Importer importer = new FromXMLXPP3(); + importer.importFrom(actual, exportTest); + + /** + * Same tables. + */ + assertEquals(expected.getTablesNames(), + actual.getTablesNames()); + + exportTest.delete(); + } + + /** + * Test to export a bigTable database with empty columns. + */ + public void testEmptyColumns() { + + Exporter exporter = new ToXMLXPP3(); + + expected = new BigHashMapV2(); + actual = new BigHashMapV2(); + { + expected.createTable("table1"); + expected.createTable("table2"); + + expected.createColumn("table1", "column1"); + expected.createColumn("table1", "column2"); + expected.createColumn("table2", "column3"); + expected.createColumn("table2", "column4"); + expected.createColumn("table2", "column5"); + } + + File exportTest = + getFile.getTestFile("/src/test/resources/exportTest.xml"); + + exporter.exportTo(expected,exportTest); + + Importer importer = new FromXMLXPP3(); + importer.importFrom(actual, exportTest); + + /** + * Same tables. + */ + assertEquals(expected.getTablesNames(), + actual.getTablesNames()); + /** + * Same columns. + */ + for(String tableName : expected.getTablesNames()) { + assertEquals(expected.getColumnsNames(tableName), + actual.getColumnsNames(tableName)); + } + + exportTest.delete(); + } + + /** + * Test to export a bigTable database with empty columns. + */ + public void testWithElements() { + + Exporter exporter = new ToXMLXPP3(); + + expected = new BigHashMapV2(); + actual = new BigHashMapV2(); + { + expected.createTable("table1"); + expected.createTable("table2"); + + expected.createColumn("table1", "column1"); + expected.createColumn("table1", "column2"); + expected.createColumn("table2", "column3"); + expected.createColumn("table2", "column4"); + expected.createColumn("table2", "column5"); + + expected.put("table1", "column1", "1", "content1"); + expected.put("table1", "column1", "2", "content2"); + expected.put("table1", "column2", "3", "content3"); + expected.put("table1", "column2", "4", "content4"); + expected.put("table2", "column3", "5", "content5"); + expected.put("table2", "column3", "6", "content6"); + expected.put("table2", "column4", "7", "content7"); + expected.put("table2", "column4", "8", "content8"); + expected.put("table2", "column5", "9", "content9"); + expected.put("table2", "column5", "10", "content10"); + } + + File exportTest = + getFile.getTestFile("/src/test/resources/exportTest.xml"); + + exporter.exportTo(expected,exportTest); + + Importer importer = new FromXMLXPP3(); + importer.importFrom(actual, exportTest); + + /** + * Same tables. + */ + assertEquals(expected.getTablesNames(), + actual.getTablesNames()); + /** + * Same columns. + */ + for(String tableName : expected.getTablesNames()) { + assertEquals(expected.getColumnsNames(tableName), + actual.getColumnsNames(tableName)); + } + /** + * Same elements. + */ + String contentExpected, contentActual; + + for(String tableName : expected.getTablesNames()) { + + LOG.info("table : " + tableName); + for(String columnName : expected.getColumnsNames(tableName)) { + + LOG.info("column : " + columnName); + for(String key : expected.getKeys(tableName)) { + + LOG.info("key : " + key); + contentExpected = expected.get(tableName, columnName, key); + contentActual = actual.get(tableName, columnName, key); + + LOG.info("expected : " + contentExpected); + LOG.info("actual : " + contentActual); + if(contentActual!=null && !"".equals(contentActual)) { + assertEquals(contentExpected, contentActual); + } + } + } + } + + exportTest.delete(); + } + + public static void main(String[] args) { + + Exporter exporter = new ToXMLXPP3(); + + BigTable bigTable = new BigHashMapV2(); + { + bigTable.createTable("table1"); + bigTable.createTable("table2"); + bigTable.createColumn("table1", "column1"); + bigTable.createColumn("table1", "column2"); + bigTable.createColumn("table2", "column3"); + bigTable.createColumn("table2", "column4"); + bigTable.createColumn("table2", "column5"); + + bigTable.put("table1", "column1", "1", "content1"); + bigTable.put("table1", "column1", "2", "content2"); + bigTable.put("table1", "column2", "3", "content3"); + bigTable.put("table1", "column2", "4", "content4"); + + bigTable.put("table2", "column3", "5", "content5"); + bigTable.put("table2", "column3", "6", "content6"); + bigTable.put("table2", "column4", "7", "content7"); + bigTable.put("table2", "column4", "8", "content8"); + bigTable.put("table2", "column5", "9", "content9"); + bigTable.put("table2", "column5", "10", "content10"); + } + + File exportTest = + getFile.getTestFile("/src/test/resources/exportTest.xml"); + exporter.exportTo(bigTable,exportTest); + exportTest.delete(); + } +}

1 0

r200 - trunk/src/site/doc/rapport
by afages＠users.nuiton.org March 9, 2010

March 9, 2010

Author: afages Date: 2010-03-09 11:53:28 +0100 (Tue, 09 Mar 2010) New Revision: 200 Log: Modif 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-09 10:28:16 UTC (rev 199) +++ trunk/src/site/doc/rapport/rapport.rst 2010-03-09 10:53:28 UTC (rev 200) @@ -10,7 +10,10 @@ :Version: 1.0 of 9/03/10 :Dedication: To Code Lutin & Université de Nantes +------------------------------------------------------ + Spécification préliminaire ========================== - +Demandeur +---------

1 0