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

r25 - in trunk/src: main/java/org/nuiton/mapstoragemanager/core test test/java test/java/org test/java/org/nuiton test/java/org/nuiton/mapstoragemanager test/java/org/nuiton/mapstoragemanager/core test/java/org/nuiton/mapstoragemanager/plugins test/java/org/nuiton/mapstoragemanager/plugins/bighashmap
by dlanglais＠users.nuiton.org Jan. 27, 2010

Jan. 27, 2010

Author: dlanglais Date: 2010-01-27 22:59:17 +0100 (Wed, 27 Jan 2010) New Revision: 25 Added: trunk/src/test/java/ trunk/src/test/java/org/ trunk/src/test/java/org/nuiton/ trunk/src/test/java/org/nuiton/mapstoragemanager/ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: Ajout de classe de test, Correction checkstyle sur BigTableLoader et TestServiceLoader (je tente de passer les classes de test en classe de test JUnit). Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-27 12:20:57 UTC (rev 24) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-27 21:59:17 UTC (rev 25) @@ -9,30 +9,29 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; /** - * * @author Crieloue Gilles * */ -public class BigTableLoader extends URLClassLoader{ +public class BigTableLoader extends URLClassLoader { - /** - * The BigTable Set Loader. - */ - private ServiceLoader<BigTable> bigTableSetLoader; + /** + * The BigTable Set Loader. + */ + private ServiceLoader < BigTable > bigTableSetLoader; - /** - * Class constructor. - * @param pluginsFolderPath the plugins folder path - * @param classLoader the parent classloader - * @throws MalformedURLException if the plugin folder is not found - */ - public BigTableLoader(final String pluginsFolderPath, - final ClassLoader classLoader) throws MalformedURLException { + /** + * Class constructor. + * @param pluginsFolderPath the plugins folder path + * @param classLoader the parent classloader + * @throws MalformedURLException if the plugin folder is not found + */ + public BigTableLoader(final String pluginsFolderPath, + final ClassLoader classLoader) throws MalformedURLException { - super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, - classLoader); + super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, + classLoader); - for (File file : new File(pluginsFolderPath).listFiles()) { + for (File file : new File(pluginsFolderPath).listFiles()) { if (file.getAbsolutePath().endsWith(".jar")) { try { this.addURL(file.toURI().toURL()); @@ -43,32 +42,30 @@ } bigTableSetLoader = ServiceLoader.load(BigTable.class, this); - } + } - /** - * Returns a string displaying all the available BigTable implementations. - * @return a string displaying all the available BigTable implementations - */ + /** + * Returns a string displaying all the available BigTable implementations. + * @return a string displaying all the available BigTable implementations + */ public final String getBigTable() { - String s = "Available Plugins :\n"; + String s = "Available Plugins :\n"; - s += "\t* "; - if (!bigTableSetLoader.iterator().hasNext()) { - s += "No plugin."; - } - else { - for (BigTable bt : bigTableSetLoader) { - s += bt.getClass().getName(); - bt.put("key", "value"); - if (bt.get("key").equals("value")) { - s += " (working)" + "\n"; - } - else { - s += " (not working)" + "\n"; - } - } - } + s += "\t* "; + if (!bigTableSetLoader.iterator().hasNext()) { + s += "No plugin."; + } else { + for (BigTable bt : bigTableSetLoader) { + s += bt.getClass().getName(); + bt.put("key", "value"); + if (bt.get("key").equals("value")) { + s += " (working)" + "\n"; + } else { + s += " (not working)" + "\n"; + } + } + } return s; } @@ -76,8 +73,8 @@ * Returns the BigTable Set Loader. * @return the BigTable Set Loader */ - public final ServiceLoader<BigTable> getBigTableSetLoader() { - return bigTableSetLoader; - } + public final ServiceLoader < BigTable > getBigTableSetLoader() { + return bigTableSetLoader; + } } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-27 12:20:57 UTC (rev 24) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-27 21:59:17 UTC (rev 25) @@ -3,18 +3,21 @@ import java.net.MalformedURLException; public class TestServiceLoader { - public TestServiceLoader(){ - try { - BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); - System.out.println(p.getBigTable()); - } catch (MalformedURLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public static void main(String[] args) { - - TestServiceLoader t = new TestServiceLoader(); - } -} + + public TestServiceLoader() { + try { + BigTableLoader p = + new BigTableLoader("plugins", + this.getClass().getClassLoader()); + System.out.println(p.getBigTable()); + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public static void main(final String[] args) { + + TestServiceLoader t = new TestServiceLoader(); + } +} \ No newline at end of file Added: trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/core/ServiceLoaderTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,15 @@ +package org.nuiton.mapstoragemanager.core; + +import junit.framework.TestCase; + +/** + * Classe to test the Core class. + * @author Dorian Langlais + * + */ +public class ServiceLoaderTest extends TestCase { + + public void testCore(){ + + } +} Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,85 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import org.nuiton.mapstoragemanager.plugins.bighashmap.Cell; +import java.util.NoSuchElementException; + +import junit.framework.Assert; +import junit.framework.TestCase; + +/** + * Classe de test pour la classe Cell. + * Teste les fonctions de base d'une cellule, put et get. + * @author Dorian Langlais + * + */ +public final class CellTest extends TestCase { + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + Cell < Object > cell = new CellImpl < Object > (); + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + } + + /** + * Test de la fonction put sur une cellule. + * On ajoute un objet obj1, on tente de le récupérer. + */ + public void testPut() { + + Cell < Object > cell = new CellImpl < Object > (); + + Object obj1 = new Object(); + + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + cell.put(obj1); + + assertEquals(cell.get(), obj1); + } + + /** + * Test de la fonction put sur une cellule. + * On ajoute un objet obj1, on tente de le récupérer. + * On ajoute un objet obj2, on tente de le récupérer. + * On ajoute un objet obj3, on tente de le récupérer. + */ + public void testPutReput() { + + Cell < Object > cell = new CellImpl < Object > (); + + Object obj1 = new Object(); + + try { + assertNull(cell.get()); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + cell.put(obj1); + + assertEquals(cell.get(), obj1); + + Object obj2 = new Object(); + + cell.put(obj2); + + assertEquals(cell.get(), obj2); + + Object obj3 = new Object(); + + cell.put(obj3); + + assertEquals(cell.get(), obj3); + } +} Added: trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java =================================================================== --- trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnTest.java 2010-01-27 21:59:17 UTC (rev 25) @@ -0,0 +1,44 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.NoSuchElementException; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public final class ColumnTest extends TestCase { + + /** + * On teste le comportement de get avec une cellule vide. + */ + public void testGetVoid() { + Column < Object > col = new ColumnImpl < Object > (); + try { + col.get("test"); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + } + + /** + * On ajoute un objet avec une clé. + * On tente de récupérer celui-ci. + */ + public void testPut() { + Column < Object > col = new ColumnImpl < Object > (); + + Object obj1 = new Object(); + + try { + col.get("object 1"); + Assert.fail(); + } catch (NoSuchElementException e) { + System.out.println("Exception levée correctement"); + } + + col.put("object 1", obj1); + + assertEquals(col.get("object 1"), obj1); + + } +}

1 0

r24 - in trunk/src/main/java/org/nuiton/mapstoragemanager/plugins: . bighashmap
by dlanglais＠users.nuiton.org Jan. 27, 2010

Jan. 27, 2010

Author: dlanglais Date: 2010-01-27 13:20:57 +0100 (Wed, 27 Jan 2010) New Revision: 24 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java Log: Alors, je commit ce que j'avais commenc?\195?\169 sur une impl?\195?\169mentation de la spec bigtable ?\195?\160 l'aide de hashmap... Bon, je ne sais pas si ?\195?\167a vient de mon netbeans ou pas... Mais il semblerait qu'il y ait un probl?\195?\168me avec le package plugins... Comme s'il n'?\195?\169tait pas vu comme un package... Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-01-27 12:20:57 UTC (rev 24) @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.Set; -import org.nuiton.mapstoragemanager.plugins.BigTable; - public class OurHashMap implements BigTable{ HashMap<String,String> map = new HashMap<String, String>(); Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Cell.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,21 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les opérations nécéssaires sur une cellule. + * @author Dorian Langlais + * + * @param <T> type d'objet contenu dans les cellules. + */ +public interface Cell < T > { + + /** + * Récupère le contenu le plus récent de la cellule. + * @return retourne l'objet le plus récent stocké dans la cellule. + */ + T get(); + /** + * Ajout de contenu dans la cellule. + * @param t objet de type < T > à stocker dans la cellule. + */ + void put(T t); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/CellImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,71 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Classe Cell. + * Une cellule (selon la spec bigtable de google) est une Map entre un + * timestamp et un contenu. + * @param <T> Une cellule est paramétrée selon son type de contenu. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class CellImpl < T /**extends Serializable*/ > implements Cell < T > { + + /** + * Cellule. + * hashMap ayant pour clé le timestamp et pour valeur un objet de type T. + */ + private Map < Long, T > cell; + + /** + * Constructeur par défaut. + */ + public CellImpl() { + this.cell = new HashMap < Long, T > (); + } + + /** + * Constructeur avec un objet. + * @param t objet à mettre dans la cellule à construire. + */ + public CellImpl(T t) { + this.cell = new HashMap < Long, T > (); + this.put(t); + } + + /** + * {@inheritDoc} + */ + public final void put(final T t) { + cell.put(System.currentTimeMillis(), t); + } + + /** + * get(Long timestamp). + * fonction d'accès au contenu d'une cellule en fonction de son timestamp. + * @param timestamp Timestamps d'une cellule. + * @return retourne le contenu de la cellule. + */ + public final T get(final Long timestamp) { + return cell.get(timestamp); + } + + /** + * {@inheritDoc} + */ + public final T get() { + if (cell.size() == 0) { + throw new NoSuchElementException(); + } + Long max = cell.keySet().iterator().next(); + for (Long current : cell.keySet()) { + if (max > current) { + max = current; + } + } + return cell.get(max); + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Column.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,23 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface représentant les méthodes nécéssaires sur une colonne. + * @author Dorian Langlais + * + * @param <T> type d'objet contenu dans la colonne. + */ +public interface Column < T > { + + /** + * Récupère le contenu de la cellule ayant pour clé key. + * @param key clé de la ligne. + * @return objet stocké dans la celulle ayant pour clé key. + */ + T get(String key); + /** + * Ajoute l'objet t à la ligne de clé key. + * @param key clé de la ligne. + * @param t objet à stocker. + */ + void put(String key, T t); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/ColumnImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,61 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.NoSuchElementException; + +/** + * Classe Column. + * @param <T> Type de contenu des cellules. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class ColumnImpl < T /**extends Serializable*/ > implements Column < T > { + + /** + * Colonne. + * hashMap ayant pour clé la "clé" de la "ligne" de la table et pour + * valeur le contenu de la cellule. + */ + private Map < String, CellImpl < T > > column; + + /** + * Constructeur par défaut. + */ + public ColumnImpl() { + column = new HashMap < String, CellImpl < T > > (); + } + + + /** + * get(Long timestamp). + * fonction d'accès au contenu d'une cellule en fonction de son timestamp. + * @param key clé de la ligne. + * @param timestamp désiré. + * @return retourne le contenu de la cellule. + */ + public final T get(final String key, final Long timestamp) { + return this.column.get(key).get(timestamp); + } + + /** + * {@inheritDoc} + */ + public final T get(final String key) { + if (this.column.get(key) == null) { + throw new NoSuchElementException(); + } + return this.column.get(key).get(); + } + + /** + * {@inheritDoc} + */ + public final void put(final String key, final T content) { + try { + this.column.get(key).put(content); + } catch (NullPointerException e) { + this.column.put(key, new CellImpl < T > (content)); + } + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/DataBase.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,10 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les méthodes nécéssaires sur une base de données. + * @author Dorian Langlais + * + */ +public interface DataBase { + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Row.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,15 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface lisant les méthodes nécéssaires sur une ligne. + * @author Dorian Langlais + * + */ +public interface Row { + + /** + * Méthode permettant un affichage du contenu de la ligne. + * @return contenu de la ligne sous forme textuel. + */ + String toString(); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/RowImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,45 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Classe Row. + * Représente une ligne d'une table. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class RowImpl implements Row { + + /** + * Structure de la ligne. + */ + private StructureImpl rowStructure; + /** + * Contenu de la ligne. + */ + private Map < String, Object > rowContent; + + /** + * Constructeur de Row. + * @param struct structure de la ligne. + * @param content contenu de la ligne. + */ + public RowImpl(final StructureImpl struct, + final Map < String, Object > content) { + this.rowStructure = struct; + this.rowContent = new HashMap < String, Object > (); + for (String columnName : struct.getColumnsNames()) { + rowContent.put(columnName, content.get(columnName)); + } + } + + /** + * {@inheritDoc} + */ + public final String toString() { + String ret; + ret = rowContent.values().toString(); + return ret; + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Structure.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,35 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.Set; + +/** + * Interface listant les méthodes nécéssaires sur une structure. + * Une Structure est une description d'une Table. + * @author Dorian Langlais + * + */ +public interface Structure { + + /** + * Méthode permettant l'ajout d'une colonne à une structure de table. + * @param columnName nom de la colonne. + * @param columnClass type d'objet contenu dans la colonne. + */ + void addColumn(String columnName, Class < ? > columnClass); + /** + * Méthode permettant de récupérer le nom des colonnes. + * @return retourne le nom de colonnes. + */ + Set < String > getColumnsNames(); + /** + * Méthode permettant de récupérer le type d'objet d'une colonne. + * @param columnName nom de la colonne. + * @return retourne le type d'objet de la colonne columnName. + */ + Class < ? > getColumnClass(String columnName); + /** + * Méthode permettant la suppression d'une colonne à la structure. + * @param columnName nom de la colonne à supprimer. + */ + void removeColumn(String columnName); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/StructureImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,59 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Classe Structure. + * Représente le mapping d'une ligne, les types des colonnes + * @author Dorian Langlais + * + */ +public class StructureImpl implements Structure { + + /** + * Structure de la table. + * Contient le nom de la colonne comme clé, + * et le type de la colonne pour valeur. + */ + private Map < String, Class < ? /**extends Serializable*/ > > struct; + + /** + * Constructeur par défaut. + */ + public StructureImpl() { + this.struct = + new HashMap < String, Class < ? /**extends Serializable*/ > > (); + } + + /** + * {@inheritDoc} + */ + public final void addColumn(final String columnName, + final Class < ? /**extends Serializable*/ > columnClass) { + this.struct.put(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void removeColumn(final String columnName) { + this.struct.remove(columnName); + } + + /** + * {@inheritDoc} + */ + public final Class < ? /**extends Serializable*/ > getColumnClass( + final String columnName) { + return this.struct.get(columnName); + } + + /** + * {@inheritDoc} + */ + public final Set < String > getColumnsNames() { + return this.struct.keySet(); + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/Table.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,37 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +/** + * Interface listant les opérations nécéssaires sur une table. + * @author Dorian Langlais + */ +public interface Table { + + /** + * Méthode permettant l'ajout d'une colonne à la table. + * @param columnName nom de la colonne à ajouter. + * @param columnClass type des objets contenu dans la colonne. + * @param <columnClass> méthode générique paramétrer par le type + * columnClass. + */ + < columnClass > void addColumn(final String columnName, + final Class < ? > columnClass); + + /** + * Méthode de suppression de colonne. + * @param columnName nom de la colonne à suprimer. + */ + void removeColumn(final String columnName); + + /** + * Méthode permettant de récupérer le contenu d'une ligne par sa clé. + * @param key clé de la ligne à récupérer. + * @return retourne la ligne ayant pour clé key. + */ + Row getRow(final String key); + + /** + * Méthode permettant la suppression d'une ligne par sa clé. + * @param key clé de la ligne à supprimer. + */ + void removeRow(final String key); +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/TableImpl.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,69 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; + +import java.util.HashMap; +import java.util.Map; + +/** + * Classe Table. + * Représente une table bigtable. + * @author dorian Langlais, amaury Fages, gilles Crieloue, florent Gilet. + * @licence GPL. + */ +public class TableImpl implements Table { + + /** + * Table. + * hashMap ayant pour clé le nom des colonnes et pour valeur une colonne. + */ + private Map < String, ColumnImpl < ? > > tableContent; + /** + * Structure de la Table. + */ + private StructureImpl tableStructure; + + /** + * Constructeur par défaut. + */ + public TableImpl() { + this.tableContent = new HashMap < String, ColumnImpl < ? > > (); + this.tableStructure = new StructureImpl(); + } + + /** + * {@inheritDoc} + */ + public final < columnClass /**extends Serializable*/ > void addColumn( + final String columnName, final Class < ? > columnClass) { + ColumnImpl < columnClass > column = new ColumnImpl < columnClass > (); + this.tableContent.put(columnName, column); + this.tableStructure.addColumn(columnName, columnClass); + } + + /** + * {@inheritDoc} + */ + public final void removeColumn(final String columnName) { + this.tableContent.remove(columnName); + this.tableStructure.removeColumn(columnName); + } + + /** + * {@inheritDoc} + */ + public final Row getRow(final String key) { + Map < String, Object > rowContent = + new HashMap < String, Object > (); + for (String columnName : tableStructure.getColumnsNames()) { + rowContent.put(columnName, + tableContent.get(columnName).get(key)); + } + return new RowImpl(tableStructure, rowContent); + } + + /** + * {@inheritDoc} + */ + public void removeRow(final String key) { + // TODO Auto-generated method stub + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/package-info.java 2010-01-27 12:20:57 UTC (rev 24) @@ -0,0 +1,6 @@ +package org.nuiton.mapstoragemanager.plugins.bighashmap; +/** + * package BigHashMap. + * permet la représentation sous forme de hashMap d'une base de données selon + * la spécification bigTable. + */ \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-27 12:20:57 UTC (rev 24) @@ -1,3 +1,4 @@ +package org.nuiton.mapstoragemanager.plugins; import java.util.Map; import java.util.Set; @@ -2,7 +3,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - /** Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-01-26 22:45:17 UTC (rev 23) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-01-27 12:20:57 UTC (rev 24) @@ -1,5 +1,5 @@ +package org.nuiton.mapstoragemanager.plugins; /** * The plugins interfaces. */ -package org.nuiton.mapstoragemanager.plugins;

1 0

r23 - trunk/src/main/java/org/nuiton/mapstoragemanager/ui
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 23:45:17 +0100 (Tue, 26 Jan 2010) New Revision: 23 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: Correction du commentaire. Les commentaires dans les blocs <![CDATA[ ]]> ne peuvent pas sous forme <xml /> -> boom au build ! Ils ne peuvent pas non plus ?\195?\170tre en mode javadoc -> boom au build ! Donc, par convention, je pense que l'on devrait coller les commentaires avant les balises de code java... Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:04:20 UTC (rev 22) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:45:17 UTC (rev 23) @@ -5,22 +5,22 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> -<script><![CDATA[ +  + <script> + <![CDATA[ + import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -  - import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; - import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; - - ApplicationEngine engine = new ApplicationEngine(); - ApplicationConstants constants = new ApplicationConstants(); + ApplicationEngine engine = new ApplicationEngine(); + ApplicationConstants constants = new ApplicationConstants(); ]]> -</script> + </script> - -<style source='MainUI.css'/> +  + <style source='MainUI.css'/> + +  - - <JMenuBar> <JMenu text="File"> <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/>

1 0

r22 - / trunk/src/main/java/org/nuiton/mapstoragemanager/ui
by fgilet＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: fgilet Date: 2010-01-26 23:04:20 +0100 (Tue, 26 Jan 2010) New Revision: 22 Added: .project Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: leger changement de commentaire jaxx Added: .project =================================================================== --- .project (rev 0) +++ .project 2010-01-26 22:04:20 UTC (rev 22) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>mapstoragemanager</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 21:21:45 UTC (rev 21) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 22:04:20 UTC (rev 22) @@ -5,18 +5,19 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> - <script><![CDATA[ -import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; -import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; -ApplicationEngine engine = new ApplicationEngine(); -ApplicationConstants constants = new ApplicationConstants(); -]]> - </script> +<script><![CDATA[ - -<style source='MainUI.css'/> +  + import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; + import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; + + ApplicationEngine engine = new ApplicationEngine(); + ApplicationConstants constants = new ApplicationConstants(); + ]]> +</script> - + +<style source='MainUI.css'/>  @@ -37,11 +38,6 @@ <java.awt.BorderLayout id='BorderLayout'/> <JPanel layout='{BorderLayout}'> <JToolBar constraints='BorderLayout.NORTH' opaque='true'> - -  - -  - <JLabel text='name base :' styleClass='boldUnderline' /> <JAXXComboBox> <item value='{null}' label='Select a base name' /> @@ -68,17 +64,11 @@ </JPanel> </JScrollPane> <JScrollPane> - -  - -  - <VBox horizontalAlignment='center'> <JPanel> </JPanel> <JLabel text="TABLE NAME : TODO"/> </VBox> - </JScrollPane> </JSplitPane> </JPanel>

2 1

r21 - trunk
by tchemit＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: tchemit Date: 2010-01-26 22:21:45 +0100 (Tue, 26 Jan 2010) New Revision: 21 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redline 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:16:50 UTC (rev 20) +++ trunk/pom.xml 2010-01-26 21:21:45 UTC (rev 21) @@ -19,7 +19,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> </parent> <version>0.1-SNAPSHOT</version>

1 0

r20 - trunk/src/main/java/org/nuiton/mapstoragemanager/plugins
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 22:16:50 +0100 (Tue, 26 Jan 2010) New Revision: 20 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java Log: Cr?\195?\169ation d'une "vraie" interface BigTable. L'actuelle interface BigTable.java servant ?\195?\160 tester des plugins simples... -> In a future not very far away, nvBigTable will be "BigTable", and our current BigTable won't survive... ^^ Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/nvBigTable.java 2010-01-26 21:16:50 UTC (rev 20) @@ -0,0 +1,137 @@ + +import java.util.Map; +import java.util.Set; + +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/** + * The interface for all the BigTable implementations. + * @author Dorian Langlais + */ +public interface nvBigTable { + + /** + * Connects to the database. + * @param host the server + * @param port the port + * @param base the base name + * @param username the user login + * @param passwd the user password + * @return return true if connexion is established, else return false. + */ + boolean connect( + String host, int port, String base, String username,String passwd); + + /****************** + * Tables * + ******************/ + + /** + * Selects the table. + * @param table the table to select + */ + void selectTable(String table); + + /** + * Create a new table in the base. + * @param table the name of the new table + */ + void createTable(String table); + + /** + * Delete a table in the base. + * @param table the table of the table to delete + */ + void deleteTable(String table); + + /** + * Get the tables' name which are in the base. + * @return Return a set containing the tables' name + */ + Set<String> getTablesNames(); + + + /******************* + * Columns * + *******************/ + + /** + * Create a new column in a table. + * Add a column <b>column</b> in the table <b>table</b> + * @param table the table name + * @param column the column name + */ + void createColumn(String table, String column); + + /** + * Delete a column in a table. + * Delete the column <b>column</b> in the table <b>table</b> + * @param table the table name + * @param column the column name + */ + void deleteColumn(String table, String column); + + /** + * Get the columns' name. + * @return Return a set containing the columns' name. + */ + Set<String> getColumnsNames(); + + /*************** + * Cell * + ***************/ + + /** + * Put a new content in the table. + * Put a new <b>content</b> in the column <b>column</b> of the table + * <b>table</b> with the key <b>key</b>. + * @param table the table name + * @param column the column name + * @param key the key + * @param content the content to add + */ + void put(String table, String column, String key, String content); + + /** + * Get a content in the table. + * Get a content in the table <b>table</b> from the column <b>column</b> + * where the key is <b>key</b>. + * -> get the last value (with the greater timestamp). + * @param table the table name. + * @param column the column name. + * @param key the key + * @return the content + */ + String get(String table, String column, String key); + + /** + * Get a content in the table. + * Get a content in the table <b>table</b> from the column <b>column</b> + * where the key is <b>key</b>. + * -> get the content with the version <b>version</b>. + * @param table the table name. + * @param column the column name. + * @param key the key + * @param version + * @return the content + */ + String get(String table, String column, String key, int version); + + /** + * Get the row identified by the key <b>key<b> from the table <b>table</b> + * @param table the table name + * @param key the key + * @return a Map with key is column's name and value is content's value. + */ + Map<String, String> getRow(String table, String key); + + /** + * Get the keys from a table. + * @param table the table + * @return return a Set containing the keys a the table <b>table</b>. + */ + Set<String> getKeys(String table); +}

1 0

r19 - in trunk: . src/main/java/org/nuiton/mapstoragemanager/plugins
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 20:47:36 +0100 (Tue, 26 Jan 2010) New Revision: 19 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java Modified: trunk/pom.xml Log: R?\195?\169insertion du plugin HBase, n?\195?\169anmoins, je l'ai exclu du pom.xml Tant que l'on a pas r?\195?\169solu le probl?\195?\168me de plugin maven HBase (trouver un repository maven qui contient le plugin...) il serait plus "maven/devel friendly" de le cantonner l?\195?\160. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 17:30:00 UTC (rev 18) +++ trunk/pom.xml 2010-01-26 19:47:36 UTC (rev 19) @@ -84,10 +84,29 @@ </properties> <build> + <resources> + <resource> + <directory>src/main/java/org/nuiton/mapstoragemanager/plugins</directory> + <excludes> + <exclude>HBase.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/nuiton/mapstoragemanager/plugins/HBase.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-01-26 19:47:36 UTC (rev 19) @@ -0,0 +1,167 @@ +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.BigTable; + +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; + + +public class HBase implements BigTable { + + private HBaseConfiguration config; + private HTable table; + private String familyName = "mylittlecolumnfamily"; + private String rowName = "myLittleRow"; + private String tableName = "mylittletable"; + + public HBase(){ + // You need a configuration object to tell the client where to connect. + // When you create a HBaseConfiguration, it reads in whatever you've set + // into your hbase-site.xml and in hbase-default.xml, as long as these can + // be found on the CLASSPATH + org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(); + config = new HBaseConfiguration(conf); + System.out.println("test"); + selectTable(tableName); + put("test", "val"); + put("test", "val2"); + put("test2", "val3"); + } + + @Override + public void put(String key, String value) { + + // To add to a row, use Put. A Put constructor takes the name of the row + // you want to insert into as a byte array. In HBase, the Bytes class has + // utility for converting all kinds of java types to byte arrays. In the + // below, we are converting the String "myLittleRow" into a byte array to + // use as a row key for our update. Once you have a Put instance, you can + // adorn it by setting the names of columns you want to update on the row, + // the timestamp to use in your update, etc.If no timestamp, the server + // applies current time to the edits. + Put p = new Put(Bytes.toBytes(rowName)); + + // To set the value you'd like to update in the row 'myRow', specify the + // column family, column qualifier, and value of the table cell you'd like + // to update. The column family must already exist in your table schema. + // The qualifier can be anything. All must be specified as byte arrays as + // hbase is all about byte arrays. Lets pretend the table + // 'myLittleHBaseTable' was created with a family 'myLittleFamily'. + p.add(Bytes.toBytes(familyName), Bytes.toBytes(key), + Bytes.toBytes(value)); + + // Once you've adorned your Put instance with all the updates you want to + // make, to commit it do the following (The HTable#put method takes the + // Put instance you've been building and pushes the changes you made into + // hbase) + + /*try { + table.put(p); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } +*/ + } + + @Override + public String get(String key) { + + // Now, to retrieve the data we just wrote. The values that come back are + // Result instances. Generally, a Result is an object that will package up + // the hbase return into the form you find most palatable. + Get g = new Get(Bytes.toBytes(rowName)); + Result r; + byte [] value = null; +// try { +// r = table.get(g); +// value = r.getValue(Bytes.toBytes(familyName), +// Bytes.toBytes(key)); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + // If we convert the value bytes, we should get back 'Some Value', the + // value we inserted at this location. + String valueStr = Bytes.toString(value); + + return "valeur"; + //return valueStr; + } + + @Override + public Set<String> getKeys() { + + Set<String> keySet = new HashSet<String>(); + + // Sometimes, you won't know the row you're looking for. In this case, you + // use a Scanner. This will give you cursor-like interface to the contents + // of the table. To set up a Scanner, do like you did above making a Put + // and a Get, create a Scan. Adorn it with column names, etc. + Scan s = new Scan(); + //s.addColumn(Bytes.toBytes(familyName), Bytes.toBytes("test")); + ResultScanner scanner = null; + try { + scanner = table.getScanner(s); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + try { + // Scanners return Result instances. + // Now, for the actual iteration. One way is to use a while loop like so: + try { + for (Result rr = scanner.next(); rr != null; rr = scanner.next()) { + // print out the row we found and the columns we were looking for + System.out.println("Found row: " + rr); + keySet.add(rr.toString()); + } + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + // The other approach is to use a foreach loop. Scanners are iterable! + // for (Result rr : scanner) { + // System.out.println("Found row: " + rr); + // } + } finally { + // Make sure you close your scanners when you are done! + // Thats why we have it inside a try/finally clause + scanner.close(); + } + + return keySet; + } + + public void selectTable(String tableName){ + // This instantiates an HTable object that connects you to + // the "myLittleHBaseTable" table. + try { + table = new HTable(config, tableName); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void connect(String host, String base, String username, + String password) { + // TODO Auto-generated method stub + + } + + public static void main(String[] args) { + HBase h = new HBase(); + } + +}

1 0

r18 - trunk
by fdesbois＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: fdesbois Date: 2010-01-26 18:30:00 +0100 (Tue, 26 Jan 2010) New Revision: 18 Modified: trunk/pom.xml Log: Add Junit dependency for tests Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 16:41:42 UTC (rev 17) +++ trunk/pom.xml 2010-01-26 17:30:00 UTC (rev 18) @@ -45,7 +45,13 @@ <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> </dependency> - +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> </dependencies>

1 0

r17 - trunk/src/main/java/org/nuiton/mapstoragemanager/core
by gcrieloue＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: gcrieloue Date: 2010-01-26 17:41:42 +0100 (Tue, 26 Jan 2010) New Revision: 17 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java Log: Ajout d'une classe BigTableLoader destin?\195?\169e ?\195?\160 remplacer les classes Core et PluginLoader. En effet, BigTableLoader utilise ServiceLoader qui permet de simplifier grandement les choses. Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/BigTableLoader.java 2010-01-26 16:41:42 UTC (rev 17) @@ -0,0 +1,83 @@ +package org.nuiton.mapstoragemanager.core; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ServiceLoader; + +import org.nuiton.mapstoragemanager.plugins.BigTable; + +/** + * + * @author Crieloue Gilles + * + */ +public class BigTableLoader extends URLClassLoader{ + + /** + * The BigTable Set Loader. + */ + private ServiceLoader<BigTable> bigTableSetLoader; + + /** + * Class constructor. + * @param pluginsFolderPath the plugins folder path + * @param classLoader the parent classloader + * @throws MalformedURLException if the plugin folder is not found + */ + public BigTableLoader(final String pluginsFolderPath, + final ClassLoader classLoader) throws MalformedURLException { + + super(new URL[]{new File(pluginsFolderPath).toURI().toURL()}, + classLoader); + + for (File file : new File(pluginsFolderPath).listFiles()) { + if (file.getAbsolutePath().endsWith(".jar")) { + try { + this.addURL(file.toURI().toURL()); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } + + bigTableSetLoader = ServiceLoader.load(BigTable.class, this); + } + + /** + * Returns a string displaying all the available BigTable implementations. + * @return a string displaying all the available BigTable implementations + */ + public final String getBigTable() { + + String s = "Available Plugins :\n"; + + s += "\t* "; + if (!bigTableSetLoader.iterator().hasNext()) { + s += "No plugin."; + } + else { + for (BigTable bt : bigTableSetLoader) { + s += bt.getClass().getName(); + bt.put("key", "value"); + if (bt.get("key").equals("value")) { + s += " (working)" + "\n"; + } + else { + s += " (not working)" + "\n"; + } + } + } + return s; + } + + /** + * Returns the BigTable Set Loader. + * @return the BigTable Set Loader + */ + public final ServiceLoader<BigTable> getBigTableSetLoader() { + return bigTableSetLoader; + } + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/TestServiceLoader.java 2010-01-26 16:41:42 UTC (rev 17) @@ -0,0 +1,20 @@ +package org.nuiton.mapstoragemanager.core; + +import java.net.MalformedURLException; + +public class TestServiceLoader { + public TestServiceLoader(){ + try { + BigTableLoader p = new BigTableLoader("plugins", this.getClass().getClassLoader()); + System.out.println(p.getBigTable()); + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public static void main(String[] args) { + + TestServiceLoader t = new TestServiceLoader(); + } +}

1 0

r16 - trunk/src/main/java/org/nuiton/mapstoragemanager/plugins
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 16:58:26 +0100 (Tue, 26 Jan 2010) New Revision: 16 Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/ Log: suppression du plugin HBase (pour revenir plus fort ^^). Property changes on: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins ___________________________________________________________________ Added: svn:ignore + HBase.java Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-01-26 13:47:13 UTC (rev 15) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-01-26 15:58:26 UTC (rev 16) @@ -1,167 +0,0 @@ -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import org.nuiton.mapstoragemanager.plugins.BigTable; - -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.util.Bytes; - - -public class HBase implements BigTable { - - private HBaseConfiguration config; - private HTable table; - private String familyName = "mylittlecolumnfamily"; - private String rowName = "myLittleRow"; - private String tableName = "mylittletable"; - - public HBase(){ - // You need a configuration object to tell the client where to connect. - // When you create a HBaseConfiguration, it reads in whatever you've set - // into your hbase-site.xml and in hbase-default.xml, as long as these can - // be found on the CLASSPATH - org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(); - config = new HBaseConfiguration(conf); - System.out.println("test"); - selectTable(tableName); - put("test", "val"); - put("test", "val2"); - put("test2", "val3"); - } - - @Override - public void put(String key, String value) { - - // To add to a row, use Put. A Put constructor takes the name of the row - // you want to insert into as a byte array. In HBase, the Bytes class has - // utility for converting all kinds of java types to byte arrays. In the - // below, we are converting the String "myLittleRow" into a byte array to - // use as a row key for our update. Once you have a Put instance, you can - // adorn it by setting the names of columns you want to update on the row, - // the timestamp to use in your update, etc.If no timestamp, the server - // applies current time to the edits. - Put p = new Put(Bytes.toBytes(rowName)); - - // To set the value you'd like to update in the row 'myRow', specify the - // column family, column qualifier, and value of the table cell you'd like - // to update. The column family must already exist in your table schema. - // The qualifier can be anything. All must be specified as byte arrays as - // hbase is all about byte arrays. Lets pretend the table - // 'myLittleHBaseTable' was created with a family 'myLittleFamily'. - p.add(Bytes.toBytes(familyName), Bytes.toBytes(key), - Bytes.toBytes(value)); - - // Once you've adorned your Put instance with all the updates you want to - // make, to commit it do the following (The HTable#put method takes the - // Put instance you've been building and pushes the changes you made into - // hbase) - - /*try { - table.put(p); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } -*/ - } - - @Override - public String get(String key) { - - // Now, to retrieve the data we just wrote. The values that come back are - // Result instances. Generally, a Result is an object that will package up - // the hbase return into the form you find most palatable. - Get g = new Get(Bytes.toBytes(rowName)); - Result r; - byte [] value = null; -// try { -// r = table.get(g); -// value = r.getValue(Bytes.toBytes(familyName), -// Bytes.toBytes(key)); -// } catch (IOException e) { -// e.printStackTrace(); -// } - - // If we convert the value bytes, we should get back 'Some Value', the - // value we inserted at this location. - String valueStr = Bytes.toString(value); - - return "valeur"; - //return valueStr; - } - - @Override - public Set<String> getKeys() { - - Set<String> keySet = new HashSet<String>(); - - // Sometimes, you won't know the row you're looking for. In this case, you - // use a Scanner. This will give you cursor-like interface to the contents - // of the table. To set up a Scanner, do like you did above making a Put - // and a Get, create a Scan. Adorn it with column names, etc. - Scan s = new Scan(); - //s.addColumn(Bytes.toBytes(familyName), Bytes.toBytes("test")); - ResultScanner scanner = null; - try { - scanner = table.getScanner(s); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - try { - // Scanners return Result instances. - // Now, for the actual iteration. One way is to use a while loop like so: - try { - for (Result rr = scanner.next(); rr != null; rr = scanner.next()) { - // print out the row we found and the columns we were looking for - System.out.println("Found row: " + rr); - keySet.add(rr.toString()); - } - - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - // The other approach is to use a foreach loop. Scanners are iterable! - // for (Result rr : scanner) { - // System.out.println("Found row: " + rr); - // } - } finally { - // Make sure you close your scanners when you are done! - // Thats why we have it inside a try/finally clause - scanner.close(); - } - - return keySet; - } - - public void selectTable(String tableName){ - // This instantiates an HTable object that connects you to - // the "myLittleHBaseTable" table. - try { - table = new HTable(config, tableName); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void connect(String host, String base, String username, - String password) { - // TODO Auto-generated method stub - - } - - public static void main(String[] args) { - HBase h = new HBase(); - } - -}

1 0

r15 - trunk/src/main/java/org/nuiton/mapstoragemanager/plugins
by gcrieloue＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: gcrieloue Date: 2010-01-26 14:47:13 +0100 (Tue, 26 Jan 2010) New Revision: 15 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java Log: Ajout des sources des plugins Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/HBase.java 2010-01-26 13:47:13 UTC (rev 15) @@ -0,0 +1,167 @@ +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.nuiton.mapstoragemanager.plugins.BigTable; + +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.util.Bytes; + + +public class HBase implements BigTable { + + private HBaseConfiguration config; + private HTable table; + private String familyName = "mylittlecolumnfamily"; + private String rowName = "myLittleRow"; + private String tableName = "mylittletable"; + + public HBase(){ + // You need a configuration object to tell the client where to connect. + // When you create a HBaseConfiguration, it reads in whatever you've set + // into your hbase-site.xml and in hbase-default.xml, as long as these can + // be found on the CLASSPATH + org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(); + config = new HBaseConfiguration(conf); + System.out.println("test"); + selectTable(tableName); + put("test", "val"); + put("test", "val2"); + put("test2", "val3"); + } + + @Override + public void put(String key, String value) { + + // To add to a row, use Put. A Put constructor takes the name of the row + // you want to insert into as a byte array. In HBase, the Bytes class has + // utility for converting all kinds of java types to byte arrays. In the + // below, we are converting the String "myLittleRow" into a byte array to + // use as a row key for our update. Once you have a Put instance, you can + // adorn it by setting the names of columns you want to update on the row, + // the timestamp to use in your update, etc.If no timestamp, the server + // applies current time to the edits. + Put p = new Put(Bytes.toBytes(rowName)); + + // To set the value you'd like to update in the row 'myRow', specify the + // column family, column qualifier, and value of the table cell you'd like + // to update. The column family must already exist in your table schema. + // The qualifier can be anything. All must be specified as byte arrays as + // hbase is all about byte arrays. Lets pretend the table + // 'myLittleHBaseTable' was created with a family 'myLittleFamily'. + p.add(Bytes.toBytes(familyName), Bytes.toBytes(key), + Bytes.toBytes(value)); + + // Once you've adorned your Put instance with all the updates you want to + // make, to commit it do the following (The HTable#put method takes the + // Put instance you've been building and pushes the changes you made into + // hbase) + + /*try { + table.put(p); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } +*/ + } + + @Override + public String get(String key) { + + // Now, to retrieve the data we just wrote. The values that come back are + // Result instances. Generally, a Result is an object that will package up + // the hbase return into the form you find most palatable. + Get g = new Get(Bytes.toBytes(rowName)); + Result r; + byte [] value = null; +// try { +// r = table.get(g); +// value = r.getValue(Bytes.toBytes(familyName), +// Bytes.toBytes(key)); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + // If we convert the value bytes, we should get back 'Some Value', the + // value we inserted at this location. + String valueStr = Bytes.toString(value); + + return "valeur"; + //return valueStr; + } + + @Override + public Set<String> getKeys() { + + Set<String> keySet = new HashSet<String>(); + + // Sometimes, you won't know the row you're looking for. In this case, you + // use a Scanner. This will give you cursor-like interface to the contents + // of the table. To set up a Scanner, do like you did above making a Put + // and a Get, create a Scan. Adorn it with column names, etc. + Scan s = new Scan(); + //s.addColumn(Bytes.toBytes(familyName), Bytes.toBytes("test")); + ResultScanner scanner = null; + try { + scanner = table.getScanner(s); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + try { + // Scanners return Result instances. + // Now, for the actual iteration. One way is to use a while loop like so: + try { + for (Result rr = scanner.next(); rr != null; rr = scanner.next()) { + // print out the row we found and the columns we were looking for + System.out.println("Found row: " + rr); + keySet.add(rr.toString()); + } + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + // The other approach is to use a foreach loop. Scanners are iterable! + // for (Result rr : scanner) { + // System.out.println("Found row: " + rr); + // } + } finally { + // Make sure you close your scanners when you are done! + // Thats why we have it inside a try/finally clause + scanner.close(); + } + + return keySet; + } + + public void selectTable(String tableName){ + // This instantiates an HTable object that connects you to + // the "myLittleHBaseTable" table. + try { + table = new HTable(config, tableName); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void connect(String host, String base, String username, + String password) { + // TODO Auto-generated method stub + + } + + public static void main(String[] args) { + HBase h = new HBase(); + } + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap.java 2010-01-26 13:47:13 UTC (rev 15) @@ -0,0 +1,35 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.HashMap; +import java.util.Set; + +import org.nuiton.mapstoragemanager.plugins.BigTable; + +public class OurHashMap implements BigTable{ + + HashMap<String,String> map = new HashMap<String, String>(); + + public String get(String key) { + return map.get(key); + } + + public Set<String> getKeys() { + return map.keySet(); + } + + public void put(String key, String value) { + map.put(key, value); + } + + public void connect(String host, String base, String username, + String password) { + // TODO Auto-generated method stub + + } + + public void selectTable(String table) { + // TODO Auto-generated method stub + + } + +}

1 0

r14 - in trunk/src/main: java/org/nuiton/mapstoragemanager/ui java/org/nuiton/mapstoragemanager/ui/gui resources/i18n
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 14:39:59 +0100 (Tue, 26 Jan 2010) New Revision: 14 Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties Log: Tony Chemit n'avait pas commit, so j'ai refait les modifs (en plus ?\195?\167a m'a permit de mieux comprendre ce que l'on a fait). J'ai supprim?\195?\169 les fichiers .jaxx "useless". Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -5,22 +5,81 @@ maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" resizable='true'> + <script><![CDATA[ +import org.nuiton.mapstoragemanager.ui.gui.ApplicationConstants; +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; +ApplicationEngine engine = new ApplicationEngine(); +ApplicationConstants constants = new ApplicationConstants(); +]]> + </script> +  <style source='MainUI.css'/>  -<gui.ApplicationConstants id='constants'/> -<gui.ApplicationEngine id='engine'/>  - <menu/> + <JMenuBar> + <JMenu text="File"> + <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/> + <JMenuItem text="Disconnect" onActionPerformed='engine.doSomething()'/> + <JSeparator/> + <JMenuItem text="Quit" onActionPerformed='engine.close()'/> + </JMenu> + <JMenu text="Edit"> + <JMenuItem text="Preferences" onActionPerformed='engine.doSomething()'/> + </JMenu> + <JMenu text="Help"> + <JMenuItem text="About Us" onActionPerformed='engine.showGreeting()'/> + </JMenu> + </JMenuBar> <java.awt.BorderLayout id='BorderLayout'/> - <JPanel layout='{BorderLayout}'> - <connexionBar constraints='BorderLayout.NORTH'/> + <JPanel layout='{BorderLayout}'> + <JToolBar constraints='BorderLayout.NORTH' opaque='true'> + +  + +  + + <JLabel text='name base :' styleClass='boldUnderline' /> + <JAXXComboBox> + <item value='{null}' label='Select a base name' /> + <item value='HBase'/> + <item value='Cassandra'/> + <item value='Other'/> + </JAXXComboBox> + <JLabel text='login :' styleClass='boldUnderline' /> + <JTextField/> + <JLabel text='password :' styleClass='boldUnderline' /> + <JPasswordField/> + <JButton text='OK'/> + </JToolBar> <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > - <tree/> - <tableview/> + <JScrollPane> + <JPanel> +  + <JAXXTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > + <item value='No base schema' /> + </JAXXTree> + </JPanel> + </JScrollPane> + <JScrollPane> + +  + +  + + <VBox horizontalAlignment='center'> + <JPanel> + </JPanel> + <JLabel text="TABLE NAME : TODO"/> + </VBox> + + </JScrollPane> </JSplitPane> </JPanel> </Application> Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,19 +0,0 @@ -<JToolBar opaque='true'> - - - - - - <JLabel text='name base :' styleClass='boldUnderline' /> - <JComboBox> - <item value='{null}' label='Select a base name' /> - <item value='HBase'/> - <item value='Cassandra'/> - <item value='Other'/> - </JComboBox> - <JLabel text='login :' styleClass='boldUnderline' /> - <JTextField/> - <JLabel text='password :' styleClass='boldUnderline' /> - <JPasswordField/> - <JButton text='OK'/> -</JToolBar> \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-26 13:39:59 UTC (rev 14) @@ -13,7 +13,7 @@ * Show the developers. * // TO MODIFY */ - protected final void showGreeting() { + public final void showGreeting() { JOptionPane.showMessageDialog(null, this, "Developers:\n" + "===========\n" @@ -28,12 +28,12 @@ /** * Method to close the application. */ - protected final void close() { + public final void close() { System.exit(0); } /** * do nothing (for instance). */ - protected void doSomething() { } + public void doSomething() { } } Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,19 +0,0 @@ -<JMenuBar> - - -<gui.ApplicationEngine id='engine'/> - - - <JMenu text="File"> - <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/> - <JMenuItem text="Disconnect" onActionPerformed='engine.doSomething()'/> - <JSeparator/> - <JMenuItem text="Quit" onActionPerformed='engine.close()'/> - </JMenu> - <JMenu text="Edit"> - <JMenuItem text="Preferences" onActionPerformed='engine.doSomething()'/> - </JMenu> - <JMenu text="Help"> - <JMenuItem text="About Us" onActionPerformed='engine.showGreeting()'/> - </JMenu> -</JMenuBar> \ No newline at end of file Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,13 +0,0 @@ -<JScrollPane> - - - - - - <VBox horizontalAlignment='center'> - <JPanel> - </JPanel> - <JLabel text="TABLE NAME : TODO"/> - </VBox> - -</JScrollPane> \ No newline at end of file Deleted: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx 2010-01-26 13:39:59 UTC (rev 14) @@ -1,20 +0,0 @@ -<JScrollPane> - - -<gui.ApplicationEngine id='engine'/> - - - <JPanel> - -  - - - <JTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > - - <item value='No base schema' /> - </JTree> - </JPanel> -</JScrollPane> \ No newline at end of file Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-26 13:39:59 UTC (rev 14) @@ -1 +1,15 @@ -mapstoragemanager.hello=hello +About\ Us= +Connect= +Disconnect= +Edit= +File= +Hello= +Help= +OK= +Preferences= +Quit= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.hello=hello +name\ base\ \:= +password\ \:= Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-26 08:59:42 UTC (rev 13) +++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-26 13:39:59 UTC (rev 14) @@ -1 +1,15 @@ -mapstoragemanager.hello=bonjour +About\ Us= +Connect= +Disconnect= +Edit= +File= +Hello= +Help= +OK= +Preferences= +Quit= +TABLE\ NAME\ \:\ TODO= +login\ \:= +mapstoragemanager.hello=bonjour +name\ base\ \:= +password\ \:=

1 0

r13 - in trunk/src/main/java/org/nuiton/mapstoragemanager: core plugins ui/gui
by dlanglais＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: dlanglais Date: 2010-01-26 09:59:42 +0100 (Tue, 26 Jan 2010) New Revision: 13 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Correction d'erreur checkstyle. Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-01-26 08:59:42 UTC (rev 13) @@ -8,8 +8,15 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; +/** + * Class Core. + * This class permit to manage plugins. + * @author E054030D + * + */ public class Core { - /** + + /** * A map "name of the plugin" - "plugin instance". */ private HashMap < String, BigTable > bases = Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-01-26 08:59:42 UTC (rev 13) @@ -4,11 +4,11 @@ public class MainTestCore { - /** * test for plugins loading and basic functions. + * @param args args */ - public static void main(String[] args) { + public static void main(final String[] args) { Core core = new Core(); Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-01-26 08:59:42 UTC (rev 13) @@ -146,8 +146,6 @@ classes.add(tmpClass); } } - - } /** Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-01-26 08:59:42 UTC (rev 13) @@ -17,13 +17,13 @@ * @param password the user password */ void connect(String host, String base, String username, String password); - + /** * Selects the table. * @param table the table name */ void selectTable(String table); - + /** * Get the value matching a key. * @param key the key Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-26 08:59:42 UTC (rev 13) @@ -1,17 +1,37 @@ package org.nuiton.mapstoragemanager.ui.gui; +/** + * Application's constants. + * To configure the swing view. + * @author E054030D + * + */ public class ApplicationConstants { - public final static int DEFAULT_WIDTH = 1024; - public final static int DEFAULT_HEIGHT = 800; - - public final static int MINIMUM_SIZE_WIDTH = 600; - public final static int MINIMUM_SIZE_HEIGHT = 480; - - public final static int MAXIMUM_SIZE_WIDTH = 1920; - public final static int MAXIMUM_SIZE_HEIGHT = 1080; - - - - + /** + * default width, when the application start. + */ + public static final int DEFAULT_WIDTH = 1024; + /** + * default height, when the application start. + */ + public static final int DEFAULT_HEIGHT = 800; + + /** + * Minimum width. + */ + public static final int MINIMUM_SIZE_WIDTH = 600; + /** + * Minimum height. + */ + public static final int MINIMUM_SIZE_HEIGHT = 480; + + /** + * Maximum width. + */ + public static final int MAXIMUM_SIZE_WIDTH = 1920; + /** + * Maximum height. + */ + public static final int MAXIMUM_SIZE_HEIGHT = 1080; } Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-23 14:27:12 UTC (rev 12) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-26 08:59:42 UTC (rev 13) @@ -2,23 +2,38 @@ import javax.swing.JOptionPane; +/** + * Engine Class with methods for application user interface. + * @author E054030D + * + */ public class ApplicationEngine { - protected void showGreeting() { - JOptionPane.showMessageDialog(null, this, - "Developers:\n"+ - "===========\n"+ - "Crieloue Gilles\n"+ - "Fages Amaury\n"+ - "Langlais Dorian"+ - "\nForent\n"+ - "===========\n"+ - "Master ALMA", 0); - } + /** + * Show the developers. + * // TO MODIFY + */ + protected final void showGreeting() { + JOptionPane.showMessageDialog(null, this, + "Developers:\n" + + "===========\n" + + "Crieloue Gilles\n" + + "Fages Amaury\n" + + "Langlais Dorian" + + "\nForent\n" + + "===========\n" + + "Master ALMA", 0); + } - protected void close() { - System.exit(0); - } + /** + * Method to close the application. + */ + protected final void close() { + System.exit(0); + } - protected void doSomething(){} + /** + * do nothing (for instance). + */ + protected void doSomething() { } }

1 0

r12 - in trunk/src/main/java/org/nuiton/mapstoragemanager: . core plugins
by gcrieloue＠users.nuiton.org Jan. 23, 2010

Jan. 23, 2010

Author: gcrieloue Date: 2010-01-23 15:27:12 +0100 (Sat, 23 Jan 2010) New Revision: 12 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/ trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties trunk/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java Log: ajouts de l'architecture ?\195?\160 plugins (echec lors du commit pr?\195?\169c?\195?\169dent) Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/Core.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,92 @@ +package org.nuiton.mapstoragemanager.core; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; + +import org.nuiton.mapstoragemanager.plugins.BigTable; + +public class Core { + /** + * A map "name of the plugin" - "plugin instance". + */ + private HashMap < String, BigTable > bases = + new HashMap < String, BigTable > (); + + /** + * The plugin loader. + */ + private PluginLoader pluginLoader = null; + + /** + * Class constructor. + */ + public Core() { + try { + File directory = new File( + Messages.getString("Config.url")); + pluginLoader = new PluginLoader( + new URL[]{directory.toURI().toURL()}, + this.getClass().getClassLoader()); + } catch (Exception e1) { + e1.printStackTrace(); + } + try { + loadAvailableBases(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * Loads all the plugins (IBigTable implementations). + * @throws IOException if the classes are not loaded correctly + */ + private void loadAvailableBases() throws IOException { + for (Class < ? > tmpClass : pluginLoader.getPluginsClasses()) { + for (Class < ? > i : tmpClass.getInterfaces()) { + /* + * If the class implements the IBigTable + * interface, an instance is created + * and added to the list + */ + if (i.getName().equals("plugins.IBigTable")) { + try { + bases.put(tmpClass.getName(), + (BigTable) tmpClass.newInstance()); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + } + } + + /** + * Returns an ArrayList of all the plugins instances. + * @return an ArrayList of all the plugins instances + */ + public final ArrayList < BigTable > getAvailableBases() { + ArrayList < BigTable > bigTables = new ArrayList < BigTable > (); + for (BigTable bigTable : bases.values()) { + bigTables.add(bigTable); + } + return bigTables; + } + + /** + * Returns an ArrayList of all the plugins class names. + * @return an ArrayList of all the plugins class names + */ + public final ArrayList < String > listPlugins() { + ArrayList < String > s = new ArrayList<String>(); + for (String plugin : this.bases.keySet()) { + s.add(plugin); + } + return s; + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/MainTestCore.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,29 @@ +package org.nuiton.mapstoragemanager.core; + +import org.nuiton.mapstoragemanager.plugins.BigTable; + +public class MainTestCore { + + + /** + * test for plugins loading and basic functions. + */ + public static void main(String[] args) { + + Core core = new Core(); + + System.out.println("Plugins disponibles"); + for (String base : core.listPlugins()) { + System.out.println("* " + base); + } + + /* Test du plugins */ + + for (BigTable bigTable : core.getAvailableBases()) { + bigTable.put("clé", "valeur"); + System.out.println(bigTable.get("clé")); + } + + } + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/Messages.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,42 @@ +package org.nuiton.mapstoragemanager.core; + +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * Get strings from an external file. + * @author Crieloue Gilles + * + */ +public final class Messages { + + /** + * bundle name. + */ + private static final String BUNDLE_NAME = "core.messages"; //$NON-NLS-1$ + + /** + * ressource bundle. + */ + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle + .getBundle(BUNDLE_NAME); + + /** + * Constructor. + */ + private Messages() { + } + + /** + * Returns a result according to a key. + * @param key the key + * @return the matching result + */ + public static String getString(final String key) { + try { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } + } +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,161 @@ +package org.nuiton.mapstoragemanager.core; + +import java.io.File; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.logging.Logger; + +/** + * This class loads the plugins. + * @author Crieloue Gilles + * + */ +public class PluginLoader extends URLClassLoader { + + /** + * A logger. + */ + private Logger logger = Logger.getLogger(this.getClass().getName()); + + /** + * The plugin classes. + */ + private ArrayList < Class < ? > > classes = + new ArrayList < Class < ? > > (); + + /** + * Class constructor. + * @param urls for the class loader + * @param classLoader the parent ClassLoader + * @throws Exception if the directory URL doesn't exist + */ + public PluginLoader(final URL[] urls, final ClassLoader classLoader) + throws Exception { + super(urls, classLoader); + + File directory = new File(urls[0].getFile()); + if (!directory.exists()) { + throw new Exception("No directory " + urls[0]); + } + + // adds all the directory jars to the ClassLoader + for (File file : directory.listFiles()) { + if (file.getAbsolutePath().endsWith(".jar")) { + try { + this.addURL(file.toURI().toURL()); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } + + + File libs = new File("plugins/libs"); + if (!libs.exists()) { + throw new Exception("No directory " + libs.getAbsolutePath()); + } + + // adds all the libs jars to the ClassLoader + for (File file : libs.listFiles()) { + if (file.getAbsolutePath().endsWith(".jar")) { + try { + logger.info("== LIB " + file.getAbsolutePath() + "..."); + this.addURL(file.toURI().toURL()); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } + + // loads the jars classes + for (File file : directory.listFiles()) { + if (file.getAbsolutePath().endsWith(".jar")) { + logger.info("== JAR " + file.getAbsolutePath() + "..."); + loadJarClasses(file.getAbsolutePath()); + } + } + } + + /** + * Loads all the classes of a jar. + * (adds the path to the classLoader + * and adds the class to the classes list) + * @param jarPath the jar path + */ + private void loadJarClasses(final String jarPath) { + + File file = new File(jarPath); + logger.info("Loading " + jarPath + "..."); + + JarFile jar = null; + try { + jar = new JarFile(file.getAbsolutePath()); + } catch (IOException e) { + e.printStackTrace(); + } + +// Enumeration < JarEntry > entries2 = jar.entries(); +// while (entries2.hasMoreElements()) { +// JarEntry entry = entries2.nextElement(); +// if (entry.getName().startsWith("libs/")) { +// try { +// String fileName = entry.getName(); +// String entryURL = "jar:jar:file:" +// + jarPath + "!/" + fileName + "!/"; +// logger.info("== LIB " + fileName +// + " (" + entryURL + ") ..."); +// this.addURL(new URL(entryURL)); +// } catch (MalformedURLException e) { +// e.printStackTrace(); +// } +// } +// } + + Enumeration < JarEntry > entries = jar.entries(); + + // adds the classes from the jar to the classes list + while (entries.hasMoreElements()) { + Class < ? > tmpClass = null; + JarEntry entry = entries.nextElement(); + String fileName = entry.toString(); + String extension = ".class"; + + if (fileName.endsWith(extension)) { + logger.info("Loading " + fileName + "..."); + + // formating file name + fileName = fileName.substring(0, fileName.length() + - extension.length()); + fileName = fileName.replaceAll("/", "."); + + // loading class + try { + tmpClass = this.loadClass(fileName); + //Class.forName(fileName, true, this); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + + classes.add(tmpClass); + } + } + + + } + + /** + * Returns the plugin classes. + * @return the plugin classes + */ + public final ArrayList < Class < ? > > getPluginsClasses() { + return classes; + } + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/messages.properties 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1 @@ +Config.url=plugins/ Added: trunk/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/core/package-info.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,5 @@ +/** + * The core architecture. + * It deals with plugins discovery, loading, and such. + */ +package org.nuiton.mapstoragemanager.core; Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/BigTable.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,47 @@ +package org.nuiton.mapstoragemanager.plugins; + +import java.util.Set; + +/** + * The interface for all the BigTable implementations. + * @author Crieloue Gilles + * + */ +public interface BigTable { + + /** + * Connects to the database. + * @param host the server + * @param base the base name + * @param username the user login + * @param password the user password + */ + void connect(String host, String base, String username, String password); + + /** + * Selects the table. + * @param table the table name + */ + void selectTable(String table); + + /** + * Get the value matching a key. + * @param key the key + * @return the value + */ + String get(String key); + + /** + * put a value matching the key. + * @param key the key + * @param value the value + */ + void put(String key, String value); + + /** + * Returns the keys set. + * @return the keys set + */ + Set < String > getKeys(); + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/plugins/package-info.java 2010-01-23 14:27:12 UTC (rev 12) @@ -0,0 +1,5 @@ +/** + * The plugins interfaces. + */ +package org.nuiton.mapstoragemanager.plugins; +

1 0

r11 - trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by gcrieloue＠users.nuiton.org Jan. 23, 2010

Jan. 23, 2010

Author: gcrieloue Date: 2010-01-23 15:23:20 +0100 (Sat, 23 Jan 2010) New Revision: 11 Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Log: Ajout des packages de l'architecture ?\195?\160 plugins Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-23 00:06:05 UTC (rev 10) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-23 14:23:20 UTC (rev 11) @@ -1,3 +1,5 @@ +package org.nuiton.mapstoragemanager.ui.gui; + public class ApplicationConstants { public final static int DEFAULT_WIDTH = 1024; Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-23 00:06:05 UTC (rev 10) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-23 14:23:20 UTC (rev 11) @@ -1,3 +1,5 @@ +package org.nuiton.mapstoragemanager.ui.gui; + import javax.swing.JOptionPane; public class ApplicationEngine {

1 0

r10 - trunk
by dlanglais＠users.nuiton.org Jan. 23, 2010

Jan. 23, 2010

Author: dlanglais Date: 2010-01-23 01:06:05 +0100 (Sat, 23 Jan 2010) New Revision: 10 Modified: trunk/pom.xml Log: Ajout au pom.xml du repository contenant le pom "mavenpom4redmine". Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-22 23:10:42 UTC (rev 9) +++ trunk/pom.xml 2010-01-23 00:06:05 UTC (rev 10) @@ -3,6 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +  + <repositories> + <repository> + <id>org.nuiton</id> + <url>http://maven.nuiton.org/release/</url> + </repository> + </repositories> + <modelVersion>4.0.0</modelVersion>

1 0

r9 - in trunk/src/site/doc: . bigtable
by dlanglais＠users.nuiton.org Jan. 22, 2010

Jan. 22, 2010

Author: dlanglais Date: 2010-01-23 00:10:42 +0100 (Sat, 23 Jan 2010) New Revision: 9 Added: trunk/src/site/doc/bigtable/ trunk/src/site/doc/bigtable/HowToHbase.rst trunk/src/site/doc/bigtable/analyseBT.rst trunk/src/site/doc/bigtable/bigTable.pdf trunk/src/site/doc/bigtable/hbase-files.png trunk/src/site/doc/bigtable/projetHBase.rst Log: ... disons que copier/coller un dossier d?\195?\169j?\195?\160 sous version de controle provoque des erreurs... Added: trunk/src/site/doc/bigtable/HowToHbase.rst =================================================================== --- trunk/src/site/doc/bigtable/HowToHbase.rst (rev 0) +++ trunk/src/site/doc/bigtable/HowToHbase.rst 2010-01-22 23:10:42 UTC (rev 9) @@ -0,0 +1,71 @@ + +How to Hbase +============ + +Préparation de l'environnement de travail +----------------------------------------- + +prérequis : (nous travaillerons sur linux) + - SSH doit être installé. + +Télécharger Hadoop : +ftp://ftp.inria.fr/pub/Apache/hadoop/core/hadoop-0.20.1/hadoop-0.20.1.tar.gz +Télécharger Hbase : +ftp://ftp.inria.fr/pub/Apache/hadoop/hbase/hbase-0.20.2/hbase-0.20.2.tar.gz + +Dézipper les archives... + +Variables d'environnement +------------------------- + +Créer deux variables d'environnement "Hadoop_HOME" et "HBase_HOME" localisant les dossiers Hadoop-0.20.1 et HBase-0.20.2. +Ouvrir les fichiers ${Hadoop_Home}/conf/hadoop-env.sh et ${HBase_Home}/conf/hbase-env.sh et modifier/ajouter la variable d'environnement JAVA_HOME. + +Lancement des daemons +--------------------- + +Lancement du daemon hadoop : +${Hadoop_HOME}/bin/start-dfs.sh + +Lancement du daemon hbase : +${HBase_HOME}/bin/start-hbase.sh + +Lancement du shell Hbase +------------------------ + +${HBase_HOME}/bin/hbase shell + +Exemple +------- + +hbase> # Type "help" to see shell help screen +hbase> help +hbase> # To create a table named "mylittletable" with a column family of "mylittlecolumnfamily", type +hbase> create "mylittletable", "mylittlecolumnfamily" +hbase> # To see the schema for you just created "mylittletable" table and its single "mylittlecolumnfamily", type +hbase> describe "mylittletable" +hbase> # To add a row whose id is "x", to the column "mylittlecolumnfamily:x" with a value of 'x', do +hbase> put "mylittletable", "x" +hbase> # To get the cell just added, do +hbase> get "mylittletable", "x" +hbase> # To scan you new table, do +hbase> scan "mylittletable" + +Arrêt des daemons +----------------- + +Lancement du daemon hadoop : +${HADOOP_HOME}/bin/stop-dfs.sh +(On va dire que l'action n'est pas très rapide... Si elle marche.. ?) + +Lancement du daemon hbase : +${HBASE_HOME}/bin/stop-hbase.sh +${HBASE_HOME}/bin/stop-all.sh +(??? pour le premier il faut renseigner le nom du node ? Pour le second, je doute fort qu'il éteigne bien le daemon..) +---> Problème de port à la fac, je suppose. + + + + +So It's done +Now you have to work ! \ No newline at end of file Added: trunk/src/site/doc/bigtable/analyseBT.rst =================================================================== --- trunk/src/site/doc/bigtable/analyseBT.rst (rev 0) +++ trunk/src/site/doc/bigtable/analyseBT.rst 2010-01-22 23:10:42 UTC (rev 9) @@ -0,0 +1,92 @@ +Analyse de BigTable (de google Inc.) +===================================== + +But de l'analyse +---------------- + +Permettre la compréhension de Big Table et de ses diverses implémentations +ainsi que l'extraction d'interface pour le projet MSM. + +Introduction : Qu'est-ce que BigTable ? +--------------------------------------- + +BigTable est la spécification d'un système de stockage distribué permettant +de gérer des données. Il est conçu pour s'adapter fiablement à des tailles +de contenu allant jusqu'au "Peta". BigTable est utilisé pour plusieurs raisons : + +- Toucher un large ensemble d'applications +- Mise à l'échelle +- Très bonnes performances (temps de réponse...) +- Forte disponibilité + +Le modèle de données de BigTable +-------------------------------- + +Le modèle de données de BigTable se comporte comme un dictionnaire +multidimensionnel (matrice) indexé par le triplet +<row key, column key, timestamp>. Chaque valeur de ce dictionnaire +est un table d'octets. + +Les clés pour une rangée du dictionnaire sont des chaînes de charactères +arbitraires et BigTable maintient les données dans un ordre lexicographique +grâce à ce type de clé. + +ex de clé de rangée : "com.google.maps/index.html" (reversed URL) + +La portée d'une rangée est appelée "tablet", unité de distribution et d'équilibrage +de charge. + +Les clés de colonne sont groupées en ensembles appelés "famille de colonnes". +Une clé de colonne est nommé suivant le schéma : family:qualifier. +Les noms de famille doivent être lisibles facilement mais les qualificateurs peuvent +être des chaînes de charactères arbitraires + +ex de famille de colonne : "contents:" + +Ainsi, le contenu d'une cellule indexée par <com.google.maps/index.html, contents:, ?> +serait le contenu de la page "index.html" (le code html). +Une cellule peut contenir plusieurs versions de la même donnée via le mécanisme de timestamp. +Chaque cellule stocke plusieurs timestamp en ordre décroissant si bien que : + +- <com.google.maps/index.html, contents:, ts1> donne la version la plus récente du contenu. +- <com.google.maps/index.html, contents:, ts2> donne une version plus ancienne du contenu. + +Stockage +-------- + +BigTable utilise le système de fichier google GFS (Google File System) +pour stocker les logs et fichiers de données. + +Le format de fichier google SSTable est utilisé pour stocker les données +internes à BigTable. + +API BigTable (client) +--------------------- + +Voici les fonctionnalités prévues par la spécification BigTable : + +- Création de tables. +- Création de familles de colonne. +- Suppression de tables. +- Suppression de familles de colonne. +- Changement de cluster (?). +- Changement de table. +- Changement de méta données sur une famille de colonne (droits d'accès...). +- Ecriture des données dans une table. +- Suppression des données dans une table. +- Recherche des données dans une table depuis des rangées individuelles. +- Itération sur un sous-ensemble de données d'une table. +- Manipulation avancée des données : Transactions "Lecture - Modification - Ecriture" +sur une rangée simple (BigTable ne supporte pas les transactions par rangées multiples). +- Utilisation des cellules comme compteurs d'entier. +- Excécution de scripts clients dans l'espace d'adressage des serveurs (langage : sawzall). +- Calcul parallèle avec le framework MapReduce. + +Source +------ + +Cette analyse est une synthèse des éléments utiles dans le cadre du projet, issue de la +spécification même de Google Inc. +"BigTable: A Distributed Storage System for Structured Data" + +lien : labs.google.com/papers/bigtable-osdi06.pdf Added: trunk/src/site/doc/bigtable/bigTable.pdf =================================================================== (Binary files differ) Property changes on: trunk/src/site/doc/bigtable/bigTable.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/doc/bigtable/hbase-files.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/doc/bigtable/hbase-files.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/doc/bigtable/projetHBase.rst =================================================================== --- trunk/src/site/doc/bigtable/projetHBase.rst (rev 0) +++ trunk/src/site/doc/bigtable/projetHBase.rst 2010-01-22 23:10:42 UTC (rev 9) @@ -0,0 +1,40 @@ +// mardi 12 janvier 2010 + +Technologies +------------ + + - UML + - JAVA + - JMX + - Jaxx / Swing + - HBase + - XML + - SVN + - RST + - Maven + +Contraintes +------------ + +- L'encodage des fichiers doit être en UTF-8. +- La norme checkstyle de sun doit être utilisée pour le code java (http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html) +- Pour les diagrammes UML, l'outil ArgoUML (v 0.28.1) doit être employé. +- Utilisation de Maven2 pour la construction, génération du site web… +- Couverture du code à 80% +- Environnement de développement libre (Eclipse, Netbeans, Vim) +- Utilisation de rst (ReStructuredText) pour la documentation +- Projet sous licence GPL v3 +- Code source en anglais + +Définitions +----------- + +HBase + +HMap + +RST + + + +

1 0

r8 - trunk/src/site
by dlanglais＠users.nuiton.org Jan. 22, 2010

Jan. 22, 2010

Author: dlanglais Date: 2010-01-22 23:49:50 +0100 (Fri, 22 Jan 2010) New Revision: 8 Added: trunk/src/site/doc/ Log: Excuses.. (oubli des documents sur bigtable)

1 0

r7 - in trunk/src: main/java/org/nuiton/mapstoragemanager site site/reports
by dlanglais＠users.nuiton.org Jan. 22, 2010

Jan. 22, 2010

Author: dlanglais Date: 2010-01-22 23:47:07 +0100 (Fri, 22 Jan 2010) New Revision: 7 Added: trunk/src/site/reports/ trunk/src/site/reports/week3.rst Removed: trunk/src/main/java/org/nuiton/mapstoragemanager/reports/ trunk/src/site/reports/week3 Log: D?\195?\169placement du dossier report dans le dossier site (src/main/java/org/nuiton/mapstoragemanager/**/* est un dossier r?\195?\169serv?\195?\169 pour le code source). Passage en mode rst du rapport week3.rst (ajout de quelques points). Ajout de documentation sur Bigtable et HBase Deleted: trunk/src/site/reports/week3 =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3 2010-01-22 16:18:02 UTC (rev 6) +++ trunk/src/site/reports/week3 2010-01-22 22:47:07 UTC (rev 7) @@ -1,26 +0,0 @@ -/***********************************/ - This week -/***********************************/ -Test jaxx with ant (examples of jaxx) -Creation of a user interface (the beginning) with many tests of css, java and jaxx files. - - - - - - - - -/***********************************/ - Next week -/***********************************/ -Upgrade ui with jaxx. -Test dynamic method into jaxx. - - - - - - - - Copied: trunk/src/site/reports/week3.rst (from rev 6, trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3) =================================================================== --- trunk/src/site/reports/week3.rst (rev 0) +++ trunk/src/site/reports/week3.rst 2010-01-22 22:47:07 UTC (rev 7) @@ -0,0 +1,23 @@ + + This week + ========== + - Test jaxx with ant (examples of jaxx) + - Creation of a user interface (the beginning) with many tests of css, java and jaxx files. + - Installation and test of HBase, Hadoop + - Creation of the core of the plugin architecture + - Documentation about BigTable + + + + Next week + ========= + - Upgrade ui with jaxx. + - Test dynamic method into jaxx. + + + + + + + +

1 0

r6 - in trunk/src/main/java/org/nuiton/mapstoragemanager: . reports ui ui/gui
by fgilet＠users.nuiton.org Jan. 22, 2010

Jan. 22, 2010

Author: fgilet Date: 2010-01-22 17:18:02 +0100 (Fri, 22 Jan 2010) New Revision: 6 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/reports/ trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3 trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Log: Ajout des premiers fichiers jaxx (fichiers css, java et jaxx), ainsi que un dossier "reports" o?\195?\185 se trouve nos comptes-rendu de la semaine. Added: trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3 =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3 (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/reports/week3 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,26 @@ +/***********************************/ + This week +/***********************************/ +Test jaxx with ant (examples of jaxx) +Creation of a user interface (the beginning) with many tests of css, java and jaxx files. + + + + + + + + +/***********************************/ + Next week +/***********************************/ +Upgrade ui with jaxx. +Test dynamic method into jaxx. + + + + + + + + Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.css 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,8 @@ +Application { + lookAndFeel: system; + locationRelativeTo: {null}; +} + +JLabel.boldUnderline { + font-weight: bold; +} \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-21 14:29:18 UTC (rev 5) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-22 16:18:02 UTC (rev 6) @@ -1,5 +1,27 @@ -<JFrame width='800' height='600' defaultCloseOperation="dispose_on_close"> - <JPanel> - <JLabel text='mapstoragemanager.hello'/> - </JPanel> -</JFrame> \ No newline at end of file +<Application title='Hello' + height="{constants.DEFAULT_HEIGHT}" + width="{constants.DEFAULT_WIDTH}" + minimumSize="{new Dimension(constants.MINIMUM_SIZE_WIDTH,constants.MINIMUM_SIZE_HEIGHT)}" + maximumSize="{new Dimension(constants.MAXIMUM_SIZE_WIDTH,constants.MAXIMUM_SIZE_HEIGHT)}" + resizable='true'> + + +<style source='MainUI.css'/> + + +<gui.ApplicationConstants id='constants'/> +<gui.ApplicationEngine id='engine'/> + + + + <menu/> + <java.awt.BorderLayout id='BorderLayout'/> + <JPanel layout='{BorderLayout}'> + <connexionBar constraints='BorderLayout.NORTH'/> + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <tree/> + <tableview/> + </JSplitPane> + </JPanel> +</Application> + Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/connexionBar.jaxx 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,19 @@ +<JToolBar opaque='true'> + + + + + + <JLabel text='name base :' styleClass='boldUnderline' /> + <JComboBox> + <item value='{null}' label='Select a base name' /> + <item value='HBase'/> + <item value='Cassandra'/> + <item value='Other'/> + </JComboBox> + <JLabel text='login :' styleClass='boldUnderline' /> + <JTextField/> + <JLabel text='password :' styleClass='boldUnderline' /> + <JPasswordField/> + <JButton text='OK'/> +</JToolBar> \ No newline at end of file Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationConstants.java 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,15 @@ +public class ApplicationConstants { + + public final static int DEFAULT_WIDTH = 1024; + public final static int DEFAULT_HEIGHT = 800; + + public final static int MINIMUM_SIZE_WIDTH = 600; + public final static int MINIMUM_SIZE_HEIGHT = 480; + + public final static int MAXIMUM_SIZE_WIDTH = 1920; + public final static int MAXIMUM_SIZE_HEIGHT = 1080; + + + + +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,22 @@ +import javax.swing.JOptionPane; + +public class ApplicationEngine { + + protected void showGreeting() { + JOptionPane.showMessageDialog(null, this, + "Developers:\n"+ + "===========\n"+ + "Crieloue Gilles\n"+ + "Fages Amaury\n"+ + "Langlais Dorian"+ + "\nForent\n"+ + "===========\n"+ + "Master ALMA", 0); + } + + protected void close() { + System.exit(0); + } + + protected void doSomething(){} +} Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/menu.jaxx 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,19 @@ +<JMenuBar> + + +<gui.ApplicationEngine id='engine'/> + + + <JMenu text="File"> + <JMenuItem text="Connect" onActionPerformed='engine.doSomething()'/> + <JMenuItem text="Disconnect" onActionPerformed='engine.doSomething()'/> + <JSeparator/> + <JMenuItem text="Quit" onActionPerformed='engine.close()'/> + </JMenu> + <JMenu text="Edit"> + <JMenuItem text="Preferences" onActionPerformed='engine.doSomething()'/> + </JMenu> + <JMenu text="Help"> + <JMenuItem text="About Us" onActionPerformed='engine.showGreeting()'/> + </JMenu> +</JMenuBar> \ No newline at end of file Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tableview.jaxx 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,13 @@ +<JScrollPane> + + + + + + <VBox horizontalAlignment='center'> + <JPanel> + </JPanel> + <JLabel text="TABLE NAME : TODO"/> + </VBox> + +</JScrollPane> \ No newline at end of file Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/tree.jaxx 2010-01-22 16:18:02 UTC (rev 6) @@ -0,0 +1,20 @@ +<JScrollPane> + + +<gui.ApplicationEngine id='engine'/> + + + <JPanel> + +  + + + <JTree id='baseSchema' showsRootHandles='true' onValueChanged='engine.doSomething()' > + + <item value='No base schema' /> + </JTree> + </JPanel> +</JScrollPane> \ No newline at end of file

1 0

r5 - trunk
by tchemit＠users.nuiton.org Jan. 21, 2010

Jan. 21, 2010

Author: tchemit Date: 2010-01-21 15:29:18 +0100 (Thu, 21 Jan 2010) New Revision: 5 Modified: trunk/pom.xml Log: add version 0.1-SNAPSHOT Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-21 14:24:35 UTC (rev 4) +++ trunk/pom.xml 2010-01-21 14:29:18 UTC (rev 5) @@ -14,6 +14,7 @@ <version>2.0.2</version> </parent> + <version>0.1-SNAPSHOT</version> <artifactId>mapstoragemanager</artifactId> <dependencies>

1 0

r4 - in trunk/src/main: java/org/nuiton/mapstoragemanager java/org/nuiton/mapstoragemanager/ui resources resources/i18n
by tchemit＠users.nuiton.org Jan. 21, 2010

Jan. 21, 2010

Author: tchemit Date: 2010-01-21 15:24:35 +0100 (Thu, 21 Jan 2010) New Revision: 4 Added: trunk/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/src/main/resources/log4j.properties Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties Log: add minimal application Added: trunk/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/Main.java (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-01-21 14:24:35 UTC (rev 4) @@ -0,0 +1,37 @@ +package org.nuiton.mapstoragemanager; + +import org.nuiton.i18n.I18n; +import org.nuiton.mapstoragemanager.ui.MainUI; + +import javax.swing.*; +import java.util.Locale; + +/** + * Created: 21 janv. 2010 + * + * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @version $Revision$ + * <p/> + * Mise a jour: $Date$ par : + * $Author: tchemit $ + */ +public class Main { + + public static void main(String... args) { + + I18n.setUniqueBundleName("mapstoragemanager-i18n"); + I18n.init(Locale.FRANCE); + final MainUI ui = new MainUI(); + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + + ui.setVisible(true); + } + }); + } + + +} Property changes on: trunk/src/main/java/org/nuiton/mapstoragemanager/Main.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-21 14:08:06 UTC (rev 3) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-21 14:24:35 UTC (rev 4) @@ -1 +1,5 @@ -<Application/> \ No newline at end of file +<JFrame width='800' height='600' defaultCloseOperation="dispose_on_close"> + <JPanel> + <JLabel text='mapstoragemanager.hello'/> + </JPanel> +</JFrame> \ No newline at end of file Modified: trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-21 14:08:06 UTC (rev 3) +++ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties 2010-01-21 14:24:35 UTC (rev 4) @@ -0,0 +1 @@ +mapstoragemanager.hello=hello Modified: trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-21 14:08:06 UTC (rev 3) +++ trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties 2010-01-21 14:24:35 UTC (rev 4) @@ -0,0 +1 @@ +mapstoragemanager.hello=bonjour Added: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties (rev 0) +++ trunk/src/main/resources/log4j.properties 2010-01-21 14:24:35 UTC (rev 4) @@ -0,0 +1,14 @@ +# Global logging configuration +#log4j.rootLogger=ERROR, stdout, file +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.file=mapstoragemanager.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton.mapstoragemanager=DEBUG

1 0

r3 - in trunk: . src src/main src/main/java src/main/java/org src/main/java/org/nuiton src/main/java/org/nuiton/mapstoragemanager src/main/java/org/nuiton/mapstoragemanager/ui src/main/resources src/main/resources/i18n src/site src/test
by tchemit＠users.nuiton.org Jan. 21, 2010

Jan. 21, 2010

Author: tchemit Date: 2010-01-21 15:08:06 +0100 (Thu, 21 Jan 2010) New Revision: 3 Added: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/pom.xml trunk/src/ trunk/src/main/ trunk/src/main/java/ trunk/src/main/java/org/ trunk/src/main/java/org/nuiton/ trunk/src/main/java/org/nuiton/mapstoragemanager/ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/src/main/resources/ trunk/src/main/resources/i18n/ trunk/src/main/resources/i18n/mapstoragemanager-en_GB.properties trunk/src/main/resources/i18n/mapstoragemanager-fr_FR.properties trunk/src/site/ trunk/src/site/rst/ trunk/src/test/ trunk/src/test/resources/ Log: project structure Added: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt (rev 0) +++ trunk/LICENSE.txt 2010-01-21 14:08:06 UTC (rev 3) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/changelog.txt =================================================================== --- trunk/changelog.txt (rev 0) +++ trunk/changelog.txt 2010-01-21 14:08:06 UTC (rev 3) @@ -0,0 +1,2 @@ +Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/mapstoragemanager/changes-report.html Added: trunk/pom.xml =================================================================== --- trunk/pom.xml (rev 0) +++ trunk/pom.xml 2010-01-21 14:08:06 UTC (rev 3) @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0.2</version> + </parent> + + <artifactId>mapstoragemanager</artifactId> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> + +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxx.version}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>MapStorageManager</name> + + <description>TODO</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + <packaging>jar</packaging> + + <properties> + +  + <maven.jar.main.class>org.nuiton.mapstoragemanager.Main</maven.jar.main.class> + + <jaxx.version>2.0.0-beta-3</jaxx.version> + <lutinutil.version>1.1.2</lutinutil.version> + <i18n.version>1.0.1</i18n.version> + +  + <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + </properties> + + <build> + + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> +  + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-deps</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + + </plugin> + + </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + </build> + +</project> Added: trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx (rev 0) +++ trunk/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-01-21 14:08:06 UTC (rev 3) @@ -0,0 +1 @@ +<Application/> \ No newline at end of file

1 0

r2 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 18:33:22 +0100 (Thu, 07 Jan 2010) New Revision: 2 Modified: trunk/ Log: add default svn ignore on trunk Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath

1 0